D4239: grep: include format string in columns list
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Thu Aug 9 23:37:19 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5797b0bbdd1d: grep: include format string in columns list (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4239?vs=10259&id=10269
REVISION DETAIL
https://phab.mercurial-scm.org/D4239
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2650,20 +2650,22 @@
fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
cols = [
- ('filename', fn, True),
- ('rev', rev, not plaingrep),
- ('linenumber', l.linenum, opts.get('line_number')),
+ ('filename', '%s', fn, True),
+ ('rev', '%d', rev, not plaingrep),
+ ('linenumber', '%d', l.linenum, opts.get('line_number')),
]
if diff:
- cols.append(('change', change, True))
+ cols.append(('change', '%s', change, True))
cols.extend([
- ('user', formatuser(ctx.user()), opts.get('user')),
- ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
+ ('user', '%s', formatuser(ctx.user()), opts.get('user')),
+ ('date', '%s', fm.formatdate(ctx.date(), datefmt),
+ opts.get('date')),
])
- lastcol = next(name for name, data, cond in reversed(cols) if cond)
- for name, data, cond in cols:
+ lastcol = next(
+ name for name, fmt, data, cond in reversed(cols) if cond)
+ for name, fmt, data, cond in cols:
field = fieldnamemap.get(name, name)
- fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
+ fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
if cond and name != lastcol:
fm.plain(sep, label='grep.sep')
if not opts.get('files_with_matches'):
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list