##// END OF EJS Templates
dirstate: use keyword arguments to clarify walk()'s callers...
Martin von Zweigbergk -
r34344:255c761a default
parent child Browse files
Show More
@@ -371,7 +371,8 b' def clearfilecache(repo, attrname):'
371 def perfwalk(ui, repo, *pats, **opts):
371 def perfwalk(ui, repo, *pats, **opts):
372 timer, fm = gettimer(ui, opts)
372 timer, fm = gettimer(ui, opts)
373 m = scmutil.match(repo[None], pats, {})
373 m = scmutil.match(repo[None], pats, {})
374 timer(lambda: len(list(repo.dirstate.walk(m, [], True, False))))
374 timer(lambda: len(list(repo.dirstate.walk(m, subrepos=[], unknown=True,
375 ignored=False))))
375 fm.end()
376 fm.end()
376
377
377 @command('perfannotate', formatteropts)
378 @command('perfannotate', formatteropts)
@@ -155,7 +155,8 b' def openlfdirstate(ui, repo, create=True'
155 # largefiles operation in a new clone.
155 # largefiles operation in a new clone.
156 if create and not vfs.exists(vfs.join(lfstoredir, 'dirstate')):
156 if create and not vfs.exists(vfs.join(lfstoredir, 'dirstate')):
157 matcher = getstandinmatcher(repo)
157 matcher = getstandinmatcher(repo)
158 standins = repo.dirstate.walk(matcher, [], False, False)
158 standins = repo.dirstate.walk(matcher, subrepos=[], unknown=False,
159 ignored=False)
159
160
160 if len(standins) > 0:
161 if len(standins) > 0:
161 vfs.makedirs(lfstoredir)
162 vfs.makedirs(lfstoredir)
@@ -428,7 +429,8 b' def getstandinsstate(repo):'
428 standins = []
429 standins = []
429 matcher = getstandinmatcher(repo)
430 matcher = getstandinmatcher(repo)
430 wctx = repo[None]
431 wctx = repo[None]
431 for standin in repo.dirstate.walk(matcher, [], False, False):
432 for standin in repo.dirstate.walk(matcher, subrepos=[], unknown=False,
433 ignored=False):
432 lfile = splitstandin(standin)
434 lfile = splitstandin(standin)
433 try:
435 try:
434 hash = readasstandin(wctx[standin])
436 hash = readasstandin(wctx[standin])
@@ -573,7 +575,8 b' def updatestandinsbymatch(repo, match):'
573 # Case 2: user calls commit with specified patterns: refresh
575 # Case 2: user calls commit with specified patterns: refresh
574 # any matching big files.
576 # any matching big files.
575 smatcher = composestandinmatcher(repo, match)
577 smatcher = composestandinmatcher(repo, match)
576 standins = repo.dirstate.walk(smatcher, [], False, False)
578 standins = repo.dirstate.walk(smatcher, subrepos=[], unknown=False,
579 ignored=False)
577
580
578 # No matching big files: get out of the way and pass control to
581 # No matching big files: get out of the way and pass control to
579 # the usual commit() method.
582 # the usual commit() method.
@@ -2708,8 +2708,8 b' def add(ui, repo, match, prefix, explici'
2708 dirstate = repo.dirstate
2708 dirstate = repo.dirstate
2709 # We don't want to just call wctx.walk here, since it would return a lot of
2709 # We don't want to just call wctx.walk here, since it would return a lot of
2710 # clean files, which we aren't interested in and takes time.
2710 # clean files, which we aren't interested in and takes time.
2711 for f in sorted(dirstate.walk(badmatch, sorted(wctx.substate),
2711 for f in sorted(dirstate.walk(badmatch, subrepos=sorted(wctx.substate),
2712 True, False, full=False)):
2712 unknown=True, ignored=False, full=False)):
2713 exact = match.exact(f)
2713 exact = match.exact(f)
2714 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2714 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2715 if cca:
2715 if cca:
@@ -1478,8 +1478,9 b' class committablectx(basectx):'
1478
1478
1479 def walk(self, match):
1479 def walk(self, match):
1480 '''Generates matching file names.'''
1480 '''Generates matching file names.'''
1481 return sorted(self._repo.dirstate.walk(match, sorted(self.substate),
1481 return sorted(self._repo.dirstate.walk(match,
1482 True, False))
1482 subrepos=sorted(self.substate),
1483 unknown=True, ignored=False))
1483
1484
1484 def matches(self, match):
1485 def matches(self, match):
1485 return sorted(self._repo.dirstate.matches(match))
1486 return sorted(self._repo.dirstate.matches(match))
@@ -760,8 +760,8 b' def _interestingfiles(repo, matcher):'
760
760
761 ctx = repo[None]
761 ctx = repo[None]
762 dirstate = repo.dirstate
762 dirstate = repo.dirstate
763 walkresults = dirstate.walk(matcher, sorted(ctx.substate), True, False,
763 walkresults = dirstate.walk(matcher, subrepos=sorted(ctx.substate),
764 full=False)
764 unknown=True, ignored=False, full=False)
765 for abs, st in walkresults.iteritems():
765 for abs, st in walkresults.iteritems():
766 dstate = dirstate[abs]
766 dstate = dirstate[abs]
767 if dstate == '?' and audit_path.check(abs):
767 if dstate == '?' and audit_path.check(abs):
General Comments 0
You need to be logged in to leave comments. Login now