This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5892

patch: let caller pass in root-filtering matcher (API)
ClosedPublic

Authored by martinvonz on Feb 8 2019, 3:30 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG035cae1d197f: patch: let caller pass in root-filtering matcher (API)

Summary

The --root option to hg diff does two things:

Shows paths relative to the given root
Filters paths by the given root, including copy sources

The root argument is passed through down to patch.diff(). I feel like
we can make patch.diff() more generic by not passing down the root
argument, but instead pass:

A function for taking a repo-relative path and printing it. I want to reuse this for showing cwd-relative paths later. This is the actual motivation for this patch.
A matcher that's already been filtered by the root argument
A second matcher that filters the copy sources

This is one step towards that.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 8 2019, 3:30 AM

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

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

martinvonz added a child revision: D5893: patch: accept second matcher that applies only to copy sources (API).Feb 8 2019, 3:30 AM

Closed by commit rHG035cae1d197f: patch: let caller pass in root-filtering matcher (API) (authored by martinvonz). · Explain WhyFeb 9 2019, 4:35 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/logcmdutil.py (3 lines)
M			mercurial/patch.py (5 lines)

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Feb 6 2019, 8:46 PM

Status	Author	Revision
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	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	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 13906

mercurial/logcmdutil.py

	# subrepo			# subrepo
	uirelroot = match.uipath(relroot)			uirelroot = match.uipath(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))			match.uipath(matchroot), uirelroot))

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

	if stat:			if stat:
	diffopts = diffopts.copy(context=0, noprefix=False)			diffopts = diffopts.copy(context=0, noprefix=False)
	width = 80			width = 80
	if not ui.plain():			if not ui.plain():
	width = ui.termwidth() - graphwidth			width = ui.termwidth() - graphwidth

	chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix,			chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix,
	relroot=relroot, hunksfilterfn=hunksfilterfn)			relroot=relroot, hunksfilterfn=hunksfilterfn)

mercurial/patch.py

	)			)
	from . import (			from . import (
	copies,			copies,
	diffhelper,			diffhelper,
	diffutil,			diffutil,
	encoding,			encoding,
	error,			error,
	mail,			mail,
	match as matchmod,
	mdiff,			mdiff,
	pathutil,			pathutil,
	pycompat,			pycompat,
	scmutil,			scmutil,
	similar,			similar,
	util,			util,
	vfs as vfsmod,			vfs as vfsmod,
	)			)
	cache[f] = fctx.filelog()			cache[f] = fctx.filelog()
	else:			else:
	order.remove(f)			order.remove(f)
	order.append(f)			order.append(f)
	return fctx			return fctx
	return getfilectx			return getfilectx
	getfilectx = lrugetfilectx()			getfilectx = lrugetfilectx()

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

	if not changes:			if not changes:
	changes = ctx1.status(ctx2, match=match)			changes = ctx1.status(ctx2, match=match)
	modified, added, removed = changes[:3]			modified, added, removed = changes[:3]

	if not modified and not added and not removed:			if not modified and not added and not removed:
	return []			return []

	if repo.ui.debugflag:			if repo.ui.debugflag:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13906		Feb 8 2019, 3:30 AM	★	★
Diff 2	13949	rHG035cae1d197f7ca954859357ad82064ec26d42f5	Feb 6 2019, 8:46 PM	★	★