Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge2.out
author mason@suse.com
Fri, 12 Aug 2005 07:10:21 -0800
changeset 879 953ccddd57bd
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
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 ===================================================================
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     3
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     5
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     8
 
+ hg commit -m commit #2 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
     9
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    10
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    11
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    12
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    13
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    14
 
+ hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    15
 
+ hg commit -A -m commit #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
    16
 
adding b
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    17
 
+ hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    18
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    19
 
+ hg commit -m commit #0 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    20
 
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    21
 
+ hg commit -m commit #1 -d 0 0
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    22
 
+ hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset 
    23
 
+ hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
    24
 
+ hg commit -A -m commit #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
    25
 
adding b
mercurial-crew-with-dirclash