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))