D5620: grep: don't look up copy info unless --follow is given
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jan 17 01:23:53 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
If no --follow was given, then the "copy" variable will become
None. In that case we would still look up the copy information from
the filelog and then ignore it. Let's avoid even looking it up.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5620
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
@@ -2945,13 +2945,15 @@
fnode = ctx.filenode(fn)
except error.LookupError:
continue
- try:
- copied = flog.renamed(fnode)
- except error.WdirUnsupported:
- copied = ctx[fn].renamed()
- copy = follow and copied and copied[0]
- if copy:
- copies.setdefault(rev, {})[fn] = copy
+ copy = None
+ if follow:
+ try:
+ copied = flog.renamed(fnode)
+ except error.WdirUnsupported:
+ copied = ctx[fn].renamed()
+ copy = copied and copied[0]
+ if copy:
+ copies.setdefault(rev, {})[fn] = copy
if fn in skip:
if copy:
skip[copy] = True
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list