Mercurial > hg

changeset 19137:1835de2d9c4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.walk: call match.explicitdir or traversedir as appropriate
author Siddharth Agarwal <sid0@fb.com>
date Sun, 28 Apr 2013 21:25:41 -0700
parents e073ac988b51
children e579687cb5d8
files mercurial/dirstate.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
                     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 @@
                     prefix = nf + "/"
                     for fn in dmap:
                         if fn.startswith(prefix):
-                            match.dir(nf)
+                            match.explicitdir(nf)
                             skipstep3 = False
                             break
                     else:
@@ -666,7 +666,7 @@
                 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