( )⚙ D5776 grep: move writing of path outside of column loop

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5776

grep: move writing of path outside of column loop
ClosedPublic

Authored by martinvonz on Jan 30 2019, 8:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG16454d938299: grep: move writing of path outside of column loop
rHG1912e905a7be: grep: move writing of path outside of column loop
rHG6e27ca78d357: grep: move writing of path outside of column loop
rHG426ad3866f9d: grep: move writing of path outside of column loop
Summary

This will make the next patch simpler.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 30 2019, 8:36 PM
martinvonz updated this revision to Diff 13663.Jan 31 2019, 7:01 PM
Closed by commit rHG426ad3866f9d: grep: move writing of path outside of column loop (authored by martinvonz). · Explain WhyFeb 1 2019, 9:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)

Diff 13663

mercurial/commands.py

@util.cachefunc @util.cachefunc
def binary(): def binary():
flog = getfile(fn) flog = getfile(fn)
try: try:
return stringutil.binary(flog.read(ctx.filenode(fn))) return stringutil.binary(flog.read(ctx.filenode(fn)))
except error.WdirUnsupported: except error.WdirUnsupported:
return ctx[fn].isbinary() return ctx[fn].isbinary()
fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'} fieldnamemap = {'linenumber': 'lineno'}
if diff: if diff:
iter = difflinestates(pstates, states) iter = difflinestates(pstates, states)
else: else:
iter = [('', l) for l in states] iter = [('', l) for l in states]
for change, l in iter: for change, l in iter:
fm.startitem() fm.startitem()
fm.context(ctx=ctx) fm.context(ctx=ctx)
fm.data(node=fm.hexfunc(scmutil.binnode(ctx))) fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
fm.write('path', '%s', fn, label='grep.filename')
cols = [ cols = [
('filename', '%s', fn, True),
('rev', '%d', rev, not plaingrep), ('rev', '%d', rev, not plaingrep),
('linenumber', '%d', l.linenum, opts.get('line_number')), ('linenumber', '%d', l.linenum, opts.get('line_number')),
] ]
if diff: if diff:
cols.append(('change', '%s', change, True)) cols.append(('change', '%s', change, True))
cols.extend([ cols.extend([
('user', '%s', formatuser(ctx.user()), opts.get('user')), ('user', '%s', formatuser(ctx.user()), opts.get('user')),
('date', '%s', fm.formatdate(ctx.date(), datefmt), ('date', '%s', fm.formatdate(ctx.date(), datefmt),
opts.get('date')), opts.get('date')),
]) ])
lastcol = next(
name for name, fmt, data, cond in reversed(cols) if cond)
for name, fmt, data, cond in cols: for name, fmt, data, cond in cols:
if cond:
fm.plain(sep, label='grep.sep')
field = fieldnamemap.get(name, name) field = fieldnamemap.get(name, name)
fm.condwrite(cond, field, fmt, 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'): if not opts.get('files_with_matches'):
fm.plain(sep, label='grep.sep') fm.plain(sep, label='grep.sep')
if not opts.get('text') and binary(): if not opts.get('text') and binary():
fm.plain(_(" Binary file matches")) fm.plain(_(" Binary file matches"))
else: else:
displaymatches(fm.nested('texts', tmpl='{text}'), l) displaymatches(fm.nested('texts', tmpl='{text}'), l)
fm.plain(eol) fm.plain(eol)
found = True found = True