Patchwork [3,of,8] grep: build list of columns without "grep." label prefix

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 5, 2016, 8:07 p.m.
Message ID <37d838e8eb0b40bfb6bf.1473106071@waste.org>
Download mbox | patch
Permalink /patch/16554/
State Not Applicable
Headers show

Comments

Yuya Nishihara - Sept. 5, 2016, 8:07 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1471497809 -32400
#      Thu Aug 18 14:23:29 2016 +0900
# Node ID 37d838e8eb0b40bfb6bfdc902cacdb3d62a0ce60
# Parent  fac24eab65a4dcee65fa8be81f716859519f58b0
grep: build list of columns without "grep." label prefix

Prepares for formatter support. We need field names without "grep.".

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4397,20 +4397,20 @@ 
         else:
             iter = [('', l) for l in states]
         for change, l in iter:
-            cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
+            cols = [(fn, 'filename'), (str(rev), 'rev')]
 
             if opts.get('line_number'):
-                cols.append((str(l.linenum), 'grep.linenumber'))
+                cols.append((str(l.linenum), 'linenumber'))
             if opts.get('all'):
-                cols.append((change, 'grep.change'))
+                cols.append((change, 'change'))
             if opts.get('user'):
-                cols.append((ui.shortuser(ctx.user()), 'grep.user'))
+                cols.append((ui.shortuser(ctx.user()), 'user'))
             if opts.get('date'):
-                cols.append((datefunc(ctx.date()), 'grep.date'))
-            for col, label in cols[:-1]:
-                ui.write(col, label=label)
+                cols.append((datefunc(ctx.date()), 'date'))
+            for col, field in cols[:-1]:
+                ui.write(col, label='grep.%s' % field)
                 ui.write(sep, label='grep.sep')
-            ui.write(cols[-1][0], label=cols[-1][1])
+            ui.write(cols[-1][0], label='grep.%s' % cols[-1][1])
             if not opts.get('files_with_matches'):
                 ui.write(sep, label='grep.sep')
                 if not opts.get('text') and binary():