This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9710

shelve: use listshelves() in cleanup function
ClosedPublic

Authored by martinvonz on Jan 8 2021, 3:36 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG8db5fa212ab0: shelve: use listshelves() in cleanup function
rHG51f0fc71a83e: shelve: use listshelves() in cleanup function
rHGc886b2c383ff: shelve: use listshelves() in cleanup function

Summary

The point of this patch is to make it so all the callers of
shelvedfile.movetobackup() look the same, so I can move it over to
the new Shelf class next.

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 8 2021, 3:36 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 8 2021, 3:36 PM

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

martinvonz added a child revision: D9711: shelve: make gennames() helper generate relative backup paths.Jan 8 2021, 3:36 PM

martinvonz updated this revision to Diff 24733.Jan 12 2021, 5:48 PM

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

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

martinvonz added a commit: rHGc886b2c383ff: shelve: use listshelves() in cleanup function.Jan 16 2021, 5:57 AM

Closed by commit rHGc886b2c383ff: shelve: use listshelves() in cleanup function (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHG51f0fc71a83e: shelve: use listshelves() in cleanup function.Jan 16 2021, 1:31 PM

martinvonz added a commit: rHG8db5fa212ab0: shelve: use listshelves() in cleanup function.Jan 17 2021, 2:21 AM

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24666		Jan 8 2021, 3:36 PM	★	★
Diff 2	24733		Jan 12 2021, 5:48 PM	★	★
Diff 3	24945	rHGc886b2c383ffd86289b53720e1dd6951a311e53a	Jan 8 2021, 1:38 AM	★	★

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 24945

mercurial/shelve.py

	def _iswctxonnewbranch(repo):			def _iswctxonnewbranch(repo):
	return repo[None].branch() != repo[b'.'].branch()			return repo[None].branch() != repo[b'.'].branch()


	def cleanupcmd(ui, repo):			def cleanupcmd(ui, repo):
	"""subcommand that deletes all shelves"""			"""subcommand that deletes all shelves"""

	with repo.wlock():			with repo.wlock():
	for (name, _type) in repo.vfs.readdir(shelvedir):			for _mtime, name in listshelves(repo):
	suffix = name.rsplit(b'.', 1)[-1]			for suffix in shelvefileextensions:
	if suffix in shelvefileextensions:			shfile = shelvedfile(repo, name, suffix)
	shelvedfile(repo, name).movetobackup()			if shfile.exists():
				shfile.movetobackup()
	cleanupoldbackups(repo)			cleanupoldbackups(repo)


	def deletecmd(ui, repo, pats):			def deletecmd(ui, repo, pats):
	"""subcommand that deletes a specific shelve"""			"""subcommand that deletes a specific shelve"""
	if not pats:			if not pats:
	raise error.InputError(_(b'no shelved changes specified!'))			raise error.InputError(_(b'no shelved changes specified!'))
	with repo.wlock():			with repo.wlock():