facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

grep: exit loop immediately, if matching is found in the file for "hg grep -l"

Browse Source 
Before this patch, internal function "display()" of "hg grep" is not
efficient for "-l"/"--files-with-matches", because loop is continued,
even after the first matching is found in the specified file.

This patch exits loop immediately, if matching is found for
"--files-with-matches".

In this case, "before is None" is equal to "opts.get('files_with_matches')".
This commit is contained in:
FUJIWARA Katsunori 2014-02-15 19:54:14 +09:00
parent e9f33efda3
commit 2add9630f2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/commands.py
View File

@ -3364,10 +3364,7 @@ def grep(ui, repo, pattern, *pats, **opts):
cols.append((ui.shortuser(ctx.user()), 'grep.user'))
if opts.get('date'):
cols.append((datefunc(ctx.date()), 'grep.date'))
if opts.get('files_with_matches'):
if found:
continue
else:
if not opts.get('files_with_matches'):
before = l.line[:l.colstart]
match = l.line[l.colstart:l.colend]
after = l.line[l.colend:]
@ -3385,6 +3382,8 @@ def grep(ui, repo, pattern, *pats, **opts):
ui.write(after)
ui.write(eol)
found = True
if before is None:
break
return found
skip = {}