Mercurial > hg
view tests/test-filebranch @ 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 | 3f754be7abbb |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh # This test makes sure that we don't mark a file as merged with its ancestor # when we do a merge. cat <<EOF > merge import sys, os print "merging for", os.path.basename(sys.argv[1]) EOF HGMERGE="python ../merge"; export HGMERGE echo creating base hg init a cd a echo 1 > foo echo 1 > bar echo 1 > baz echo 1 > quux hg add foo bar baz quux hg commit -m "base" -d "1000000 0" cd .. hg clone a b echo creating branch a cd a echo 2a > foo echo 2a > bar hg commit -m "branch a" -d "1000000 0" echo creating branch b cd .. cd b echo 2b > foo echo 2b > baz hg commit -m "branch b" -d "1000000 0" echo "we shouldn't have anything but n state here" hg debugstate --nodates | grep -v "^n" echo merging hg pull ../a hg merge -v echo 2m > foo echo 2b > baz echo new > quux echo "we shouldn't have anything but foo in merge state here" hg debugstate --nodates | grep "^m" hg ci -m "merge" -d "1000000 0" echo "main: we should have a merge here" hg debugindex .hg/store/00changelog.i echo "log should show foo and quux changed" hg log -v -r tip echo "foo: we should have a merge here" hg debugindex .hg/store/data/foo.i echo "bar: we shouldn't have a merge here" hg debugindex .hg/store/data/bar.i echo "baz: we shouldn't have a merge here" hg debugindex .hg/store/data/baz.i echo "quux: we shouldn't have a merge here" hg debugindex .hg/store/data/quux.i echo "manifest entries should match tips of all files" hg manifest --debug echo "everything should be clean now" hg status hg verify