This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8544

grep: stop computing information for --diff when unnecessary
ClosedPublic

Authored by valentin.gatienbaron on May 17 2020, 1:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8d552701806d: grep: stop computing information for --diff when unnecessary
Summary

This is one reason why hg grep pattern essentially does `hg cat -r
. 'set:**'` inside. There is no speed improvement in this commit,
because the rest of the code still greps data from filelog instead of
working copy when possible.

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

valentin.gatienbaron added a commit: rHG8d552701806d: grep: stop computing information for --diff when unnecessary.May 18 2020, 1:10 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8d552701806d: grep: stop computing information for --diff when unnecessary (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (24 lines)

Diff 21422

mercurial/commands.py

_(b'cannot search in censored file: %(filename)s:%(revnum)s\n') _(b'cannot search in censored file: %(filename)s:%(revnum)s\n')
% {b'filename': filename, b'revnum': pycompat.bytestr(revision)} % {b'filename': filename, b'revnum': pycompat.bytestr(revision)}
) )
return content return content
def prep(ctx, fns): def prep(ctx, fns):
rev = ctx.rev() rev = ctx.rev()
pctx = ctx.p1() pctx = ctx.p1()
parent = pctx.rev()
matches.setdefault(rev, {}) matches.setdefault(rev, {})
if diff:
parent = pctx.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:
copy = getrenamed(fn, rev) copy = getrenamed(fn, rev)
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)
if fn not in matches[rev]: if fn not in matches[rev]:
content = get_file_content(fn, flog, fnode, ctx, rev) content = get_file_content(fn, flog, fnode, ctx, rev)
grepbody(fn, rev, content) grepbody(fn, rev, content)
if diff:
pfn = copy or fn pfn = copy or fn
if pfn not in matches[parent]: if pfn not in matches[parent]:
try: try:
pfnode = pctx.filenode(pfn) pfnode = pctx.filenode(pfn)
pcontent = get_file_content(pfn, flog, pfnode, pctx, parent) pcontent = get_file_content(
pfn, flog, pfnode, pctx, parent
)
grepbody(pfn, parent, pcontent) grepbody(pfn, parent, pcontent)
except error.LookupError: except error.LookupError:
pass pass
ui.pager(b'grep') ui.pager(b'grep')
fm = ui.formatter(b'grep', opts) fm = ui.formatter(b'grep', opts)
for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
rev = ctx.rev() rev = ctx.rev()
parent = ctx.p1().rev() parent = ctx.p1().rev()
for fn in sorted(revfiles.get(rev, [])): for fn in sorted(revfiles.get(rev, [])):
states = matches[rev][fn] states = matches[rev][fn]