Mercurial > hg-stable
changeset 7186:f77c8d8331ca
clean up trailing spaces, leading spaces in C
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 20 Oct 2008 14:57:04 +0200 |
| parents | 67ba74938b15 |
| children | 8bbbba2a1a9c |
| files | hgext/convert/common.py hgext/mq.py mercurial/parsers.c mercurial/patch.py tests/printenv.py |
| diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/common.py Mon Oct 20 14:52:58 2008 +0200 +++ b/hgext/convert/common.py Mon Oct 20 14:57:04 2008 +0200 @@ -80,7 +80,7 @@ raise NotImplementedError() def getchanges(self, version): - """Returns a tuple of (files, copies). + """Returns a tuple of (files, copies). files is a sorted list of (filename, id) tuples for all files changed between version and it's first parent returned by
--- a/hgext/mq.py Mon Oct 20 14:52:58 2008 +0200 +++ b/hgext/mq.py Mon Oct 20 14:57:04 2008 +0200 @@ -1787,7 +1787,7 @@ the modifications that match those patterns; the remaining modifications will remain in the working directory. - If --short is specified, files currently included in the patch will + If --short is specified, files currently included in the patch will be refreshed just like matched files and remain in the patch. hg add/remove/copy/rename work as usual, though you might want to use
--- a/mercurial/parsers.c Mon Oct 20 14:52:58 2008 +0200 +++ b/mercurial/parsers.c Mon Oct 20 14:57:04 2008 +0200 @@ -301,12 +301,12 @@ unsigned int step; memcpy(decode, data, 64); - offset_flags = ntohl(*((uint32_t *) (decode + 4))); - if (n == 0) /* mask out version number for the first entry */ - offset_flags &= 0xFFFF; - else { + offset_flags = ntohl(*((uint32_t *) (decode + 4))); + if (n == 0) /* mask out version number for the first entry */ + offset_flags &= 0xFFFF; + else { uint32_t offset_high = ntohl(*((uint32_t *) decode)); - offset_flags |= ((uint64_t) offset_high) << 32; + offset_flags |= ((uint64_t) offset_high) << 32; } comp_len = ntohl(*((uint32_t *) (decode + 8)));
--- a/mercurial/patch.py Mon Oct 20 14:52:58 2008 +0200 +++ b/mercurial/patch.py Mon Oct 20 14:57:04 2008 +0200 @@ -783,13 +783,13 @@ yield l def scangitpatch(lr, firstline): - """ + """ Git patches can emit: - rename a to b - change b - copy a to c - change c - + We cannot apply this sequence as-is, the renamed 'a' could not be found for it would have been renamed already. And we cannot copy from 'b' instead because 'b' would have been changed already. So
--- a/tests/printenv.py Mon Oct 20 14:52:58 2008 +0200 +++ b/tests/printenv.py Mon Oct 20 14:57:04 2008 +0200 @@ -20,7 +20,7 @@ import msvcrt msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) + msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) except ImportError: pass