Skip to content
Snippets Groups Projects
Commit 157305bf authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

shelve: move method for reading .shelve file to new shelf class

Differential Revision: https://phab.mercurial-scm.org/D9702
parent a344ec05
No related branches found
No related tags found
No related merge requests found
......@@ -163,9 +163,6 @@
self.ui, cg, self.fname, btype, self.vfs, compression=compression
)
def readinfo(self):
return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
class Shelf(object):
"""Represents a shelf, including possibly multiple files storing it.
......@@ -186,6 +183,11 @@
def writeinfo(self, info):
scmutil.simplekeyvaluefile(self.vfs, self.name + b'.shelve').write(info)
def readinfo(self):
return scmutil.simplekeyvaluefile(
self.vfs, self.name + b'.shelve'
).read()
class shelvedstate(object):
"""Handle persistence during unshelving operations.
......@@ -894,7 +896,7 @@
repo = repo.unfiltered()
node = None
if shelvedfile(repo, basename, b'shelve').exists():
node = shelvedfile(repo, basename, b'shelve').readinfo()[b'node']
node = Shelf(repo, basename).readinfo()[b'node']
if node is None or node not in repo:
with ui.configoverride({(b'ui', b'quiet'): True}):
shelvectx = shelvedfile(repo, basename, b'hg').applybundle(tr)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment