This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5913

addremove: use uipathfn instead of m.rel() for recorded similatity message
ClosedPublic

Authored by martinvonz on Feb 8 2019, 5:31 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG0a5a6675c86c: addremove: use uipathfn instead of m.rel() for recorded similatity message

Summary

When no path arguments are given to addremove, it generally prints
absolute paths. However, before this patch, we would always print the
"recording removal of foo as rename to bar (78% similar)" message with
relative paths.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 8 2019, 5:31 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 8 2019, 5:31 PM

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

martinvonz added a parent revision: D5912: forget: use relative paths for --interactive.Feb 9 2019, 5:29 PM

martinvonz added a child revision: D5914: cat: respect ui.relative-paths for "skipping missing subrepository".

martinvonz removed a child revision: D5914: cat: respect ui.relative-paths for "skipping missing subrepository".

martinvonz added a child revision: D5914: cat: respect ui.relative-paths for "skipping missing subrepository".

Closed by commit rHG0a5a6675c86c: addremove: use uipathfn instead of m.rel() for recorded similatity message (authored by martinvonz). · Explain WhyFeb 9 2019, 10:41 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/scmutil.py (12 lines)

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Feb 8 2019, 4:51 PM

Status	Author	Revision
Closed	martinvonz	D5924 match: delete unused argument "listsubrepos" from _buildmatch()
Closed	martinvonz	D5923 match: delete unused rel() (API)
Closed	martinvonz	D5922 largefiles: get cwd and relative paths from repo instead of matcher
Closed	martinvonz	D5921 scmutil: remove special handling of pats==("",) in matchandpats() (API)
Closed	martinvonz	D5916 scmutil: respect ui.relative-paths in default match.badfn
Closed	martinvonz	D5915 cmdutil: migrate previously missed instances to uipathfn
Closed	martinvonz	D5914 cat: respect ui.relative-paths for "skipping missing subrepository"
Closed	martinvonz	D5913 addremove: use uipathfn instead of m.rel() for recorded similatity message
Closed	martinvonz	D5912 forget: use relative paths for --interactive
Closed	martinvonz	D5910 automv: respect ui.relative-paths
Closed	martinvonz	D5909 debugwalk: avoid match.rel() and use repo.pathto() instead
Closed	martinvonz	D5908 match: delete unused abs() (API)
Closed	martinvonz	D5907 copy: respect ui.relative-paths in copy/rename
Closed	martinvonz	D5906 match: delete unused uipath() and _uipathrelative (API)
Closed	martinvonz	D5905 diff: respect ui.relative-paths for warning about path outside --root
Closed	martinvonz	D5904 largefiles: use uipathfn instead of match.{rel,uipath}() (API)
Closed	martinvonz	D5911 forget: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5903 addremove: pass around uipathfn and use instead of m.uipath() (API)
Closed	martinvonz	D5902 remove: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5901 add: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5900 subrepo: (mostly) use relative path in "skipping missing subrepository"
Closed	martinvonz	D5899 subrepo: use relative path for "already tracked" message
Closed	martinvonz	D5896 diff: make --stat respect ui.relative-paths
Closed	martinvonz	D5895 diff: make `hg diff --root=subrepo` work
Closed	martinvonz	D5894 patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Closed	martinvonz	D5893 patch: accept second matcher that applies only to copy sources (API)
Closed	martinvonz	D5892 patch: let caller pass in root-filtering matcher (API)
Closed	martinvonz	D5891 patch: pass in context objects into diffhunks() (API)

Diff 13940

mercurial/scmutil.py

	status = _('adding %s\n') % uipathfn(abs)			status = _('adding %s\n') % uipathfn(abs)
	label = 'ui.addremove.added'			label = 'ui.addremove.added'
	else:			else:
	status = _('removing %s\n') % uipathfn(abs)			status = _('removing %s\n') % uipathfn(abs)
	label = 'ui.addremove.removed'			label = 'ui.addremove.removed'
	repo.ui.status(status, label=label)			repo.ui.status(status, label=label)

	renames = _findrenames(repo, m, added + unknown, removed + deleted,			renames = _findrenames(repo, m, added + unknown, removed + deleted,
	similarity)			similarity, uipathfn)

	if not dry_run:			if not dry_run:
	_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
	return ret			return ret
	toprint.update(deleted)			toprint.update(deleted)
	for abs in sorted(toprint):			for abs in sorted(toprint):
	if abs in unknownset:			if abs in unknownset:
	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
				# the messages above too. forcerelativevalue=True is consistent with how
				# it used to work.
				uipathfn = getuipathfn(repo, forcerelativevalue=True)
	renames = _findrenames(repo, m, added + unknown, removed + deleted,			renames = _findrenames(repo, m, added + unknown, removed + deleted,
	similarity)			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
	return 0			return 0

	# for finding renames			# for finding renames
	elif dstate == 'r' and not st:			elif dstate == 'r' and not st:
	removed.append(abs)			removed.append(abs)
	elif dstate == 'a':			elif dstate == 'a':
	added.append(abs)			added.append(abs)

	return added, unknown, deleted, removed, forgotten			return added, unknown, deleted, removed, forgotten

	def _findrenames(repo, matcher, added, removed, similarity):			def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
	'''Find renames from removed files to added ones.'''			'''Find renames from removed files to added ones.'''
	renames = {}			renames = {}
	if similarity > 0:			if similarity > 0:
	for old, new, score in similar.findrenames(repo, added, removed,			for old, new, score in similar.findrenames(repo, added, removed,
	similarity):			similarity):
	if (repo.ui.verbose or not matcher.exact(old)			if (repo.ui.verbose or not matcher.exact(old)
	or not matcher.exact(new)):			or not matcher.exact(new)):
	repo.ui.status(_('recording removal of %s as rename to %s '			repo.ui.status(_('recording removal of %s as rename to %s '
	'(%d%% similar)\n') %			'(%d%% similar)\n') %
	(matcher.rel(old), matcher.rel(new),			(uipathfn(old), uipathfn(new),
	score * 100))			score * 100))
	renames[new] = old			renames[new] = old
	return renames			return renames

	def _markchanges(repo, unknown, deleted, renames):			def _markchanges(repo, unknown, deleted, renames):
	'''Marks the files in unknown as added, the files in deleted as removed,			'''Marks the files in unknown as added, the files in deleted as removed,
	and the files in renames as copied.'''			and the files in renames as copied.'''
	wctx = repo[None]			wctx = repo[None]

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13940		Feb 8 2019, 5:31 PM	★	★
Diff 2	13994	rHG0a5a6675c86c2a901e551aa6974aef03dbb96cc1	Feb 8 2019, 4:51 PM	★	★