This is an archive of the discontinued Mercurial Phabricator instance.


	.. container:: verbose			.. container:: verbose

	Timestamp in seconds is used to decide order of backups. More			Timestamp in seconds is used to decide order of backups. More
	than ``maxbackups`` backups are kept, if same timestamp			than ``maxbackups`` backups are kept, if same timestamp
	prevents from deciding exact order of them, for safety.			prevents from deciding exact order of them, for safety.
	"""			"""
	with repo.wlock():			with repo.wlock():
	return shelvemod._dounshelve(ui, repo, shelved, *opts)			return shelvemod.dounshelve(ui, repo, shelved, *opts)

	@command('update\|up\|checkout\|co',			@command('update\|up\|checkout\|co',
	[('C', 'clean', None, _('discard uncommitted changes (no backup)')),			[('C', 'clean', None, _('discard uncommitted changes (no backup)')),
	('c', 'check', None, _('require clean working directory')),			('c', 'check', None, _('require clean working directory')),
	('m', 'merge', None, _('merge uncommitted changes')),			('m', 'merge', None, _('merge uncommitted changes')),
	('d', 'date', '', _('tipmost revision matching date'), _('DATE')),			('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
	('r', 'rev', '', _('revision'), _('REV'))			('r', 'rev', '', _('revision'), _('REV'))
	] + mergetoolopts,			] + mergetoolopts,

mercurial/shelve.py

	wcdeleted = set(repo.status().deleted)			wcdeleted = set(repo.status().deleted)
	shelvetouched = set(shelvectx.files())			shelvetouched = set(shelvectx.files())
	intersection = wcdeleted.intersection(shelvetouched)			intersection = wcdeleted.intersection(shelvetouched)
	if intersection:			if intersection:
	m = _("shelved change touches missing files")			m = _("shelved change touches missing files")
	hint = _("run hg status to see which files are missing")			hint = _("run hg status to see which files are missing")
	raise error.Abort(m, hint=hint)			raise error.Abort(m, hint=hint)

	def _dounshelve(ui, repo, shelved, *opts):			def dounshelve(ui, repo, shelved, *opts):
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	abortf = opts.get('abort')			abortf = opts.get('abort')
	continuef = opts.get('continue')			continuef = opts.get('continue')
	if not abortf and not continuef:			if not abortf and not continuef:
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	shelved = list(shelved)			shelved = list(shelved)
	if opts.get("name"):			if opts.get("name"):
	shelved.append(opts["name"])			shelved.append(opts["name"])