Mercurial > hg

changeset 41606:eeab8c1c926b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
locate: respect ui.relative-paths Differential Revision: https://phab.mercurial-scm.org/D5875
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 30 Jan 2019 16:21:30 -0800
parents 7068c6b0114b
children 698667eb7523
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Feb 05 10:30:05 2019 -0800
+++ b/mercurial/commands.py	Wed Jan 30 16:21:30 2019 -0800
@@ -3683,11 +3683,12 @@
         filesgen = sorted(repo.dirstate.matches(m))
     else:
         filesgen = ctx.matches(m)
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
     for abs in filesgen:
         if opts.get('fullpath'):
             ui.write(repo.wjoin(abs), end)
         else:
-            ui.write(((pats and m.rel(abs)) or abs), end)
+            ui.write(uipathfn(abs), end)
         ret = 0
 
     return ret