i18n-pt_BR: synchronized with
f142fa3c0a8c
fetch: fix newheads calculation (
issue2047)
Make annotate --follow an alias for -f/--file to behave like in older versions
Since
98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
store: only add new entries to the fncache file
Newly added fncache entries were not added to the in-memory cache,
making it possible for 'hg convert' to cause duplicates in
.hg/store/fncache.
Duplicates in the fncache file are harmless, but excessive numbers
of duplicates from large converted repositories may slow down
execution speed considerably.
Updated test output of test-convert-baz after
f2618cacb485
doc/ja: remove old Japanese man page translations
They were added way back in 2005 and haven't been updated since. They
are no longer referenced by the Makefiles at upper levels and have not
been shipped with a recent version of Mercurial.
i18n-sv: synchronized with
f4f3a74ce832
i18n-pt_BR: synchronized with
b1339234080e
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
HGPLAIN should suppress them because they change Mercurial's default
output.
i18n-ja: synchronized with
bb4561401c84
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.
i18n-sv: synchronized with
d1bbf01c4a8e
tests: update output to match
b1339234080e
Add ElementPath to the list of package ignored by demand import
The bzrlib try to import the ElementPath module but had a fallback in
case the import fails. Lazy import of this module leads to later
failure.
The bzrlib is used by the convert extension.
resolve: rewrite help to be clearer and more complete (
issue2030).
mq: simplify --mq handling / keep compatibility with other extensions
reported by edgimar on IRC
i18n-da: synchronized with
091dddf05764
i18n-ja: synchronized with
4462760d6cfc
i18n-pt_BR: synchronized with
dd3526162436