Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3 @ 879:953ccddd57bd
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
author | mason@suse.com |
---|---|
date | Fri, 12 Aug 2005 07:10:21 -0800 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
402 | 2 |
3 hg init | |
4 echo This is file a1 > a | |
5 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
6 hg commit -m "commit #0" -d "0 0" |
402 | 7 touch b |
8 hg add b | |
9 rm b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
10 hg commit -A -m"comment #1" -d "0 0" |