backout: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: COMMAND[.ROUTE] - ROUTE: name of route, if there are two or more routes in COMMAND In this patch, ROUTE is omitted..

transplant: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch, COMMAND and ROUTE are omitted.

shelve: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch: - 'shelve' is used as COMMAND - ROUTE is omitted

rebase: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch: - COMMAND is omitted - 'normal' and 'collapse' are used as ROUTE

mq: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch: - MQ command names (qnew/qrefresh/qfold) are used as COMMAND - ROUTE is omitted

histedit: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes for COMMAND In this patch: - 'edit', 'fold', 'mess' and 'pick' are used as COMMAND - ROUTE is omitted 'histedit.pick' case is very rare, but possible if: - target revision causes conflict at merging (= requires '--continue'), and - description of it is empty ('hg commit -m " "' can create such one) In the code path for 'histedit --continue' (the last patch hunk), 'canonaction' doesn't contain the entry for 'fold', because 'fold' action causes: - using temporary commit message forcibly, and - making 'editopt' False always (= omit editor invocation if commit message is specified)

gpg: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch, 'sign' is used as COMMAND, and ROUTE is omitted.

fetch: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch, COMMAND and ROUTE are omitted.

cmdutil: introduce 'editform' to distinguish the purpose of commit text editing This information will be used to switch '[committemplate] changeset' definition according to its purpose in the subsequent patch. This information also makes it easier to hook commit text editing only in the specific cases.

log: allow patterns with -f It's not uncommon for a user to want to run log with a pattern or directory name on the history of their current commit. Currently we prevent that, but I can't think of any reason to continue blocking that. This commit removes the restriction and allows 'hg log -f <dir/pat>'

run-tests: fix test result counts with --keyword specified or skips occurring This preserves the current behavior that excludes ignored or skipped tests from the number of tests run, except when tests are ignored due to the --retest flag.

test-run-tests.t: add tests for skips This will make some minor behavior changes in a future patch more obvious.

test-run-tests.t: add extra data to tests for keyword tests This adds a fair amount of overall instability in the enclosing .t. As such, this is performed in its own commit, and a test for --keyword on run-tests.t will be added in a followup change.

purge: drop stat import

run-tests: add iolock to failure output

merge with stable

color: pass on key error for win32 (issue4298) This is a quick fix for some consoles on windows (consoles that are not mingw based) so that the debugcolor command doesn't throw a KeyError when effects aren't supported (e.g. italic).

context: call normal on the right object dirstate.normal is the method that marks files as unchanged/normal. Rev 20a30cd41d21 started caching dirstate.normal in order to improve performance. However, there was an error in the patch: taking the wlock, under some conditions depending on platform, can cause a new dirstate object to be created. Caching dirstate.normal before calling wlock would then cause the fixup calls below to be on the old dirstate object, effectively disappearing into the ether. On Unix and Unix-like OSes, the condition under which we create a new dirstate object is 'the dirstate file has been modified since the last time we opened it'. This happens pretty rarely, so the object is usually the same -- there's little impact. On Windows, the condition is 'always'. This means files in the lookup state are never marked normal, so the bug has a serious performance impact since all the files in the lookup state are re-read every time hg status is run.

getbundle: add a ``cg`` boolean argument to control changegroup inclusion The ``getbundle`` function was initially design to return a changegroup bundle. However, bundle2 allows transmitting a wide range of data. Some bundle2 requests may not include a changegroup at all. Before this changeset, the client would request a changegroup for ``heads=[nullid]`` and receive an empty changegroup. We introduce an official boolean parameter, ``cg``, that can be set to false to disable changegroup generation on getbundle. A new bundle2 capability is introduced to let the client know.

wireproto: add a ``boolean`` type for getbundle parameters This will be used to control inclusion of some parts in a bundle2.

i18n: detect UI language without POSIX-style locale variable on Windows (BC) On Windows, it isn't common to set LANG environment variable. This patch makes gettext honor Windows-style UI language [1] if no locale variables are set. Because of this change, LANG=C or HGPLAIN must be set in order to disable translation on non-English Windows. [1]: http://msdn.microsoft.com/en-us/library/dd374098(v=VS.85).aspx

locate: use ctx.matches instead of ctx.walk On mozilla-central, which is around 100,000 files, best of 5: $ hg --time locate > /dev/null before: real 1.460 secs (user 1.140+0.000 sys 0.320+0.000) after: real 0.620 secs (user 0.610+0.000 sys 0.020+0.000) $ hg --time locate README > /dev/null before: real 0.630 secs (user 0.330+0.000 sys 0.290+0.000) after: real 0.120 secs (user 0.110+0.000 sys 0.020+0.000) Larger repositories see correspondingly larger performance gains.

context: add a method to efficiently filter by match if possible For non-working contexts, walk and matches do the same thing. For working contexts, walk stats all the files and looks for unknown files, while matches just filters the dirstate by match.

dirstate: add a method to efficiently filter by match Current callers that require just this data call workingctx.walk, which calls dirstate.walk, which stats all the files. Even worse, workingctx.walk looks for unknown files, significantly slowing things down, even though callers might not be interested in them at all.

purge: prefer util.unlink instead over own removefile

keyword: bump copyright year

keyword: really clean up kwdemo temp tree

graft: make --force apply across continues (issue3220) Since --force determines the list of revisions to be grafted, it doesn't really make sense for users to have to keep typing --force --continue as they continue grafting.

graft: allow regrafting ancestors with --force (issue3220)

test-obsolete: better logging template Gratuitous improvement of the test readability.