[PATCH 2 of 8] dirstate.walk: call match.explicitdir or traversedir as appropriate
Siddharth Agarwal
sid0 at fb.com
Fri May 3 17:05:43 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at 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
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
More information about the Mercurial-devel
mailing list