This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5895

diff: make `hg diff --root=subrepo` work
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGec37db02fc72: diff: make `hg diff --root=subrepo` work
Summary

The root prefix is currently stripped before adding the subrepo
prefix. It seems to me that if you run hg diff --root=subrepo and a
subrepo/ path is visited (say "subrepo/foo"), then the path generated
for the diff would initially be just "foo" and we then fail (if the
developer warning is active) to strip the "subrepo/" from the path. It
seems like we should first add the prefix in order to produce a path
that's relative to the top-level repo, and then we can remove the root
prefix from that. There are no tests for this, it seems, and I don't
care enough to add one.

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:30 AM
Closed by commit rHGec37db02fc72: diff: make `hg diff --root=subrepo` work (authored by martinvonz). · Explain WhyFeb 9 2019, 10:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (7 lines)

Diff 13979

mercurial/logcmdutil.py

'''show diff or diffstat.''' '''show diff or diffstat.'''
ctx1 = repo[node1] ctx1 = repo[node1]
ctx2 = repo[node2] ctx2 = repo[node2]
if root: if root:
relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
else: else:
relroot = '' relroot = ''
copysourcematch = None copysourcematch = None
def compose(f, g):
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) 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') 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 pathfn(f): def relrootpathfn(f):
if checkroot and not f.startswith(relroot): if checkroot and not f.startswith(relroot):
raise AssertionError( raise AssertionError(
"file %s doesn't start with relroot %s" % (f, relroot)) "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: 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, pathfn=pathfn, chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn,