Merge with stable
zsh completion: complete additional topics for `help`, not commands only

--HG--
extra : rebase_source : 04eb375280603f9dc7d7837e392562d75ca1bab8
zsh completion: add `forget` and `rollback` commands

--HG--
extra : rebase_source : a20584f91b413784e8ee2dc170811758a927dfa8
zsh completion: add new option groups for options

Add clone, date/user, git-style, merge tool, ignore space, log,
branch/bookmarks options and use them throughout command completions.

--HG--
extra : rebase_source : 880972a1c18109c41b5927fe01e8fb43a6101cd3
zsh completion: add subrepos options for all supporting commands

--HG--
extra : rebase_source : 859a043d2ea00556fda5142ab11a60c7ab0c390e
zsh completion: add support for convert, graphlog, purge, record extensions

--HG--
extra : rebase_source : e75cc2935aae8fa03c9b41eb770aacd84df3f7f8
zsh completion: add new options for existing commands

 * backout: add --tool;
 * bisect: add --extend;
 * bookmarks: add --inactive;
 * branches: add --closed;
 * bundle: add --rev, --all, --branch;
 * cat: add --decode;
 * clone: add --updaterev, --branch, --pull and use common-with-qclone opts;
 * commit: add --close-branch;
 * diff: add --change, --reverse, --stat, --text, --unified;
 * export: add --rev;
 * grep: add --date;
 * heads: add --topo, --closed;
 * help: add --extension, --command, --keywords; complete additional help
   topics also, not commands only;
 * identify: add --bookmark and remote_opts;
 * import: add --no-commit, --exact, --import-branch, --date, --user,
   --similarity and commit options;
 * log: add --user, --date, --stat, --git, --graph;
 * manifest: add --rev;
 * push: add --new-branch;
 * resolve: add --all, --no-status, --tool and pattern options;
 * revert: add --date;
 * serve: add --prefix, --web-conf, --pid-file, --cmdserver, --certificate;
 * status: add --change;
 * tag: add --force, --edit, --remove;
 * tip: add --git;
 * update: add --check, --date.

--HG--
extra : rebase_source : 2f9f44f985a6304b9f56c97e04391b79ff3aee13
zsh completion: update mq commands completion

 * add qclone command;
 * qapplied/qunapplied: add --last/--first;
 * qdiff: add all diff options;
 * qfold: add --force, --no-backup;
 * qgoto: add --keep-changes;
 * qimport: add --git, --push;
 * qnew: add user- and date-related options;
 * qpop/qpush: add --keep-changes and --no-backup, drop --name;
 * qpush: drop deprecated --merge;
 * qrename: complete only unapplied patches' names;
 * strip: add --rev, --keep, --bookmark, update descriptions, drop --backup.

--HG--
extra : rebase_source : ee34c1ffc88891c1b6ca9bb3c55cb8577fcd9005
zsh completion: tweak options for `incoming`, `outgoing` and `rebase`

 * `incoming --rev` completes _hg_labels, not jsut tags;
 * `outgoing --rev` completes revrange;
 * source/dest/base for `rebase` require argument.

--HG--
extra : rebase_source : 510a3451f691fabcf0bd3ab4edffffde0767ba92
tests: merging bookmarked heads

45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.

--HG--
branch : stable
extra : rebase_source : 2d2dbd883544da5b6c84c22533c70b4f72aa4c03
obsolete: import modules within mercurial/ without "from mercurial"

--HG--
branch : stable
extra : rebase_source : b2cc9cd62bb3c076e8ab80edec718614b8f98997
test-hybridencode: add cases for com0..9 and lpt0..9

note that com0 and lpt0 are *not* encoded

--HG--
extra : rebase_source : dbf2ff6e9ce0093deccf96afa8cef890e06efd55
merge with stable