Mercurial > hg
view tests/test-rebase-interruptions.out @ 12252:4481f8a93c7a stable
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | 54e93b86a9e3 |
children |
line wrap: on
line source
% Changes during an interruption - continue @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % - Rebasing B onto E warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Force a commit on C during the interruption 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @ 6: Extra | | o 5: B | | | o 4: E | | | o 3: D | | o | 2: C | | o | 1: B |/ o 0: A % - Resume the rebasing merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on warning: new changesets detected on source branch, not stripping @ 7: C | | o 6: Extra | | o | 5: B | | o | 4: E | | o | 3: D | | | o 2: C | | | o 1: B |/ o 0: A % Changes during an interruption - abort @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Rebasing B onto E warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % Force a commit on B' during the interruption 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Abort the rebasing warning: new changesets detected on target branch, can't abort @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A