Mercurial > hg
view tests/test-merge-internal-tools-pattern.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 | b2310903c462 |
children |
line wrap: on
line source
# initial file contents adding f line 1 line 2 line 3 # branch 1: editing line 1 # branch 2: editing line 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head # merge using internal:fail tool 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon line 1 line 2 third line M f # merge using internal:local tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) line 1 line 2 third line M f # merge using internal:other tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 line 3 M f # merge using default tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging f 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 third line M f