This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9742

shelve: add a method for deleting shelf to new shelf class
ClosedPublic

Authored by martinvonz on Jan 12 2021, 5:48 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf8c5e6ecd008: shelve: add a method for deleting shelf to new shelf class
rHGa17d4face995: shelve: add a method for deleting shelf to new shelf class
rHGa4798e6818a3: shelve: add a method for deleting shelf to new shelf class
Summary

This is not necessary for my future changes, but it's more consistent
to encapsulate the knowledge of the various files in the Shelf
class.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (11 lines)

Diff 24957

mercurial/shelve.py

def __init__(self, vfs, name): def __init__(self, vfs, name):
self.vfs = vfs self.vfs = vfs
self.name = name self.name = name
@staticmethod @staticmethod
def open(repo, name): def open(repo, name):
return Shelf(vfsmod.vfs(repo.vfs.join(shelvedir)), name) return Shelf(vfsmod.vfs(repo.vfs.join(shelvedir)), name)
@staticmethod
def open_backup(repo, name):
return Shelf(vfsmod.vfs(repo.vfs.join(backupdir)), name)
def exists(self): def exists(self):
return self.vfs.exists(self.name + b'.patch') and self.vfs.exists( return self.vfs.exists(self.name + b'.patch') and self.vfs.exists(
self.name + b'.hg' self.name + b'.hg'
) )
def mtime(self): def mtime(self):
return self.vfs.stat(self.name + b'.patch')[stat.ST_MTIME] return self.vfs.stat(self.name + b'.patch')[stat.ST_MTIME]
for suffix in shelvefileextensions: for suffix in shelvefileextensions:
filename = self.name + b'.' + suffix filename = self.name + b'.' + suffix
if self.vfs.exists(filename): if self.vfs.exists(filename):
util.rename( util.rename(
self.vfs.join(filename), self.vfs.join(filename),
self._backupfilename(backupvfs, filename), self._backupfilename(backupvfs, filename),
) )
def delete(self):
for ext in shelvefileextensions:
self.vfs.tryunlink(self.name + b'.' + ext)
class shelvedstate(object): class shelvedstate(object):
"""Handle persistence during unshelving operations. """Handle persistence during unshelving operations.
Handles saving and restoring a shelved state. Ensures that different Handles saving and restoring a shelved state. Ensures that different
versions of a shelved state are possible and handles them appropriately. versions of a shelved state are possible and handles them appropriately.
""" """
if maxbackups > 0 and maxbackups < len(hgfiles): if maxbackups > 0 and maxbackups < len(hgfiles):
bordermtime = hgfiles[maxbackups - 1][0] bordermtime = hgfiles[maxbackups - 1][0]
else: else:
bordermtime = None bordermtime = None
for mtime, name in hgfiles[maxbackups:]: for mtime, name in hgfiles[maxbackups:]:
if mtime == bordermtime: if mtime == bordermtime:
# keep it, because timestamp can't decide exact order of backups # keep it, because timestamp can't decide exact order of backups
continue continue
for ext in shelvefileextensions: Shelf.open_backup(repo, name).delete()
vfs.tryunlink(name + b'.' + ext)
def _backupactivebookmark(repo): def _backupactivebookmark(repo):
activebookmark = repo._activebookmark activebookmark = repo._activebookmark
if activebookmark: if activebookmark:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
return activebookmark return activebookmark