This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9711

shelve: make gennames() helper generate relative backup paths
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGd7f763c8c58e: shelve: make gennames() helper generate relative backup paths
rHG976a368a1696: shelve: make gennames() helper generate relative backup paths
rHG088c5c4a9089: shelve: make gennames() helper generate relative backup paths

Summary

When I saw gennames(), I thought it was meant to take a relative
filename as argument. Maybe it was or maybe it wasn't, but it seems
simpler to pass it a relative path anyway, so that's what this patch
does. That also makes the call to backupvfs.exists() more natural (I
expect a relative path to be passed there too).

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: D9712: shelve: move method for creating backup to new shelf class.Jan 8 2021, 3:37 PM

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

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

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

martinvonz added a commit: rHG088c5c4a9089: shelve: make gennames() helper generate relative backup paths.Jan 16 2021, 5:57 AM

Closed by commit rHG088c5c4a9089: shelve: make gennames() helper generate relative backup paths (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHG976a368a1696: shelve: make gennames() helper generate relative backup paths.Jan 16 2021, 1:31 PM

martinvonz added a commit: rHGd7f763c8c58e: shelve: make gennames() helper generate relative backup paths.Jan 17 2021, 2:21 AM

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24667		Jan 8 2021, 3:36 PM	★	★
Diff 2	24734		Jan 12 2021, 5:48 PM	★	★
Diff 3	24946	rHG088c5c4a9089222bddcc1e70fcbe9b4c40dc8f2a	Jan 8 2021, 2:09 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 24946

mercurial/shelve.py


	def backupfilename(self):			def backupfilename(self):
	def gennames(base):			def gennames(base):
	yield base			yield base
	base, ext = base.rsplit(b'.', 1)			base, ext = base.rsplit(b'.', 1)
	for i in itertools.count(1):			for i in itertools.count(1):
	yield b'%s-%d.%s' % (base, i, ext)			yield b'%s-%d.%s' % (base, i, ext)

	name = self.backupvfs.join(self.fname)			for n in gennames(self.fname):
	for n in gennames(name):
	if not self.backupvfs.exists(n):			if not self.backupvfs.exists(n):
	return n			return self.backupvfs.join(n)

	def movetobackup(self):			def movetobackup(self):
	if not self.backupvfs.isdir():			if not self.backupvfs.isdir():
	self.backupvfs.makedir()			self.backupvfs.makedir()
	util.rename(self.vfs.join(self.fname), self.backupfilename())			util.rename(self.vfs.join(self.fname), self.backupfilename())


	class Shelf(object):			class Shelf(object):