facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

Ensure that dirstate.walk only yields names once.

Browse Source 
Its predecessor code used to do this, and now it does, too.
This commit is contained in:
Bryan O'Sullivan 2005-07-31 17:54:00 -08:00
parent 2f2a31ce76
commit 25438a68e9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/hg.py
View File

@ -440,6 +440,10 @@ class dirstate:
dc = self.map.copy()
# walk all files by default
if not files: files = [self.root]
known = {'.hg': 1}
def seen(fn):
if fn in known: return True
known[fn] = 1
def traverse():
for f in util.unique(files):
f = os.path.join(self.root, f)
@ -447,7 +451,7 @@ class dirstate:
for dir, subdirs, fl in os.walk(f):
d = dir[len(self.root) + 1:]
nd = os.path.normpath(d)
if nd == '.hg':
if seen(nd):
subdirs[:] = []
continue
for sd in subdirs:
@ -468,6 +472,7 @@ class dirstate:
for src, fn in util.unique(traverse()):
fn = os.path.normpath(fn)
if seen(fn): continue
if fn in dc:
del dc[fn]
elif self.ignore(fn):