--- a/mercurial/shelve.py	Thu Jan 07 11:22:21 2021 -0800
+++ b/mercurial/shelve.py	Thu Jan 07 11:28:41 2021 -0800
@@ -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)