This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D6174 shelve: let cmdutil.revert() take care of backing up untracked files
	Closed	martinvonz	D6173 shelve: stop passing list of files to revert

Diff 14605

	shelvedstate.clear(repo)			shelvedstate.clear(repo)
	ui.warn(_("unshelve of '%s' aborted\n") % state.name)			ui.warn(_("unshelve of '%s' aborted\n") % state.name)

	def mergefiles(ui, repo, wctx, shelvectx):			def mergefiles(ui, repo, wctx, shelvectx):
	"""updates to wctx and merges the changes from shelvectx into the			"""updates to wctx and merges the changes from shelvectx into the
	dirstate."""			dirstate."""
	with ui.configoverride({('ui', 'quiet'): True}):			with ui.configoverride({('ui', 'quiet'): True}):
	hg.update(repo, wctx.node())			hg.update(repo, wctx.node())
	files = []
	files.extend(shelvectx.files())
	files.extend(shelvectx.p1().files())

	# revert will overwrite unknown files, so move them out of the way
	for file in repo.status(unknown=True).unknown:
	if file in files:
	util.rename(repo.wjoin(file),
	scmutil.backuppath(ui, repo, file))
	ui.pushbuffer(True)			ui.pushbuffer(True)
	cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),			cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
	**{r'no_backup': True})
	ui.popbuffer()			ui.popbuffer()

	def restorebranch(ui, repo, branchtorestore):			def restorebranch(ui, repo, branchtorestore):
	if branchtorestore and branchtorestore != repo.dirstate.branch():			if branchtorestore and branchtorestore != repo.dirstate.branch():
	repo.dirstate.setbranch(branchtorestore)			repo.dirstate.setbranch(branchtorestore)
	ui.status(_('marked working directory as branch %s\n')			ui.status(_('marked working directory as branch %s\n')
	% branchtorestore)			% branchtorestore)