The set-like object returned by dirstate.dirs may be difficult for other
implementations of the dirstate to provide, and is unnecessary as it is
only ever used for contains. Instead, provide an explicit method for
testing for a directory.
.. api::
dirstate no longer provides a `dirs()` method. To test for the existence of a directory in the dirstate, use `dirstate.hasdir(dirname)`.
| Lint Skipped |
| Unit Tests Skipped |
Looks good. For bonus points do one more upload with the right .. api:: annotation for the releasenotes extension.
| mercurial/dirstate.py | ||
|---|---|---|
| 393 | The external dirstate object only provides hasdir(), however the internal object needs to provide two objects as there are two behaviours it needs to expose: hastrackeddir() considers only files that are not marked as removed. This is used almost everywhere. hasdir() additionally considers directories that contain only removed files. This is used in one place below (line 803). I don't understand what _walkexplicit is trying to do, so I haven't changed it. I'm not convinced _walkexplicit is correct, though. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (10 lines) | |||
| M | hgext/largefiles/reposetup.py (4 lines) | |||
| M | mercurial/dirstate.py (59 lines) |
| fm.end() | fm.end() | ||||
| @command('perfdirs', formatteropts) | @command('perfdirs', formatteropts) | ||||
| def perfdirs(ui, repo, **opts): | def perfdirs(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| 'a' in dirstate | 'a' in dirstate | ||||
| def d(): | def d(): | ||||
| dirstate.dirs() | dirstate.hasdir('a') | ||||
| del dirstate._map.dirs | del dirstate._map._dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstate', formatteropts) | @command('perfdirstate', formatteropts) | ||||
| def perfdirstate(ui, repo, **opts): | def perfdirstate(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| def d(): | def d(): | ||||
| repo.dirstate.invalidate() | repo.dirstate.invalidate() | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatedirs', formatteropts) | @command('perfdirstatedirs', formatteropts) | ||||
| def perfdirstatedirs(ui, repo, **opts): | def perfdirstatedirs(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| "a" in repo.dirstate | "a" in repo.dirstate | ||||
| def d(): | def d(): | ||||
| "a" in repo.dirstate._map.dirs | repo.dirstate.hasdir("a") | ||||
| del repo.dirstate._map.dirs | del repo.dirstate._map._dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatefoldmap', formatteropts) | @command('perfdirstatefoldmap', formatteropts) | ||||
| def perfdirstatefoldmap(ui, repo, **opts): | def perfdirstatefoldmap(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| 'a' in dirstate | 'a' in dirstate | ||||
| def d(): | def d(): | ||||
| dirstate._map.filefoldmap.get('a') | dirstate._map.filefoldmap.get('a') | ||||
| del dirstate._map.filefoldmap | del dirstate._map.filefoldmap | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirfoldmap', formatteropts) | @command('perfdirfoldmap', formatteropts) | ||||
| def perfdirfoldmap(ui, repo, **opts): | def perfdirfoldmap(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| 'a' in dirstate | 'a' in dirstate | ||||
| def d(): | def d(): | ||||
| dirstate._map.dirfoldmap.get('a') | dirstate._map.dirfoldmap.get('a') | ||||
| del dirstate._map.dirfoldmap | del dirstate._map.dirfoldmap | ||||
| del dirstate._map.dirs | del dirstate._map._dirs | ||||
| timer(d) | timer(d) | ||||
| fm.end() | fm.end() | ||||
| @command('perfdirstatewrite', formatteropts) | @command('perfdirstatewrite', formatteropts) | ||||
| def perfdirstatewrite(ui, repo, **opts): | def perfdirstatewrite(ui, repo, **opts): | ||||
| timer, fm = gettimer(ui, opts) | timer, fm = gettimer(ui, opts) | ||||
| ds = repo.dirstate | ds = repo.dirstate | ||||
| "a" in ds | "a" in ds | ||||
| if not working: | if not working: | ||||
| return files | return files | ||||
| newfiles = [] | newfiles = [] | ||||
| dirstate = self.dirstate | dirstate = self.dirstate | ||||
| for f in files: | for f in files: | ||||
| sf = lfutil.standin(f) | sf = lfutil.standin(f) | ||||
| if sf in dirstate: | if sf in dirstate: | ||||
| newfiles.append(sf) | newfiles.append(sf) | ||||
| elif sf in dirstate.dirs(): | elif dirstate.hasdir(sf): | ||||
| # Directory entries could be regular or | # Directory entries could be regular or | ||||
| # standin, check both | # standin, check both | ||||
| newfiles.extend((f, sf)) | newfiles.extend((f, sf)) | ||||
| else: | else: | ||||
| newfiles.append(f) | newfiles.append(f) | ||||
| return newfiles | return newfiles | ||||
| m = copy.copy(match) | m = copy.copy(match) | ||||
| m._files = tostandins(m._files) | m._files = tostandins(m._files) | ||||
| result = orig(node1, node2, m, ignored, clean, unknown, | result = orig(node1, node2, m, ignored, clean, unknown, | ||||
| listsubrepos) | listsubrepos) | ||||
| if working: | if working: | ||||
| def sfindirstate(f): | def sfindirstate(f): | ||||
| sf = lfutil.standin(f) | sf = lfutil.standin(f) | ||||
| dirstate = self.dirstate | dirstate = self.dirstate | ||||
| return sf in dirstate or sf in dirstate.dirs() | return sf in dirstate or dirstate.hasdir(sf) | ||||
| match._files = [f for f in match._files | match._files = [f for f in match._files | ||||
| if sfindirstate(f)] | if sfindirstate(f)] | ||||
| # Don't waste time getting the ignored and unknown | # Don't waste time getting the ignored and unknown | ||||
| # files from lfdirstate | # files from lfdirstate | ||||
| unsure, s = lfdirstate.status(match, subrepos=[], | unsure, s = lfdirstate.status(match, subrepos=[], | ||||
| ignored=False, | ignored=False, | ||||
| clean=listclean, | clean=listclean, | ||||
Can you just use hasdir here instead so there's only one thing to override?