This is an archive of the discontinued Mercurial Phabricator instance.

Differential D755

dirstate: move _dirs to dirstatemap
ClosedPublic

Authored by durham on Sep 20 2017, 8:03 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGaf9722412ac3: dirstate: move _dirs to dirstatemap
rHG63f4047b5710: dirstate: move _dirs to dirstatemap
Summary

As part of moving the dirstate storage logic to a new class, lets move the _dirs
computation onto the class so extensions can replace it with a persisted index
of directories.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durham created this revision.Sep 20 2017, 8:03 PM
indygreg accepted this revision.Sep 24 2017, 11:11 AM
indygreg added a subscriber: indygreg.

Again, I wish a docstring were added. But that can be deferred.

This revision is now accepted and ready to land.Sep 24 2017, 11:11 AM
durham updated this revision to Diff 2079.Sep 26 2017, 6:58 AM
Closed by commit rHG63f4047b5710: dirstate: move _dirs to dirstatemap (authored by durham). · Explain WhySep 29 2017, 2:43 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (8 lines)

Diff 2158

mercurial/dirstate.py

raise error.Abort(_('working directory state appears damaged!')) raise error.Abort(_('working directory state appears damaged!'))
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
return [nullid, nullid] return [nullid, nullid]
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return util.dirs(self._map._map, 'r') return self._map.dirs()
def dirs(self): def dirs(self):
return self._dirs return self._dirs
@rootcache('.hgignore') @rootcache('.hgignore')
def _ignore(self): def _ignore(self):
files = self._ignorefiles() files = self._ignorefiles()
if not files: if not files:
f = {} f = {}
normcase = util.normcase normcase = util.normcase
for name, s in self._map.iteritems(): for name, s in self._map.iteritems():
if s[0] != 'r': if s[0] != 'r':
f[normcase(name)] = name f[normcase(name)] = name
f['.'] = '.' # prevents useless util.fspath() invocation f['.'] = '.' # prevents useless util.fspath() invocation
return f return f
def dirs(self):
"""Returns a set-like object containing all the directories in the
current dirstate.
"""
return util.dirs(self._map, 'r')