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

dirstate: skip step 3 in walk if nothing new will match

Browse Source 
nothing will ever match on match.never
nothing new will match on match.exact (all found in step 1)
nothing new will match on match.match when
  there is no pattern and
  there is no direcory in pats
This commit is contained in:
Simon Heimberg 2009-05-14 19:54:26 +02:00
parent 3a8453f88a
commit 4b2cc385e8
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mercurial/dirstate.py
View File

@ -461,6 +461,23 @@ class dirstate(object):
work = []
wadd = work.append
if match.anypats():
#match.match with patterns
dostep3 = True
nomatches = False
elif not match.files():
#match.always or match.never
dostep3 = matchfn('')
nomatches = not dostep3
else:
#match.exact or match.match without pattern
dostep3 = False
nomatches = matchfn == match.exact
if nomatches:
#skip step 2
dirignore = util.always
files = set(match.files())
if not files or '.' in files:
files = ['']
@ -476,6 +493,7 @@ class dirstate(object):
st = lstat(join(nf))
kind = getkind(st.st_mode)
if kind == dirkind:
dostep3 = True
if nf in dmap:
#file deleted on disc but still in dirstate
results[nf] = None
@ -497,6 +515,7 @@ class dirstate(object):
keep = True
break
elif fn.startswith(prefix):
dostep3 = True
keep = True
break
if not keep:
@ -541,11 +560,12 @@ class dirstate(object):
results[nf] = None
# step 3: report unseen items in the dmap hash
visit = sorted([f for f in dmap if f not in results and matchfn(f)])
for nf, st in zip(visit, util.statfiles([join(i) for i in visit])):
if not st is None and not getkind(st.st_mode) in (regkind, lnkkind):
st = None
results[nf] = st
if dostep3 and not nomatches:
visit = sorted([f for f in dmap if f not in results and matchfn(f)])
for nf, st in zip(visit, util.statfiles([join(i) for i in visit])):
if not st is None and not getkind(st.st_mode) in (regkind, lnkkind):
st = None
results[nf] = st
del results['.hg']
return results