Patchwork [2,of,8] dirstate.walk: call match.explicitdir or traversedir as appropriate

login
register
mail settings
Submitter Siddharth Agarwal
Date May 3, 2013, 10:05 p.m.
Message ID <05f54b4c4bddfaa802f4.1367618743@sid0x220>
Download mbox | patch
Permalink /patch/1547/
State Accepted
Commit 1835de2d9c4b3bbfe813b70d04716a2ad5fa026c
Headers show

Comments

Siddharth Agarwal - May 3, 2013, 10:05 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1367209541 25200
#      Sun Apr 28 21:25:41 2013 -0700
# Node ID 05f54b4c4bddfaa802f47c547139264ee4826366
# Parent  1e79492d1382f551d9890f97f5b58f1101bfc004
dirstate.walk: call match.explicitdir or traversedir as appropriate

Patch

diff -r 1e79492d1382 -r 05f54b4c4bdd mercurial/dirstate.py
--- a/mercurial/dirstate.py	Sun Apr 28 21:24:09 2013 -0700
+++ b/mercurial/dirstate.py	Sun Apr 28 21:25:41 2013 -0700
@@ -621,7 +621,7 @@  class dirstate(object):
                     if nf in dmap:
                         #file deleted on disk but still in dirstate
                         results[nf] = None
-                    match.dir(nf)
+                    match.explicitdir(nf)
                     if not dirignore(nf):
                         wadd(nf)
                 elif kind == regkind or kind == lnkkind:
@@ -637,7 +637,7 @@  class dirstate(object):
                     prefix = nf + "/"
                     for fn in dmap:
                         if fn.startswith(prefix):
-                            match.dir(nf)
+                            match.explicitdir(nf)
                             skipstep3 = False
                             break
                     else:
@@ -666,7 +666,7 @@  class dirstate(object):
                 if nf not in results:
                     if kind == dirkind:
                         if not ignore(nf):
-                            match.dir(nf)
+                            match.traversedir(nf)
                             wadd(nf)
                         if nf in dmap and (matchalways or matchfn(nf)):
                             results[nf] = None