This is an archive of the discontinued Mercurial Phabricator instance.

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 24703

tests/test-shelve2.t

	[20]			[20]
	#else			#else
	$ hg abort			$ hg abort
	aborting the merge, updating back to 9451eaa6eee3			aborting the merge, updating back to 9451eaa6eee3
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	#endif			#endif
	$ cd ..			$ cd ..

				Test corrupt shelves (in .hg/shelved/, not .hg/shelvestate)
				$ hg init corrupt-shelves
				$ cd corrupt-shelves
				$ mkdir .hg/shelved

				# A (corrupt) .patch file without a .hg file
				$ touch .hg/shelved/junk1.patch
				$ hg shelve -l
				junk1 (* ago) (glob)
				$ hg unshelve
				unshelving change 'junk1'
				abort: shelved change 'junk1' not found
				[255]
				$ hg shelve -d junk1
				$ find .hg/shelve*
				.hg/shelve-backup
				.hg/shelve-backup/junk1.patch
				.hg/shelved

				# A .hg file without a .patch file
				$ touch .hg/shelved/junk2.hg
				$ hg shelve -l
				$ hg unshelve
				abort: no shelved changes to apply!
				[255]
				$ hg shelve -d junk2
				abort: shelved change 'junk2' not found
				[255]
				$ find .hg/shelve*
				.hg/shelve-backup
				.hg/shelve-backup/junk1.patch
				.hg/shelve-backup/junk2.hg
				.hg/shelved

				# A file with an unexpected extension
				$ touch .hg/shelved/junk3
				$ hg shelve -l 2>&1 \| grep ValueError
				ValueError: not enough values to unpack (expected 2, got 1)
				$ hg unshelve 2>&1 \| grep ValueError
				ValueError: not enough values to unpack (expected 2, got 1)
				$ hg shelve -d junk3
				abort: shelved change 'junk3' not found
				[255]
				$ find .hg/shelve*
				.hg/shelve-backup
				.hg/shelve-backup/junk1.patch
				.hg/shelve-backup/junk2.hg
				.hg/shelved
				.hg/shelved/junk3

				$ cd ..

	Unshelve respects --keep even if user intervention is needed			Unshelve respects --keep even if user intervention is needed
	$ hg init unshelvekeep && cd unshelvekeep			$ hg init unshelvekeep && cd unshelvekeep
	$ echo 1 > file && hg ci -Am 1			$ echo 1 > file && hg ci -Am 1
	adding file			adding file
	$ echo 2 >> file			$ echo 2 >> file
	$ hg shelve			$ hg shelve
	shelved as default			shelved as default
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24703		Jan 11 2021, 1:04 PM	★	★
Diff 2	24930	rHGd1311357efe6be77851682d81d9168502794e5c1	Jan 8 2021, 7:38 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

tests: add tests for corrupt .hg/shelved/ directoryClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 24703

tests/test-shelve2.t

tests: add tests for corrupt .hg/shelved/ directory
ClosedPublic

Revision Contents
Changeset List