( )⚙ D8503 diff: avoid going from contexts to nodes and back

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8503

diff: avoid going from contexts to nodes and back
ClosedPublic

Authored by durin42 on May 7 2020, 5:26 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6d3768b11241: diff: avoid going from contexts to nodes and back
rHG8c0c1161614e: diff: avoid going from contexts to nodes and back
Summary

This will allow us to pass in-memory contexts that may not have a
valid node to the diffing logic.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)

Diff 21340

mercurial/commands.py

ctx2 = scmutil.revsingle(repo, change, None) ctx2 = scmutil.revsingle(repo, change, None)
ctx1 = ctx2.p1() ctx1 = ctx2.p1()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs) ctx1, ctx2 = scmutil.revpair(repo, revs)
node1, node2 = ctx1.node(), ctx2.node() node1, node2 = ctx1.node(), ctx2.node()
if reverse: if reverse:
node1, node2 = node2, node1 ctxleft = ctx2
ctxright = ctx1
else:
ctxleft = ctx1
ctxright = ctx2
diffopts = patch.diffallopts(ui, opts) diffopts = patch.diffallopts(ui, opts)
m = scmutil.match(ctx2, pats, opts) m = scmutil.match(ctx2, pats, opts)
m = repo.narrowmatch(m) m = repo.narrowmatch(m)
ui.pager(b'diff') ui.pager(b'diff')
logcmdutil.diffordiffstat( logcmdutil.diffordiffstat(
ui, ui,
repo, repo,
diffopts, diffopts,
repo[node1], ctxleft,
repo[node2], ctxright,
m, m,
stat=stat, stat=stat,
listsubrepos=opts.get(b'subrepos'), listsubrepos=opts.get(b'subrepos'),
root=opts.get(b'root'), root=opts.get(b'root'),
) )
@command( @command(