This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D5939 commit: respect ui.relative-paths
Closed	martinvonz	D5938 resolve: slightly simplify join expression by joining with empty strings
Closed	martinvonz	D5937 resolve: respect ui.relative-paths also for warning messages
Closed	martinvonz	D5936 addremove: respect ui.relative-paths
Closed	martinvonz	D5935 windows: use util.localpath for repo-relative paths in getuipathfn()

Diff 14062

	util.rename(a + ".resolve",			util.rename(a + ".resolve",
	scmutil.backuppath(ui, repo, f))			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 ') +			'markers:\n') + ''.join(' ' + uipathfn(f) + '\n'
	'\n '.join(uipathfn(f) for f in hasconflictmarkers) +			for f in hasconflictmarkers))
	'\n')
	if markcheck == 'abort' and not all and not pats:			if markcheck == 'abort' and not all and not pats:
	raise error.Abort(_('conflict markers detected'),			raise error.Abort(_('conflict markers detected'),
	hint=_('use --all to mark anyway'))			hint=_('use --all to mark anyway'))

	for f in tocomplete:			for f in tocomplete:
	try:			try:
	# resolve file			# resolve file
	overrides = {('ui', 'forcemerge'): opts.get('tool', '')}			overrides = {('ui', 'forcemerge'): opts.get('tool', '')}