This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5777

grep: respect ui.relative-paths
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG718e9b444d97: grep: respect ui.relative-paths
rHGd8c688d1fef7: grep: respect ui.relative-paths
rHG13ee2b2ddb17: grep: respect ui.relative-paths
rHG42c0d9b1927a: grep: respect ui.relative-paths
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 30 2019, 8:36 PM
martinvonz updated this revision to Diff 13664.Jan 31 2019, 7:01 PM
yuja added a subscriber: yuja.Feb 1 2019, 9:09 PM
  • fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
  • fm.write('path', '%s', fn, label='grep.filename')

+ fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
+ fm.plain('%s' % uipathfn(fn), label='grep.filename')

Removed useless '%s' % and queued, thanks.

Closed by commit rHG42c0d9b1927a: grep: respect ui.relative-paths (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 (5 lines)
Mtests/test-grep.t (14 lines)

Diff 13694

mercurial/commands.py

for i in pycompat.xrange(alo, ahi): for i in pycompat.xrange(alo, ahi):
yield ('-', a[i]) yield ('-', a[i])
elif tag == r'replace': elif tag == r'replace':
for i in pycompat.xrange(alo, ahi): for i in pycompat.xrange(alo, ahi):
yield ('-', a[i]) yield ('-', a[i])
for i in pycompat.xrange(blo, bhi): for i in pycompat.xrange(blo, bhi):
yield ('+', b[i]) yield ('+', b[i])
uipathfn = scmutil.getuipathfn(repo)
def display(fm, fn, ctx, pstates, states): def display(fm, fn, ctx, pstates, states):
rev = scmutil.intrev(ctx) rev = scmutil.intrev(ctx)
if fm.isplain(): if fm.isplain():
formatuser = ui.shortuser formatuser = ui.shortuser
else: else:
formatuser = pycompat.bytestr formatuser = pycompat.bytestr
if ui.quiet: if ui.quiet:
datefmt = '%Y-%m-%d' datefmt = '%Y-%m-%d'
fieldnamemap = {'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)), path=fn)
fm.write('path', '%s', fn, label='grep.filename') fm.plain(uipathfn(fn), label='grep.filename')
cols = [ cols = [
('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([

tests/test-grep.t

port:4:export port:4:export
port:4:vaportight port:4:vaportight
port:4:import/export port:4:import/export
$ hg grep -r tip:0 port port $ hg grep -r tip:0 port port
port:4:export port:4:export
port:4:vaportight port:4:vaportight
port:4:import/export port:4:import/export
simple from subdirectory
$ mkdir dir
$ cd dir
$ hg grep -r tip:0 port
port:4:export
port:4:vaportight
port:4:import/export
$ hg grep -r tip:0 port --config ui.relative-paths=yes
../port:4:export
../port:4:vaportight
../port:4:import/export
$ cd ..
simple with color simple with color
$ hg --config extensions.color= grep --config color.mode=ansi \ $ hg --config extensions.color= grep --config color.mode=ansi \
> --color=always port port -r tip:0 > --color=always port port -r tip:0
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc) \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc) \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc) \x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)