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.

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
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (3 lines)
Mmercurial/patch.py (5 lines)

Diff 13949

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: