martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9701 AFFECTED FILES mercurial/shelve.py CHANGE DETAILS diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -163,9 +163,6 @@ self.ui, cg, self.fname, btype, self.vfs, compression=compression ) - def writeinfo(self, info): - scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info) - def readinfo(self): return scmutil.simplekeyvaluefile(self.vfs, self.fname).read() @@ -186,6 +183,9 @@ def exists(self): return self.vfs.exists(self.name + b'.' + patchextension) + def writeinfo(self, info): + scmutil.simplekeyvaluefile(self.vfs, self.name + b'.shelve').write(info) + class shelvedstate(object): """Handle persistence during unshelving operations. @@ -471,7 +471,7 @@ def _shelvecreatedcommit(repo, node, name, match): info = {b'node': hex(node)} - shelvedfile(repo, name, b'shelve').writeinfo(info) + Shelf(repo, name).writeinfo(info) bases = list(mutableancestors(repo[node])) shelvedfile(repo, name, b'hg').writebundle(bases, node) with shelvedfile(repo, name, patchextension).opener(b'wb') as fp: @@ -902,7 +902,7 @@ # the unshelve node in case we need to reuse it (eg: unshelve --keep) if node is None: info = {b'node': hex(shelvectx.node())} - shelvedfile(repo, basename, b'shelve').writeinfo(info) + Shelf(repo, basename).writeinfo(info) else: shelvectx = repo[node] To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
