This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9740

shelve: use listshelves() in cleanupoldbackups()
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG9cdef4c41c94: shelve: use listshelves() in cleanupoldbackups()
rHGbf891faceba1: shelve: use listshelves() in cleanupoldbackups()
rHG9fe1366f86ca: shelve: use listshelves() in cleanupoldbackups()

Summary

With this patch, there are no more assumptions outside the Shelf
class about which files (.patch, .hg, .shelve) make up a
shelf. As such, this finishes the preparations for making phase-based
shelve (perhaps optionally) not write the .patch and .hg files.

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

martinvonz created this revision.Jan 12 2021, 5:48 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 12 2021, 5:48 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D9741: shelve: inline ".patch" constant now that it's only used in the Shelf class.Jan 12 2021, 5:48 PM

pulkit accepted this revision.Jan 16 2021, 4:42 AM

This revision is now accepted and ready to land.Jan 16 2021, 4:42 AM

martinvonz added a commit: rHG9fe1366f86ca: shelve: use listshelves() in cleanupoldbackups().Jan 16 2021, 5:58 AM

Closed by commit rHG9fe1366f86ca: shelve: use listshelves() in cleanupoldbackups() (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHGbf891faceba1: shelve: use listshelves() in cleanupoldbackups().Jan 16 2021, 1:31 PM

martinvonz added a commit: rHG9cdef4c41c94: shelve: use listshelves() in cleanupoldbackups().Jan 17 2021, 2:21 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/shelve.py (10 lines)

Status	Author	Revision
Closed	martinvonz	D9744 shelve: move listshelves() to new ShelfDir class, so caller need not pass vfs
Closed	martinvonz	D9743 shelve: also create class representing whole directory of shelves
Closed	martinvonz	D9742 shelve: add a method for deleting shelf to new shelf class
Closed	martinvonz	D9741 shelve: inline ".patch" constant now that it's only used in the Shelf class
Closed	martinvonz	D9740 shelve: use listshelves() in cleanupoldbackups()
Closed	martinvonz	D9739 shelve: make listshelves() list shelves in a given vfs
Closed	martinvonz	D9738 shelve: replace repo instance in Shelf class by vfs instance
Closed	martinvonz	D9737 shelve: use listdir() instead of readdir() when we don't need stat information
Closed	martinvonz	D9720 shelve: don't crash on file with unexpected extension in .hg/shelved/
Closed	martinvonz	D9719 shelve: don't include invalid shelves in `hg shelve --list`
Closed	martinvonz	D9714 shelve: extract some repeated creation of shelf instances to variables
Closed	martinvonz	D9713 shelve: teach new shelf class to check if .shelve file exists
Closed	martinvonz	D9712 shelve: move method for creating backup to new shelf class
Closed	martinvonz	D9711 shelve: make gennames() helper generate relative backup paths
Closed	martinvonz	D9710 shelve: use listshelves() in cleanup function
Closed	martinvonz	D9709 shelve: inline shelvedfile.filename() since there are no callers outside class
Closed	martinvonz	D9708 shelve: make listshelves() return shelf names instead of filenames
Closed	martinvonz	D9707 shelve: move method for getting stat (mtime) to new shelf class
Closed	martinvonz	D9706 shelve: open patch using new shelf class instead of open()
Closed	martinvonz	D9705 shelve: move function for opening .patch file to new shelf class
Closed	martinvonz	D9704 shelve: move method for reading .hg to new shelf class
Closed	martinvonz	D9703 shelve: move method for writing bundle to new shelf class
Closed	martinvonz	D9702 shelve: move method for reading .shelve file to new shelf class
Closed	martinvonz	D9701 shelve: move method for writing .shelve to new shelf class
Closed	martinvonz	D9700 shelve: introduce class representing a shelf
Closed	martinvonz	D9699 shelve: raise more specific errors
Closed	martinvonz	D9698 shelve: trust caller of shelvedfile.opener() to check that the file exists
Closed	martinvonz	D9697 shelve: rewrite check for unknown shelf to delete
Closed	martinvonz	D9696 shelve: remove a bundlerepo method
Closed	martinvonz	D9718 tests: add tests for corrupt .hg/shelved/ directory

Diff 24955

mercurial/shelve.py

	@classmethod			@classmethod
	def clear(cls, repo):			def clear(cls, repo):
	repo.vfs.unlinkpath(cls._filename, ignoremissing=True)			repo.vfs.unlinkpath(cls._filename, ignoremissing=True)


	def cleanupoldbackups(repo):			def cleanupoldbackups(repo):
	vfs = vfsmod.vfs(repo.vfs.join(backupdir))			vfs = vfsmod.vfs(repo.vfs.join(backupdir))
	maxbackups = repo.ui.configint(b'shelve', b'maxbackups')			maxbackups = repo.ui.configint(b'shelve', b'maxbackups')
	hgfiles = [f for f in vfs.listdir() if f.endswith(b'.' + patchextension)]			hgfiles = listshelves(vfs)
	hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
	if maxbackups > 0 and maxbackups < len(hgfiles):			if maxbackups > 0 and maxbackups < len(hgfiles):
	bordermtime = hgfiles[-maxbackups][0]			bordermtime = hgfiles[maxbackups - 1][0]
	else:			else:
	bordermtime = None			bordermtime = None
	for mtime, f in hgfiles[: len(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
	base = f[: -(1 + len(patchextension))]
	for ext in shelvefileextensions:			for ext in shelvefileextensions:
	vfs.tryunlink(base + b'.' + ext)			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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24743		Jan 12 2021, 5:48 PM	★	★
Diff 2	24955	rHG9fe1366f86ca1b64a660c3c244576a69d49c1e82	Jan 12 2021, 2:06 AM	★	★