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

bisect: allow revsets in addition to single revs (issue2360)

subrepos: add function for iterating over ctx subrepos

subrepos: handle modified but uncommitted .hgsub

localrepo: check nested repos against working directory This checks against what is really in the filesystem, including subrepositories that have been added to .hgsub but not yet committed.

add: clarify that repo[None].add returns rejected filenames

merge with stable