Show More
@@ -2885,21 +2885,25 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2885 | fm.plain(uipathfn(fn), label='grep.filename') |
|
2885 | fm.plain(uipathfn(fn), label='grep.filename') | |
2886 |
|
2886 | |||
2887 | cols = [ |
|
2887 | cols = [ | |
2888 | ('rev', '%d', rev, not plaingrep), |
|
2888 | ('rev', '%d', rev, not plaingrep, ''), | |
2889 | ('linenumber', '%d', l.linenum, opts.get('line_number')), |
|
2889 | ('linenumber', '%d', l.linenum, opts.get('line_number'), ''), | |
2890 | ] |
|
2890 | ] | |
2891 | if diff: |
|
2891 | if diff: | |
2892 |
cols.append( |
|
2892 | cols.append( | |
|
2893 | ('change', '%s', change, True, | |||
|
2894 | 'grep.inserted ' if change == '+' else 'grep.deleted ') | |||
|
2895 | ) | |||
2893 | cols.extend([ |
|
2896 | cols.extend([ | |
2894 | ('user', '%s', formatuser(ctx.user()), opts.get('user')), |
|
2897 | ('user', '%s', formatuser(ctx.user()), opts.get('user'), ''), | |
2895 | ('date', '%s', fm.formatdate(ctx.date(), datefmt), |
|
2898 | ('date', '%s', fm.formatdate(ctx.date(), datefmt), | |
2896 | opts.get('date')), |
|
2899 | opts.get('date'), ''), | |
2897 | ]) |
|
2900 | ]) | |
2898 | for name, fmt, data, cond in cols: |
|
2901 | for name, fmt, data, cond, extra_label in cols: | |
2899 | if cond: |
|
2902 | if cond: | |
2900 | fm.plain(sep, label='grep.sep') |
|
2903 | fm.plain(sep, label='grep.sep') | |
2901 | field = fieldnamemap.get(name, name) |
|
2904 | field = fieldnamemap.get(name, name) | |
2902 | fm.condwrite(cond, field, fmt, data, label='grep.%s' % name) |
|
2905 | label = extra_label + ('grep.%s' % name) | |
|
2906 | fm.condwrite(cond, field, fmt, data, label=label) | |||
2903 | if not opts.get('files_with_matches'): |
|
2907 | if not opts.get('files_with_matches'): | |
2904 | fm.plain(sep, label='grep.sep') |
|
2908 | fm.plain(sep, label='grep.sep') | |
2905 | if not opts.get('text') and binary(): |
|
2909 | if not opts.get('text') and binary(): |
@@ -299,6 +299,10 b' Test wdir' | |||||
299 | color:3:+:orange |
|
299 | color:3:+:orange | |
300 | color:2:-:orange |
|
300 | color:2:-:orange | |
301 | color:1:+:orange |
|
301 | color:1:+:orange | |
|
302 | $ hg grep --diff orange --color=debug | |||
|
303 | [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange] | |||
|
304 | [grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange] | |||
|
305 | [grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange] | |||
302 |
|
306 | |||
303 | $ hg grep --diff orange |
|
307 | $ hg grep --diff orange | |
304 | color:3:+:orange |
|
308 | color:3:+:orange |
General Comments 0
You need to be logged in to leave comments.
Login now