This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9706

shelve: open patch using new shelf class instead of open()
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG14ce2eb6e8a4: shelve: open patch using new shelf class instead of open()
rHGd6f5e8157cc0: shelve: open patch using new shelf class instead of open()
rHG6f39aab28188: shelve: open patch using new shelf class instead of open()

Summary

For some reason the existing code didn't use shelvedfile().opener()
so here we migrate to shelf().open_patch() from the open() system
call instead.

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: D9707: shelve: move method for getting stat (mtime) to new shelf class.Jan 8 2021, 3:36 PM

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

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

martinvonz added a commit: rHG6f39aab28188: shelve: open patch using new shelf class instead of open().Jan 16 2021, 5:57 AM

Closed by commit rHG6f39aab28188: shelve: open patch using new shelf class instead of open() (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHGd6f5e8157cc0: shelve: open patch using new shelf class instead of open().Jan 16 2021, 1:31 PM

martinvonz added a commit: rHG14ce2eb6e8a4: shelve: open patch using new shelf class instead of open().Jan 17 2021, 2:21 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/shelve.py (3 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 24941

mercurial/shelve.py

	from __future__ import absolute_import			from __future__ import absolute_import

	import collections			import collections
	import errno			import errno
	import itertools			import itertools
	import stat			import stat

	from .i18n import _			from .i18n import _
	from .pycompat import open
	from .node import (			from .node import (
	bin,			bin,
	hex,			hex,
	nullid,			nullid,
	nullrev,			nullrev,
	)			)
	from . import (			from . import (
	bookmarks,			bookmarks,
	continue			continue
	ui.write(b' ' * (16 - len(sname)))			ui.write(b' ' * (16 - len(sname)))
	used = 16			used = 16
	date = dateutil.makedate(mtime)			date = dateutil.makedate(mtime)
	age = b'(%s)' % templatefilters.age(date, abbrev=True)			age = b'(%s)' % templatefilters.age(date, abbrev=True)
	ui.write(age, label=b'shelve.age')			ui.write(age, label=b'shelve.age')
	ui.write(b' ' * (12 - len(age)))			ui.write(b' ' * (12 - len(age)))
	used += 12			used += 12
	with open(name + b'.' + patchextension, b'rb') as fp:			with Shelf(repo, sname).open_patch() as fp:
	while True:			while True:
	line = fp.readline()			line = fp.readline()
	if not line:			if not line:
	break			break
	if not line.startswith(b'#'):			if not line.startswith(b'#'):
	desc = line.rstrip()			desc = line.rstrip()
	if ui.formatted():			if ui.formatted():
	desc = stringutil.ellipsis(desc, width - used)			desc = stringutil.ellipsis(desc, width - used)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24662		Jan 8 2021, 3:36 PM	★	★
Diff 2	24941	rHG6f39aab28188fd1bdcfdb2eb8a8efb2eba1329f0	Jan 7 2021, 6:24 PM	★	★