Mercurial > hg
view tests/test-merge-remove @ 10564:6ded6243bde2 stable
alias: fixes exception when displaying translated help text
__doc__ of aliased command shouldn't cointain non-ASCII characters,
because it'll be gettext-ed later by commands.help_().
Here gettext can raise UnicodeDecodeError.
Once concatenated two translatable strings into one, it become untranslatable.
So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_,
where help texts are translated.
'alias for:' was introduced by 6e8a16dd3e30.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Mon, 01 Mar 2010 23:27:44 +0900 |
parents | 653ddd1d7cd7 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo foo > foo echo bar > bar hg ci -qAm 'add foo bar' echo foo2 >> foo echo bleh > bar hg ci -m 'change foo bar' hg up -qC 0 hg mv foo foo1 echo foo1 > foo1 hg cat foo >> foo1 hg ci -m 'mv foo foo1' hg merge hg debugstate --nodates hg st -q echo '% removing foo1 and bar' cp foo1 F cp bar B hg rm -f foo1 bar hg debugstate --nodates hg st -qC echo '% readding foo1 and bar' cp F foo1 cp B bar hg add -v foo1 bar hg debugstate --nodates hg st -qC echo '% reverting foo1 and bar' hg revert -vr . foo1 bar hg debugstate --nodates hg st -qC hg diff