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.

run-tests: '--time' option provide more details to Linux users As our tests execute in child processes, this patch uses os.times() module in replace of time.time() module to provide additional info like user time and system time spent by child's processes along with real elapsed time taken by a process. There is one limitation of this patch. It can work only for Linux users and not for Windows. "os.times" module returns a 5-tuple of a floaing point numbers. 1) User time 2) System time 3) Child's user time 4) Child's system time 5) Ellapsed real time On Windows, only the first two items are filled, the others are zero. Therefore, below test cases does not break on Windows but instead gives the zero value.

merge with stable

Added signature for changeset 3178e4989202

Added tag 3.1 for changeset 3178e4989202

status: do not reverse deleted and unknown When reversing a status, trading "added" and "removed" make sense. Reversing "deleted" and "unknown" does not. We stop doing it. The reversing is documented in place for the poor soul not even able to remember the index of all status elements by heart.

status: don't drop unknown and ignored information (issue4321) By the magic of code movement, we ended up dropping unknown and ignored information when comparing the working directory with a non-parent revision. Let's stop doing it and add a test.

status: explicitly exclude removed file from unknown and ignored Changeset 64fe488b5179 introduced a test to validate that file were not reported twice when both unknown and removed. This behavior change was introduced by 65cdc6bab91e alongside a bug that dropped ignored and unknown completely (issue4321). As we are going to fix the bug, we need a proper implementation of the behavior tested in 64fe488b5179.