This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13822		Feb 5 2019, 12:52 PM	★	★
Diff 2	13863		Feb 6 2019, 6:59 PM	★	★
Diff 3	13880	rHG31ae4129ff8a782b00fc60d5db58ca29e5abc539	Feb 5 2019, 12:31 AM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Feb 5 2019, 12:31 AM

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 13863

	finally:			finally:
	ms.commit()			ms.commit()

	# replace filemerge's .orig file with our resolve file, but only			# replace filemerge's .orig file with our resolve file, but only
	# for merges that are complete			# for merges that are complete
	if complete:			if complete:
	try:			try:
	util.rename(a + ".resolve",			util.rename(a + ".resolve",
	scmutil.origpath(ui, repo, a))			scmutil.backuppath(ui, repo, f))
	except OSError as inst:			except OSError as inst:
	if inst.errno != errno.ENOENT:			if inst.errno != errno.ENOENT:
	raise			raise

	if hasconflictmarkers:			if hasconflictmarkers:
	ui.warn(_('warning: the following files still have conflict '			ui.warn(_('warning: the following files still have conflict '
	'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')			'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
	if markcheck == 'abort' and not all and not pats:			if markcheck == 'abort' and not all and not pats:
	if r:			if r:
	ret = 1			ret = 1
	finally:			finally:
	ms.commit()			ms.commit()

	# replace filemerge's .orig file with our resolve file			# replace filemerge's .orig file with our resolve file
	a = repo.wjoin(f)			a = repo.wjoin(f)
	try:			try:
	util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))			util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
	except OSError as inst:			except OSError as inst:
	if inst.errno != errno.ENOENT:			if inst.errno != errno.ENOENT:
	raise			raise

	ms.commit()			ms.commit()
	ms.recordactions()			ms.recordactions()

	if not didwork and pats:			if not didwork and pats: