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

grep: make use of output labeling

Browse Source
This commit is contained in:
Brodie Rao 2010-04-02 15:22:03 -05:00
parent 9a7e3ba689
commit 94af2427db
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/commands.py
View File

@ -1353,6 +1353,7 @@ def grep(ui, repo, pattern, *pats, **opts):
iter = [('', l) for l in states]
for change, l in iter:
cols = [fn, str(rev)]
before, match, after = None, None, None
if opts.get('line_number'):
cols.append(str(l.linenum))
if opts.get('all'):
@ -1367,8 +1368,15 @@ def grep(ui, repo, pattern, *pats, **opts):
continue
filerevmatches[c] = 1
else:
cols.append(l.line)
ui.write(sep.join(cols), eol)
before = l.line[:l.colstart]
match = l.line[l.colstart:l.colend]
after = l.line[l.colend:]
ui.write(sep.join(cols))
if before is not None:
ui.write(sep + before)
ui.write(match, label='grep.match')
ui.write(after)
ui.write(eol)
found = True
return found