D5890: diffordiffstat: avoid looking up contexts twice
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Feb 8 07:07:52 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I'm not worried about performance; this is just simpler.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5890
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
@@ -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:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list