This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13816		Feb 5 2019, 12:52 PM	★	★
Diff 2	13857		Feb 6 2019, 6:58 PM	★	★
Diff 3	13874	rHG630af04d4ae464892ec3f450eea74a9e7976fcf3	Feb 4 2019, 11:49 PM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Feb 4 2019, 11:49 PM

Status	Author	Revision
Closed	martinvonz	D5860 scmutil: delete now-unused origpath() (API)
Closed	martinvonz	D5859 subrepo: migrate to scmutil.backuppath()
Closed	martinvonz	D5858 resolve: migrate to scmutil.backuppath()
Closed	martinvonz	D5857 merge: migrate to scmutil.backuppath()
Closed	martinvonz	D5856 filemerge: migrate to scmutil.backuppath()
Closed	martinvonz	D5855 mq: migrate to scmutil.backuppath()
Closed	martinvonz	D5854 largefiles: migrate to scmutil.backuppath()
Closed	martinvonz	D5853 revert: migrate to scmutil.backuppath()
Closed	martinvonz	D5852 shelve: fix broken backup of conflicting untracked file
Closed	martinvonz	D5851 scmutil: introduce a new backuppath() to replace origpath()
Closed	martinvonz	D5850 tests: demonstrate broken unshelve when backing up untracked file
Closed	martinvonz	D5873 subrepo: always show relative path to .orig backup
Closed	martinvonz	D5872 mq: always show relative path to .orig backup
Closed	martinvonz	D5871 revert: always show relative path to .orig backup

Diff 13857

	hg.update(repo, wctx.node())			hg.update(repo, wctx.node())
	files = []			files = []
	files.extend(shelvectx.files())			files.extend(shelvectx.files())
	files.extend(shelvectx.p1().files())			files.extend(shelvectx.p1().files())

	# revert will overwrite unknown files, so move them out of the way			# revert will overwrite unknown files, so move them out of the way
	for file in repo.status(unknown=True).unknown:			for file in repo.status(unknown=True).unknown:
	if file in files:			if file in files:
	util.rename(file, scmutil.origpath(ui, repo, file))			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(),
	*pathtofiles(repo, files),			*pathtofiles(repo, files),
	**{r'no_backup': True})			**{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():


	restores backup of unknown file to right directory			restores backup of unknown file to right directory

	$ hg shelve			$ hg shelve
	shelved as default			shelved as default
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	$ echo z > e			$ echo z > e
	$ mkdir dir			$ mkdir dir
	BROKEN: should work the same as when not using --cwd
	$ hg unshelve --cwd dir			$ hg unshelve --cwd dir
	unshelving change 'default'			unshelving change 'default'
	abort: $ENOENT$
	[255]
	$ rmdir dir			$ rmdir dir
	$ cat e			$ cat e
				e
				$ cat e.orig
	z			z
	$ test -f e.orig && cat e.orig
	[1]
	restore broken state
	$ touch d
	$ echo e > e
	$ hg add d e
	$ hg shelve --delete default

	unshelve and conflicts with tracked and untracked files			unshelve and conflicts with tracked and untracked files

	preparing:			preparing:

	$ rm -f *.orig			$ rm -f *.orig
	$ hg ci -qm 'commit stuff'			$ hg ci -qm 'commit stuff'
	$ hg phase -p null:			$ hg phase -p null: