D5895: diff: make `hg diff --root=subrepo` work
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Feb 9 22:37:56 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGec37db02fc72: diff: make `hg diff --root=subrepo` work (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5895?vs=13909&id=13979
REVISION DETAIL
https://phab.mercurial-scm.org/D5895
AFFECTED FILES
mercurial/logcmdutil.py
CHANGE DETAILS
diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -66,6 +66,8 @@
else:
relroot = ''
copysourcematch = None
+ def compose(f, g):
+ return lambda x: f(g(x))
def pathfn(f):
return posixpath.join(prefix, f)
if relroot != '':
@@ -84,11 +86,12 @@
checkroot = (repo.ui.configbool('devel', 'all-warnings') or
repo.ui.configbool('devel', 'check-relroot'))
- def pathfn(f):
+ def relrootpathfn(f):
if checkroot and not f.startswith(relroot):
raise AssertionError(
"file %s doesn't start with relroot %s" % (f, relroot))
- return posixpath.join(prefix, f[len(relroot):])
+ return f[len(relroot):]
+ pathfn = compose(relrootpathfn, pathfn)
if stat:
diffopts = diffopts.copy(context=0, noprefix=False)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list