i18n: merge with stable

i18n: merge with stable

i18n: merged stable heads

i18n-it: finish translating 'hg summary' output

i18n-it: remove bogus fuzzy translations for revset The translations were all random fuzzy strings, which can only do harm, so remove them. Moreover, given the status of revset (it seems mostly an internal undocumented module, and to understand it you need the source anyway), I prefer not to translate it for now.

i18n-it: update fuzzy messages/translate patchbomb

i18n-it: update mq translation Significant updates were performed - when translating something, I tried to choose a term and use it consistently everywhere possible, so here I translated a lot of messages. Additionally, I use the mq extension a lot, and now I am using the translation, so I will be able to translate it better.

i18n-it: updates after msgmerge on stable branch, 2nd part

i18n-it: general updates fuzzy synopsis texts This patch follows the fix on the translation of [OPTION]... with other needed updates on the same class of messages.

i18n-it: translate [OPTION]..., not [OPTIONS]...: keep the singular Since [OPTION]... is intended to mean more options, it was translated in Italian as plural. However the plural is conveyed by `...', so switch to the singular. This was also useful because for the '-o OPT' extdiff option, I have to translate `OPT' as a singular.

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

convert: better quoting in help text

convert: show example splice, author, and branch map entries in help Also document that - empty lines are skipped and comment are supported in author map - whitespace is not allowed in branch map entries since we split on it when parsing the file

hgweb: support very simple caching model (issue1845)

tests: extend get-with-headers to support cache testing

tests: fix test output for test-hgweb-no* tests

tests: rename test for better grouping

check-code: fix ternary expression introduced in 1ef9b0b5efec

bisect: warn about ending on a merge with only one side marked