This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2468

phases: write phaseroots deterministically
ClosedPublic

Authored by indygreg on Feb 26 2018, 4:32 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGab81e5a8fba5: phases: write phaseroots deterministically
Summary

self.phaseroots is a list of sets of binary nodes.

Let's sort the nodes before writing so the phaseroots file is
written out deterministically.

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

indygreg created this revision.Feb 26 2018, 4:32 PM
yuja accepted this revision.Feb 27 2018, 7:28 AM
This revision is now accepted and ready to land.Feb 27 2018, 7:28 AM
Closed by commit rHGab81e5a8fba5: phases: write phaseroots deterministically (authored by indygreg). · Explain WhyFeb 27 2018, 7:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/phases.py (2 lines)

Diff 6166

mercurial/phases.py

f = self.opener('phaseroots', 'w', atomictemp=True, checkambig=True) f = self.opener('phaseroots', 'w', atomictemp=True, checkambig=True)
try: try:
self._write(f) self._write(f)
finally: finally:
f.close() f.close()
def _write(self, fp): def _write(self, fp):
for phase, roots in enumerate(self.phaseroots): for phase, roots in enumerate(self.phaseroots):
for h in roots: for h in sorted(roots):
fp.write('%i %s\n' % (phase, hex(h))) fp.write('%i %s\n' % (phase, hex(h)))
self.dirty = False self.dirty = False
def _updateroots(self, phase, newroots, tr): def _updateroots(self, phase, newroots, tr):
self.phaseroots[phase] = newroots self.phaseroots[phase] = newroots
self.invalidate() self.invalidate()
self.dirty = True self.dirty = True