This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6022

grep: reuse getrenamedfn() from scmutil
ClosedPublic

Authored by martinvonz on Feb 24 2019, 1:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcecdf7418cf1: grep: reuse getrenamedfn() from scmutil
Summary

My motivation is to reduce uses of filectx.renamed(). Reusing
scmutil.getrenamedfn() also means that we get some caching of copy
information per file and revision. I don't think that matters for `hg
grep` (I doubt it speeds up significantly, and I doubt it wastes
significant memory), but I'm not sure.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 24 2019, 1:11 AM
Closed by commit rHGcecdf7418cf1: grep: reuse getrenamedfn() from scmutil (authored by martinvonz). · Explain WhyFeb 24 2019, 3:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (8 lines)

Diff 14210

mercurial/commands.py

fm.end() fm.end()
skip = set() skip = set()
revfiles = {} revfiles = {}
match = scmutil.match(repo[None], pats, opts) match = scmutil.match(repo[None], pats, opts)
found = False found = False
follow = opts.get('follow') follow = opts.get('follow')
getrenamed = scmutil.getrenamedfn(repo)
def prep(ctx, fns): def prep(ctx, fns):
rev = ctx.rev() rev = ctx.rev()
pctx = ctx.p1() pctx = ctx.p1()
parent = pctx.rev() parent = pctx.rev()
matches.setdefault(rev, {}) matches.setdefault(rev, {})
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 copy = None
if follow: if follow:
try: copy = getrenamed(fn, rev)
copied = flog.renamed(fnode)
except error.WdirUnsupported:
copied = ctx[fn].renamed()
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:
skip.add(copy) skip.add(copy)
if fn in skip: if fn in skip:
continue continue
files.append(fn) files.append(fn)