This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2469

bookmarks: write bookmarks file deterministically
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGbfb4494f846d: bookmarks: write bookmarks file deterministically
Summary

Bookmarks are internally stored as an unsorted dictionary. Let's at
least write out the bookmarks file in a deterministic order so it is
easier to test, diff, etc.

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:34 PM
yuja accepted this revision.Feb 27 2018, 7:30 AM
This revision is now accepted and ready to land.Feb 27 2018, 7:30 AM
Closed by commit rHGbfb4494f846d: bookmarks: write bookmarks file 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/bookmarks.py (2 lines)

Diff 6168

mercurial/bookmarks.py

f.write(encoding.fromlocal(self._active)) f.write(encoding.fromlocal(self._active))
finally: finally:
f.close() f.close()
else: else:
self._repo.vfs.tryunlink('bookmarks.current') self._repo.vfs.tryunlink('bookmarks.current')
self._aclean = True self._aclean = True
def _write(self, fp): def _write(self, fp):
for name, node in self.iteritems(): for name, node in sorted(self.iteritems()):
fp.write("%s %s\n" % (hex(node), encoding.fromlocal(name))) fp.write("%s %s\n" % (hex(node), encoding.fromlocal(name)))
self._clean = True self._clean = True
self._repo.invalidatevolatilesets() self._repo.invalidatevolatilesets()
def expandname(self, bname): def expandname(self, bname):
if bname == '.': if bname == '.':
if self.active: if self.active:
return self.active return self.active