status: don't drop unknown and ignored information (issue4321) By the magic of code movement, we ended up dropping unknown and ignored information when comparing the working directory with a non-parent revision. Let's stop doing it and add a test.

status: explicitly exclude removed file from unknown and ignored Changeset 64fe488b5179 introduced a test to validate that file were not reported twice when both unknown and removed. This behavior change was introduced by 65cdc6bab91e alongside a bug that dropped ignored and unknown completely (issue4321). As we are going to fix the bug, we need a proper implementation of the behavior tested in 64fe488b5179.

merge with i18n some more

merge with i18n

i18n-ja: synchronized with f582fa1167f7

i18n-pt_BR: synchronized with dccbf52ffe9f

log: do not use exact matcher for --patch --follow without file (issue4319) e2530d4a47c1 is valid only if file argument is specified. If no pattern specified, it can simply fall back to the original matcher.

qimport: record imported revs incrementally (issue3874) When an import fails, this doesn't lose the state for the earlier revisions.

test-bundle2: add missing os import

merge with i18n

i18n-ja: synchronized with 838025b15925

help: always show command help with -h (issue4240) Old behavior: hg help x hg x -h hg help -e x hg help -c x config topic topic (!) - cmd showconfig cmd topic (!) - cmd rebase cmd cmd ext cmd New behavior: hg help x hg x -h hg help -e x hg help -c x config topic cmd - cmd showconfig cmd cmd - cmd rebase cmd cmd ext cmd

templater: add i18n comments to error messages of newly added functions This patch adds i18n comments to error messages of newly added functions "startswith" (introduced by 4a445dc5abff) and "word" (by 8f23f8096606).

commands: make the warning message for "patch --partial" translatable This patch makes the warning message for "patch --partial" translatable: this message was introduced by bee0e1cffdd3, and there is no reason to prevent this from being translatable.

convert: fix argument mismatch at formatting the abort message This patch fixes argument mismatch at formatting the abort message, introduced by a204fd9b5ba9: the last '%s' doesn't have corresponded argument. This patch uses "unexpected size" in the abort message, to distinguish the reason of failure from "unexpected type" failure checked in the prior code path below: if info[1] != type: raise util.Abort(_('cannot read %r object at %s') % (type, rev))

debuginstall: handle quoted path for editor (issue4316) When using an editor path with spaces and options, you can set 'ui.editor' to '"/path to your/editor" -opt' and it works fine but 'hg debuginstall' is complaining about it because it simply splits the editor and tests presence of '"/path'. Now correctly parse 'ui.editor' string by handling quoted path.

test-bundle2: move file mode setting after sys import

config: allow 'user' in .hgrc ui section (issue3169)

merge with i18n

i18n-pt_BR: synchronized with ad56fc55cbc3

doc: unify help text for "--edit" option This patch changes help text for "--edit" option of commands below: - fetch - qnew - qrefresh - qfold - commit - tag This unification reduces translation cost, too. This patch chooses not "further edit commit message already specified" (of "hg commit") but "invoke editor on commit messages" as unified help text for "--edit" option, because the latter is much older than the former.

doc: unify help text for "--message" option This patch changes help text for "--message" option of commands below for unification. - sign (of gpg) - tag This unification reduces translation cost, too. This patch doesn't change the description for "--message" of "hg rebase" below, because this should contain "collapse" word to explain its purpose (only for "--collapse") clearly. use text as collapse commit message

histedit: respect revsetalias entries (issue4311) We now expand user-provided revsets before using repo.revs() to locate the root(s) of the user-specified set.

graft: add a reference to revsets to the help text (issue3362)

i18n: add parenthesis in Brazilian translation of the resolve message Eu falo brasileiro agora. Eu não sou uma batata!

resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.

help: mention '-T list' in templater topic

help: drop reference to glog in templates topic

templates: re-add template listing support We used to have --style nosuch to list templates, but --style is now merged with --template/-T where random strings are acceptable templates. So we reserve 'list' to allow listing templates.

help: use --template to specify existing style --style is deprecated since 3a35ba2681ec and 870d60294b04.