This is an archive of the discontinued Mercurial Phabricator instance.

Differential D978

dirstate: move write into dirstatemap
ClosedPublic

Authored by durham on Oct 6 2017, 1:19 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHGe2214632c3a2: dirstate: move write into dirstatemap
Summary

As part of separating the dirstate business logic from the dirstate storage
logic, let's move the serialization code down into dirstatemap.

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 6 2017, 1:19 PM
quark accepted this revision.Oct 10 2017, 3:36 PM
durin42 accepted this revision.Oct 14 2017, 12:28 AM
This revision is now accepted and ready to land.Oct 14 2017, 12:28 AM
Closed by commit rHGe2214632c3a2: dirstate: move write into dirstatemap (authored by durham). · Explain WhyOct 14 2017, 12:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (12 lines)

Diff 2707

mercurial/dirstate.py

# multiple of n seconds # multiple of n seconds
clock = time.time() clock = time.time()
start = int(clock) - (int(clock) % delaywrite) start = int(clock) - (int(clock) % delaywrite)
end = start + delaywrite end = start + delaywrite
time.sleep(end - clock) time.sleep(end - clock)
now = end # trust our estimate that the end is near now now = end # trust our estimate that the end is near now
break break
st.write(parsers.pack_dirstate(self._map._map, self._map.copymap, self._map.write(st, now)
self._pl, now))
self._nonnormalset, self._otherparentset = self._map.nonnormalentries() self._nonnormalset, self._otherparentset = self._map.nonnormalentries()
st.close()
self._lastnormaltime = 0 self._lastnormaltime = 0
self._dirty = self._map._dirtyparents = False self._dirty = False
def _dirignore(self, f): def _dirignore(self, f):
if f == '.': if f == '.':
return False return False
if self._ignore(f): if self._ignore(f):
return True return True
for p in util.finddirs(f): for p in util.finddirs(f):
if self._ignore(p): if self._ignore(p):
# this can get very expensive. As a workaround, disable GC while # this can get very expensive. As a workaround, disable GC while
# parsing the dirstate. # parsing the dirstate.
# #
# (we cannot decorate the function directly since it is in a C module) # (we cannot decorate the function directly since it is in a C module)
parse_dirstate = util.nogc(parsers.parse_dirstate) parse_dirstate = util.nogc(parsers.parse_dirstate)
p = parse_dirstate(self._map, self.copymap, st) p = parse_dirstate(self._map, self.copymap, st)
if not self._dirtyparents: if not self._dirtyparents:
self.setparents(*p) self.setparents(*p)
def write(self, st, now):
st.write(parsers.pack_dirstate(self._map, self.copymap,
self.parents(), now))
st.close()
self._dirtyparents = False