i18n-it: readd other lost accented characters The problem was introduced already in revision 9f9137cd83f5 by the original Italian translator, according to logs. This might be due to a bug in the program he used, "Lokalize 0.3", or maybe not - some accented characters exist also in that commit.

i18n-it: updates after msgmerge on stable branch

i18n-it: perform msgmerge on the tip of the stable branch

i18n-pt_BR: synchronized with 31dde4c3bb83

dirstate: use one pass to filter out files in subrepos

subrepo: handle diff with working copy We cannot unconditionally call bin(node2) since node2 is None when comparing with the working copy.

subrepos: handle diff nodeids in subrepos, not before Subversion nodeids are integer revisions.

mq: add newline after qfold warning

merge with stable

tests: unify test-locate

tests: unify test-journal-exists

tests: unify test-issue1438 and test-issue2137

keyword: explain file-wise expansion in help

convert: move -A option to --authormap

patchbomb: add --confirm option to show series details and ask for confirmation --confirm presents same prompt as --diffstat, but does not write a diffstat to the messages' bodies. A simple test simulating a negative response is included.

patchbomb: let diffstat prompt only once with complete summary This changes the behaviour of --diffstat. Before the user was asked for confirmation of each patch with its description and diffstat, and a final summary. Now there is only one prompt right before sending with a final summary which does not include the patch descriptions, but the message details and the diffstats: Final summary: From: sender To: recipient(s) Cc: (if present) Bcc: (if present) Reply-To: (if present) Subject: [patch 0 of x [flags]] intro (if present) a | 28 ++++++++++++++++++++++++++++ b | 15 +++++++++++++++ Subject: [patch 1 of x [flags]] subject a | 28 ++++++++++++++++++++++++++++ [ ... ] are you sure you want to send (yn)?

patchbomb: rename argument to avoid shadowing patch module

convert: deprecate --authors in preference for --authormap This aligns the authormap option with the other three mapping options. The old --authors option is still supported and 'hg help convert -v' will still show it.

patchbomb: show prompt and selection in non-interactive mode Akin to 01ada7b1861d for the custom patchbomb prompt.

patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.

tests: unify test-issue*

tests: unify test-globalopts

tests: unify test-git-*

tests: unify test-filebranch

tests: unify test-extension

tests: unify test-execute-bit

tests: unify test-empty-group

merge with stable

convert: better grouping of command line flags in help We normally put related command line flags after one another.

convert: help string cleanups