This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5620

grep: don't look up copy info unless --follow is given
ClosedPublic

Authored by martinvonz on Jan 16 2019, 8:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb44f1703b28c: grep: don't look up copy info unless --follow is given
rHGbdb5fef5cff4: grep: don't look up copy info unless --follow is given
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 16 2019, 8:23 PM
martinvonz updated this revision to Diff 13325.Jan 18 2019, 2:10 PM
Closed by commit rHGbdb5fef5cff4: grep: don't look up copy info unless --follow is given (authored by martinvonz). · Explain WhyJan 25 2019, 3:02 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 26 2019, 12:06 AM
  • if fn in skip:

+ copy = None
+ if follow:
+ try:
+ copied = flog.renamed(fnode)
+ except error.WdirUnsupported:
+ copied = ctx[fn].renamed()
+ copy = copied and copied[0]

if copy:
  • skip[copy] = True
  • continue

+ copies.setdefault(rev, {})[fn] = copy
+ if fn in skip:
+ skip[copy] = True
+ continue

files.append(fn)

Did you intentionally move if fn in skip: continue under if follow?
The skip dict has wider scope.

martinvonz added a comment.Jan 26 2019, 1:31 AM
In D5620#83924, @yuja wrote:
  • if fn in skip:

+ copy = None
+ if follow:
+ try:
+ copied = flog.renamed(fnode)
+ except error.WdirUnsupported:
+ copied = ctx[fn].renamed()
+ copy = copied and copied[0]

if copy:
  • skip[copy] = True
  • continue

+ copies.setdefault(rev, {})[fn] = copy
+ if fn in skip:
+ skip[copy] = True
+ continue

files.append(fn)

Did you intentionally move if fn in skip: continue under if follow?
The skip dict has wider scope.

Oops, nope, that wasn't on purpose. Thanks for catching that! Feel free to amend the following to the queued commit if it looks good to you:

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2955,7 +2955,8 @@ def grep(ui, repo, pattern, *pats, **opt
                     copies.setdefault(rev, {})[fn] = copy
                     if fn in skip:
                         skip[copy] = True
-                        continue
+            if fn in skip:
+                continue
             files.append(fn)

             if fn not in matches[rev]:
yuja added a comment.Jan 26 2019, 2:09 AM
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2955,7 +2955,8 @@ def grep(ui, repo, pattern, *pats, **opt
                     copies.setdefault(rev, {})[fn] = copy
                     if fn in skip:
                         skip[copy] = True
-                        continue
+            if fn in skip:
+                continue
             files.append(fn)

Applied this, thanks.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (21 lines)

Diff 13455

mercurial/commands.py

matches.setdefault(parent, {}) matches.setdefault(parent, {})
files = revfiles.setdefault(rev, []) files = revfiles.setdefault(rev, [])
for fn in fns: for fn in fns:
flog = getfile(fn) flog = getfile(fn)
try: try:
fnode = ctx.filenode(fn) fnode = ctx.filenode(fn)
except error.LookupError: except error.LookupError:
continue continue
copy = None
if follow:
try: try:
copied = flog.renamed(fnode) copied = flog.renamed(fnode)
except error.WdirUnsupported: except error.WdirUnsupported:
copied = ctx[fn].renamed() copied = ctx[fn].renamed()
copy = follow and copied and copied[0] copy = copied and copied[0]
if copy: if copy:
copies.setdefault(rev, {})[fn] = copy copies.setdefault(rev, {})[fn] = copy
if fn in skip: if fn in skip:
if copy:
skip[copy] = True skip[copy] = True
continue continue
files.append(fn) files.append(fn)
if fn not in matches[rev]: if fn not in matches[rev]:
try: try:
content = flog.read(fnode) content = flog.read(fnode)
except error.WdirUnsupported: except error.WdirUnsupported:
content = ctx[fn].data() content = ctx[fn].data()
grepbody(fn, rev, content) grepbody(fn, rev, content)