This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5633

grep: use set instead of dict with dummy value
ClosedPublic

Authored by martinvonz on Jan 18 2019, 2:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG609d6d8646db: grep: use set instead of dict with dummy value
rHG64bd6611e18e: grep: use set instead of dict with dummy value

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 18 2019, 2:19 PM
lothiraldan added a subscriber: lothiraldan.Jan 23 2019, 1:16 PM

I get a message stating that one of the hunk of patch failed to apply and couldn't understand what is going on, could you try rebase it to see if you have the issue locally?

martinvonz added a parent revision: D5620: grep: don't look up copy info unless --follow is given.Jan 23 2019, 1:17 PM
In D5633#83417, @lothiraldan wrote:

I get a message stating that one of the hunk of patch failed to apply and couldn't understand what is going on, could you try rebase it to see if you have the issue locally?

Ah, I had forgotten to update the parent revision (this commit depends on D5620). I've done that now (and also rebased it).

Closed by commit rHG64bd6611e18e: grep: use set instead of dict with dummy value (authored by martinvonz). · Explain WhyJan 25 2019, 3:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)

Diff 13326

mercurial/commands.py

fm.data(matched=True) fm.data(matched=True)
p = e p = e
if p < len(l.line): if p < len(l.line):
fm.startitem() fm.startitem()
fm.write('text', '%s', l.line[p:]) fm.write('text', '%s', l.line[p:])
fm.data(matched=False) fm.data(matched=False)
fm.end() fm.end()
skip = {} 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')
def prep(ctx, fns): def prep(ctx, fns):
rev = ctx.rev() rev = ctx.rev()
pctx = ctx.p1() pctx = ctx.p1()
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 = 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:
skip[copy] = True skip.add(copy)
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()
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]
copy = copies.get(rev, {}).get(fn) copy = copies.get(rev, {}).get(fn)
if fn in skip: if fn in skip:
if copy: if copy:
skip[copy] = True skip.add(copy)
continue continue
pstates = matches.get(parent, {}).get(copy or fn, []) pstates = matches.get(parent, {}).get(copy or fn, [])
if pstates or states: if pstates or states:
r = display(fm, fn, ctx, pstates, states) r = display(fm, fn, ctx, pstates, states)
found = found or r found = found or r
if r and not diff and not all_files: if r and not diff and not all_files:
skip[fn] = True skip.add(fn)
if copy: if copy:
skip[copy] = True skip.add(copy)
del revfiles[rev] del revfiles[rev]
# We will keep the matches dict for the duration of the window # We will keep the matches dict for the duration of the window
# clear the matches dict once the window is over # clear the matches dict once the window is over
if not revfiles: if not revfiles:
matches.clear() matches.clear()
fm.end() fm.end()
return not found return not found