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

grep: factor out function that prints matched line with labels

Browse Source 
Prepares for formatter support.
This commit is contained in:
Yuya Nishihara 2016-08-18 14:09:49 +09:00
parent 1e04cbab83
commit 18d54828a3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mercurial/commands.py
View File

@ -4356,14 +4356,6 @@ def grep(ui, repo, pattern, *pats, **opts):
yield m.span()
p = m.end()
def __iter__(self):
p = 0
for s, e in self.findpos():
yield self.line[p:s], ''
yield self.line[s:e], 'grep.match'
p = e
yield self.line[p:], ''
matches = {}
copies = {}
def grepbody(fn, rev, body):
@ -4424,14 +4416,21 @@ def grep(ui, repo, pattern, *pats, **opts):
if not opts.get('text') and binary():
ui.write(_(" Binary file matches"))
else:
for s, label in l:
ui.write(s, label=label)
displaymatches(l)
ui.write(eol)
found = True
if opts.get('files_with_matches'):
break
return found
def displaymatches(l):
p = 0
for s, e in l.findpos():
ui.write(l.line[p:s])
ui.write(l.line[s:e], label='grep.match')
p = e
ui.write(l.line[p:])
skip = {}
revfiles = {}
matchfn = scmutil.match(repo[None], pats, opts)