This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5936

addremove: respect ui.relative-paths
ClosedPublic

Authored by martinvonz on Feb 11 2019, 12:50 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGb81ecf3571d5: addremove: respect ui.relative-paths
rHGf44ab808eb91: addremove: respect ui.relative-paths

Summary

I previously changed these code paths while trying to not change any
behavior to avoid inconsistencies between them in the intermediate
commits. They're now all ready to be switched over to respecting
ui.relative-paths.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 11 2019, 12:50 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 11 2019, 12:50 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a child revision: D5937: resolve: respect ui.relative-paths also for warning messages.Feb 11 2019, 12:50 PM

Closed by commit rHGf44ab808eb91: addremove: respect ui.relative-paths (authored by martinvonz). · Explain WhyFeb 13 2019, 7:15 AM

This revision was automatically updated to reflect the committed changes.

Ironic given the subject line that I missed this hunk:

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -256,7 +256,7 @@ def addremove(ui, repo, *pats, **opts):
         opts['similarity'] = '100'
     matcher = scmutil.match(repo[None], pats, opts)
     relative = scmutil.anypats(pats, opts)
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
     return scmutil.addremove(repo, matcher, "", uipathfn, opts)
 
 @command('annotate|blame',

I'll fold that in in flight since the commit is not yet public.

In D5936#86976, @martinvonz wrote:

Ironic given the subject line that I missed this hunk:

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -256,7 +256,7 @@ def addremove(ui, repo, *pats, **opts):
         opts['similarity'] = '100'
     matcher = scmutil.match(repo[None], pats, opts)
     relative = scmutil.anypats(pats, opts)
-    uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
     return scmutil.addremove(repo, matcher, "", uipathfn, opts)
 @command('annotate|blame',

I'll fold that in in flight since the commit is not yet public.

Hmm, the same thing for hg forget. I'll fix that too if people don't mind.

martinvonz mentioned this in D8223: merge: respect ui.relative-paths for some warning messages.Mar 5 2020, 11:13 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (4 lines)
M			mercurial/commands.py (4 lines)
M			mercurial/scmutil.py (2 lines)

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 14059

mercurial/cmdutil.py

	dsguard = None			dsguard = None
	# extract addremove carefully -- this function can be called from a command			# extract addremove carefully -- this function can be called from a command
	# that doesn't support addremove			# that doesn't support addremove
	if opts.get('addremove'):			if opts.get('addremove'):
	dsguard = dirstateguard.dirstateguard(repo, 'commit')			dsguard = dirstateguard.dirstateguard(repo, 'commit')
	with dsguard or util.nullcontextmanager():			with dsguard or util.nullcontextmanager():
	if dsguard:			if dsguard:
	relative = scmutil.anypats(pats, opts)			relative = scmutil.anypats(pats, opts)
	uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)			uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
	if scmutil.addremove(repo, matcher, "", uipathfn, opts) != 0:			if scmutil.addremove(repo, matcher, "", uipathfn, opts) != 0:
	raise error.Abort(			raise error.Abort(
	_("failed to mark all new/missing files as added/removed"))			_("failed to mark all new/missing files as added/removed"))

	return commitfunc(ui, repo, message, matcher, opts)			return commitfunc(ui, repo, message, matcher, opts)

	def samefile(f, ctx1, ctx2):			def samefile(f, ctx1, ctx2):
	if f in ctx1.manifest():			if f in ctx1.manifest():
	for fn in st])			for fn in st])
	else:			else:
	files = set(old.files())			files = set(old.files())

	# add/remove the files to the working copy if the "addremove" option			# add/remove the files to the working copy if the "addremove" option
	# was specified.			# was specified.
	matcher = scmutil.match(wctx, pats, opts)			matcher = scmutil.match(wctx, pats, opts)
	relative = scmutil.anypats(pats, opts)			relative = scmutil.anypats(pats, opts)
	uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)			uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
	if (opts.get('addremove')			if (opts.get('addremove')
	and scmutil.addremove(repo, matcher, "", uipathfn, opts)):			and scmutil.addremove(repo, matcher, "", uipathfn, opts)):
	raise error.Abort(			raise error.Abort(
	_("failed to mark all new/missing files as added/removed"))			_("failed to mark all new/missing files as added/removed"))

	# Check subrepos. This depends on in-place wctx._status update in			# Check subrepos. This depends on in-place wctx._status update in
	# subrepo.precommit(). To minimize the risk of this hack, we do			# subrepo.precommit(). To minimize the risk of this hack, we do
	# nothing if .hgsub does not exist.			# nothing if .hgsub does not exist.

