This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1252

dirstate: move clear onto dirstatemap class
ClosedPublic

Authored by durham on Oct 26 2017, 7:25 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG0217f75b6e59: dirstate: move clear onto dirstatemap class
Summary

A future diff will move the lazy loading aspect of dirstate to the dirstatemap
class. This means it requires a slightly different strategy of clearing than
just reinstantiating the object (since just reinstantiating the object will
lazily load the on disk data again later instead of remaining permanently
empty).

So let's give it it's own clear function.

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.Oct 26 2017, 7:25 PM
yuja accepted this revision.Oct 28 2017, 3:46 AM
This revision is now accepted and ready to land.Oct 28 2017, 3:46 AM
Closed by commit rHG0217f75b6e59: dirstate: move clear onto dirstatemap class (authored by durham). · Explain WhyOct 28 2017, 4:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (8 lines)

Diff 3145

mercurial/dirstate.py

- version provided via command arguments - version provided via command arguments
''' '''
if self._checkcase: if self._checkcase:
return self._normalize(path, isknown, ignoremissing) return self._normalize(path, isknown, ignoremissing)
return path return path
def clear(self): def clear(self):
self._map = dirstatemap(self._ui, self._opener, self._root) self._map.clear()
self._map.setparents(nullid, nullid)
self._lastnormaltime = 0 self._lastnormaltime = 0
self._updatedfiles.clear() self._updatedfiles.clear()
self._dirty = True self._dirty = True
def rebuild(self, parent, allfiles, changedfiles=None): def rebuild(self, parent, allfiles, changedfiles=None):
if changedfiles is None: if changedfiles is None:
# Rebuild entire dirstate # Rebuild entire dirstate
changedfiles = allfiles changedfiles = allfiles
self._map = {} self._map = {}
self.copymap = {} self.copymap = {}
self._parents = None self._parents = None
self._dirtyparents = False self._dirtyparents = False
# for consistent view between _pl() and _read() invocations # for consistent view between _pl() and _read() invocations
self._pendingmode = None self._pendingmode = None
def clear(self):
self._map = {}
self.copymap = {}
self.setparents(nullid, nullid)
def iteritems(self): def iteritems(self):
return self._map.iteritems() return self._map.iteritems()
def __len__(self): def __len__(self):
return len(self._map) return len(self._map)
def __iter__(self): def __iter__(self):
return iter(self._map) return iter(self._map)