This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5905

diff: respect ui.relative-paths for warning about path outside --root
ClosedPublic

Authored by martinvonz on Feb 8 2019, 3:46 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGdf59b1078983: diff: respect ui.relative-paths for warning about path outside --root

Summary

I set legacyrelativevalue=True rather than being based on what
patterns the user passed (as the current match.uipath() does). I think
it simply doesn't really matter for this message (there are not even
any tests for it).

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 8 2019, 3:46 PM

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

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

martinvonz added a child revision: D5906: match: delete unused uipath() and _uipathrelative (API).Feb 8 2019, 3:46 PM

martinvonz added a parent revision: D5904: largefiles: use uipathfn instead of match.{rel,uipath}() (API).Feb 9 2019, 5:28 PM

Closed by commit rHGdf59b1078983: diff: respect ui.relative-paths for warning about path outside --root (authored by martinvonz). · Explain WhyFeb 9 2019, 10:40 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/logcmdutil.py (7 lines)

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 13987

mercurial/logcmdutil.py

	copysourcematch = None			copysourcematch = None
	def compose(f, g):			def compose(f, g):
	return lambda x: f(g(x))			return lambda x: f(g(x))
	def pathfn(f):			def pathfn(f):
	return posixpath.join(prefix, f)			return posixpath.join(prefix, f)
	if relroot != '':			if relroot != '':
	# XXX relative roots currently don't work if the root is within a			# XXX relative roots currently don't work if the root is within a
	# subrepo			# subrepo
	uirelroot = match.uipath(relroot)			uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
				uirelroot = uipathfn(pathfn(relroot))
	relroot += '/'			relroot += '/'
	for matchroot in match.files():			for matchroot in match.files():
	if not matchroot.startswith(relroot):			if not matchroot.startswith(relroot):
	ui.warn(_('warning: %s not inside relative root %s\n') % (			ui.warn(_('warning: %s not inside relative root %s\n') %
	match.uipath(matchroot), uirelroot))			(uipathfn(pathfn(matchroot)), uirelroot))

	relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path')			relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path')
	match = matchmod.intersectmatchers(match, relrootmatch)			match = matchmod.intersectmatchers(match, relrootmatch)
	copysourcematch = relrootmatch			copysourcematch = relrootmatch

	checkroot = (repo.ui.configbool('devel', 'all-warnings') or			checkroot = (repo.ui.configbool('devel', 'all-warnings') or
	repo.ui.configbool('devel', 'check-relroot'))			repo.ui.configbool('devel', 'check-relroot'))
	def relrootpathfn(f):			def relrootpathfn(f):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13930		Feb 8 2019, 3:46 PM	★	★
Diff 2	13987	rHGdf59b10789832554ab24e395d1703d021faa244f	Feb 8 2019, 2:56 PM	★	★