mercurial/commands.py

	$ hg status			$ hg status
	A bar.c			A bar.c
	? foo.c			? foo.c

	Returns 0 if all files are successfully added.			Returns 0 if all files are successfully added.
	"""			"""

	m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))			m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
	uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)			uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
	rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)			rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
	return rejected and 1 or 0			return rejected and 1 or 0

	@command('addremove',			@command('addremove',
	similarityopts + subrepoopts + walkopts + dryrunopts,			similarityopts + subrepoopts + walkopts + dryrunopts,
	_('[OPTION]... [FILE]...'),			_('[OPTION]... [FILE]...'),
	helpcategory=command.CATEGORY_WORKING_DIRECTORY,			helpcategory=command.CATEGORY_WORKING_DIRECTORY,
	inferrepo=True)			inferrepo=True)
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	after, force = opts.get('after'), opts.get('force')			after, force = opts.get('after'), opts.get('force')
	dryrun = opts.get('dry_run')			dryrun = opts.get('dry_run')
	if not pats and not after:			if not pats and not after:
	raise error.Abort(_('no files specified'))			raise error.Abort(_('no files specified'))

	m = scmutil.match(repo[None], pats, opts)			m = scmutil.match(repo[None], pats, opts)
	subrepos = opts.get('subrepos')			subrepos = opts.get('subrepos')
	uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=True)			uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
	return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,			return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
	dryrun=dryrun)			dryrun=dryrun)

	@command('rename\|move\|mv',			@command('rename\|move\|mv',
	[('A', 'after', None, _('record a rename that has already occurred')),			[('A', 'after', None, _('record a rename that has already occurred')),
	('f', 'force', None, _('forcibly copy over an existing managed file')),			('f', 'force', None, _('forcibly copy over an existing managed file')),
	] + walkopts + dryrunopts,			] + walkopts + dryrunopts,
	_('[OPTION]... SOURCE... DEST'),			_('[OPTION]... SOURCE... DEST'),

mercurial/scmutil.py

	status = _('adding %s\n') % abs			status = _('adding %s\n') % abs
	else:			else:
	status = _('removing %s\n') % abs			status = _('removing %s\n') % abs
	repo.ui.status(status)			repo.ui.status(status)

	# TODO: We should probably have the caller pass in uipathfn and apply it to			# TODO: We should probably have the caller pass in uipathfn and apply it to
	# the messages above too. forcerelativevalue=True is consistent with how			# the messages above too. forcerelativevalue=True is consistent with how
	# it used to work.			# it used to work.
	uipathfn = getuipathfn(repo, forcerelativevalue=True)			uipathfn = getuipathfn(repo, legacyrelativevalue=True)
	renames = _findrenames(repo, m, added + unknown, removed + deleted,			renames = _findrenames(repo, m, added + unknown, removed + deleted,
	similarity, uipathfn)			similarity, uipathfn)

	_markchanges(repo, unknown + forgotten, deleted, renames)			_markchanges(repo, unknown + forgotten, deleted, renames)

	for f in rejected:			for f in rejected:
	if f in m.files():			if f in m.files():
	return 1			return 1

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14032		Feb 11 2019, 12:50 PM	★	★
Diff 2	14059	rHGf44ab808eb91d7c2be00585765f8f5232f3dd1be	Feb 11 2019, 12:40 PM	★	★