Mercurial > hg
view tests/test-patch-offset @ 12717:89df79b3c011 stable
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)
This is a followup to 4481f8a93c7a, which only fixed the conversion of
patches with UTF-8 metadata.
This patch allows a changelog to have any bytes with values
0x7F-0xFF. It parses the XML changelog as Latin-1 and uses
converter_source.recode() to decode the data as UTF-8/Latin-1.
Caveats:
- Since the convert extension doesn't provide any way to specify the
source encoding, users are still limited to UTF-8 and Latin-1.
- etree will still complain if the changelog has bytes with values
0x00-0x19. XML only allows printable characters.
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 01 Oct 2010 10:15:04 -0500 |
parents | 0d8577e1f56b |
children |
line wrap: on
line source
#!/bin/sh cat > writepatterns.py <<EOF import sys path = sys.argv[1] patterns = sys.argv[2:] fp = file(path, 'wb') for pattern in patterns: count = int(pattern[0:-1]) char = pattern[-1] + '\n' fp.write(char*count) fp.close() EOF echo % prepare repo hg init a cd a # These initial lines of Xs were not in the original file used to generate # the patch. So all the patch hunks need to be applied to a constant offset # within this file. If the offset isn't tracked then the hunks can be # applied to the wrong lines of this file. python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A hg commit -Am adda # This is a cleaner patch generated via diff # In this case it reproduces the problem when # the output of hg export does not echo % import patch hg import -v -m 'b' -d '2 0' - <<EOF --- a/a 2009-12-08 19:26:17.000000000 -0800 +++ b/a 2009-12-08 19:26:17.000000000 -0800 @@ -9,7 +9,7 @@ A A B -A +a A A A @@ -53,7 +53,7 @@ A A B -A +a A A A @@ -75,7 +75,7 @@ A A B -A +a A A A EOF echo % compare imported changes against reference file python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A diff aref a