D5777: grep: respect ui.relative-paths
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jan 31 01:38:27 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5777
AFFECTED FILES
mercurial/commands.py
tests/test-grep.t
CHANGE DETAILS
diff --git a/tests/test-grep.t b/tests/test-grep.t
--- a/tests/test-grep.t
+++ b/tests/test-grep.t
@@ -32,6 +32,20 @@
port:4:vaportight
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
$ hg --config extensions.color= grep --config color.mode=ansi \
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2848,6 +2848,7 @@
for i in pycompat.xrange(blo, bhi):
yield ('+', b[i])
+ uipathfn = scmutil.getuipathfn(repo)
def display(fm, fn, ctx, pstates, states):
rev = scmutil.intrev(ctx)
if fm.isplain():
@@ -2875,8 +2876,8 @@
for change, l in iter:
fm.startitem()
fm.context(ctx=ctx)
- 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')
cols = [
('rev', '%d', rev, not plaingrep),
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list