| hg-reviewers |
This lets us correctly use %d as needed.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (20 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Augie Fackler | Aug 9 2018, 11:13 PM |
| 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))) | ||||
| cols = [ | cols = [ | ||||
| ('filename', fn, True), | ('filename', '%s', fn, True), | ||||
| ('rev', rev, not plaingrep), | ('rev', '%d', rev, not plaingrep), | ||||
| ('linenumber', l.linenum, opts.get('line_number')), | ('linenumber', '%d', l.linenum, opts.get('line_number')), | ||||
| ] | ] | ||||
| if diff: | if diff: | ||||
| cols.append(('change', change, True)) | cols.append(('change', '%s', change, True)) | ||||
| cols.extend([ | cols.extend([ | ||||
| ('user', formatuser(ctx.user()), opts.get('user')), | ('user', '%s', formatuser(ctx.user()), opts.get('user')), | ||||
| ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | ('date', '%s', fm.formatdate(ctx.date(), datefmt), | ||||
| opts.get('date')), | |||||
| ]) | ]) | ||||
| lastcol = next(name for name, data, cond in reversed(cols) if cond) | lastcol = next( | ||||
| for name, data, cond in cols: | name for name, fmt, data, cond in reversed(cols) if cond) | ||||
| for name, fmt, data, cond in cols: | |||||
| field = fieldnamemap.get(name, name) | 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: | if cond and name != lastcol: | ||||
| fm.plain(sep, label='grep.sep') | 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) | ||||