Patchwork [4,of,4,V2] dirstate.walk: fast path none-seen + match-always case for step 3

login
register
mail settings
Submitter Siddharth Agarwal
Date March 25, 2013, 9:27 p.m.
Message ID <ace6759b143ae99c665f.1364246827@sid0x220>
Download mbox | patch
Permalink /patch/1193/
State Accepted
Commit a18919de61e5a11747a8856e6acfbaaa457fb479
Headers show

Comments

Siddharth Agarwal - March 25, 2013, 9:27 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1363997029 25200
#      Fri Mar 22 17:03:49 2013 -0700
# Node ID ace6759b143ae99c665f0febe46a36a5b428f11e
# Parent  ec21c14bedf4c74d610128555a9f48fdf9577b31
dirstate.walk: fast path none-seen + match-always case for step 3

This case is a common one -- e.g. `hg diff`.

For a repository with 170,000 files, this speeds up perfstatus from 0.95
seconds to 0.88.
Bryan O'Sullivan - March 25, 2013, 11:58 p.m.
On Mon, Mar 25, 2013 at 2:27 PM, Siddharth Agarwal <sid0@fb.com> wrote:

> dirstate.walk: fast path none-seen + match-always case for step 3
>

Series crewed, thanks.

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -702,7 +702,12 @@  class dirstate(object):
 
         # step 3: report unseen items in the dmap hash
         if not skipstep3 and not exact:
-            visit = sorted([f for f in dmap if f not in results and matchfn(f)])
+            if not results and matchalways:
+                visit = dmap.keys()
+            else:
+                visit = [f for f in dmap if f not in results and matchfn(f)]
+            visit.sort()
+
             if unknown:
                 # unknown == True means we walked the full directory tree above.
                 # So if a file is not seen it was either a) not matching matchfn