##// END OF EJS Templates
clean up trailing spaces, leading spaces in C
Dirkjan Ochtman -
r7186:f77c8d83 default
parent child Browse files
Show More
@@ -80,7 +80,7 b' class converter_source(object):'
80 80 raise NotImplementedError()
81 81
82 82 def getchanges(self, version):
83 """Returns a tuple of (files, copies).
83 """Returns a tuple of (files, copies).
84 84
85 85 files is a sorted list of (filename, id) tuples for all files
86 86 changed between version and it's first parent returned by
@@ -1787,7 +1787,7 b' def refresh(ui, repo, *pats, **opts):'
1787 1787 the modifications that match those patterns; the remaining modifications
1788 1788 will remain in the working directory.
1789 1789
1790 If --short is specified, files currently included in the patch will
1790 If --short is specified, files currently included in the patch will
1791 1791 be refreshed just like matched files and remain in the patch.
1792 1792
1793 1793 hg add/remove/copy/rename work as usual, though you might want to use
@@ -301,12 +301,12 b' static int _parse_index_ng (const char *'
301 301 unsigned int step;
302 302
303 303 memcpy(decode, data, 64);
304 offset_flags = ntohl(*((uint32_t *) (decode + 4)));
305 if (n == 0) /* mask out version number for the first entry */
306 offset_flags &= 0xFFFF;
307 else {
304 offset_flags = ntohl(*((uint32_t *) (decode + 4)));
305 if (n == 0) /* mask out version number for the first entry */
306 offset_flags &= 0xFFFF;
307 else {
308 308 uint32_t offset_high = ntohl(*((uint32_t *) decode));
309 offset_flags |= ((uint64_t) offset_high) << 32;
309 offset_flags |= ((uint64_t) offset_high) << 32;
310 310 }
311 311
312 312 comp_len = ntohl(*((uint32_t *) (decode + 8)));
@@ -783,13 +783,13 b' class linereader:'
783 783 yield l
784 784
785 785 def scangitpatch(lr, firstline):
786 """
786 """
787 787 Git patches can emit:
788 788 - rename a to b
789 789 - change b
790 790 - copy a to c
791 791 - change c
792
792
793 793 We cannot apply this sequence as-is, the renamed 'a' could not be
794 794 found for it would have been renamed already. And we cannot copy
795 795 from 'b' instead because 'b' would have been changed already. So
@@ -20,7 +20,7 b' try:'
20 20 import msvcrt
21 21 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
22 22 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
23 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
23 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
24 24 except ImportError:
25 25 pass
26 26
General Comments 0
You need to be logged in to leave comments. Login now