Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 38707:6b5ca1d0aa1e
obsolete: store user name and note in UTF-8 (issue5754) (BC)
Before, user names were stored in local encoding and transferred across
repositories, which made it impossible to restore non-ASCII user names on
different platforms. This patch fixes new markers to be encoded in UTF-8
and decoded back to local encoding when displaying. Existing markers are
unfixable so they may result in mojibake.
I don't like the API that requires metadata dict to be UTF-8 encoded, which
is a source of bugs, but there's no abstraction layer to process the encoding
thingy efficiently. So we apply the same rule as extras dict to obsstore
metadata.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 15 Jul 2018 18:24:57 +0900 |
parents | 572dff5c946e |
children | e252f136b948 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sun Jul 15 18:22:40 2018 +0900 +++ b/mercurial/cmdutil.py Sun Jul 15 18:24:57 2018 +0900 @@ -2555,7 +2555,7 @@ mapping = {old.node(): (newid,)} obsmetadata = None if opts.get('note'): - obsmetadata = {'note': opts['note']} + obsmetadata = {'note': encoding.fromlocal(opts['note'])} scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, fixphase=True, targetphase=commitphase)