D3009: diff: simplify by converting contexts to nodeids a little later
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Apr 1 06:37:39 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4e573e7e512d: diff: simplify by converting contexts to nodeids a little later (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3009?vs=7489&id=7497
REVISION DETAIL
https://phab.mercurial-scm.org/D3009
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1874,18 +1874,18 @@
raise error.Abort(msg)
elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
- node2 = scmutil.revsingle(repo, change, None).node()
- node1 = repo[node2].p1().node()
+ ctx2 = scmutil.revsingle(repo, change, None)
+ ctx1 = ctx2.p1()
else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs)
- node1, node2 = ctx1.node(), ctx2.node()
+ node1, node2 = ctx1.node(), ctx2.node()
if reverse:
node1, node2 = node2, node1
diffopts = patch.diffallopts(ui, opts)
- m = scmutil.match(repo[node2], pats, opts)
+ m = scmutil.match(ctx2, pats, opts)
ui.pager('diff')
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
listsubrepos=opts.get('subrepos'),
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list