Skip to content
Snippets Groups Projects
Commit d683aca7 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

diffordiffstat: avoid looking up contexts twice

I'm not worried about performance; this is just simpler.

Differential Revision: https://phab.mercurial-scm.org/D5890
parent 286eeed1
No related branches found
No related tags found
No related merge requests found
......@@ -58,6 +58,8 @@
changes=None, stat=False, fp=None, graphwidth=0,
prefix='', root='', listsubrepos=False, hunksfilterfn=None):
'''show diff or diffstat.'''
ctx1 = repo[node1]
ctx2 = repo[node2]
if root:
relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
else:
......@@ -78,9 +80,8 @@
if not ui.plain():
width = ui.termwidth() - graphwidth
chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts,
prefix=prefix, relroot=relroot,
hunksfilterfn=hunksfilterfn)
chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix,
relroot=relroot, hunksfilterfn=hunksfilterfn)
if fp is not None or ui.canwritewithoutlabels():
out = fp or ui
......@@ -105,8 +106,6 @@
ui.write(chunk, label=label)
if listsubrepos:
ctx1 = repo[node1]
ctx2 = repo[node2]
for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
tempnode2 = node2
try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment