# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1548894090 28800
# Node ID eeab8c1c926b5d2225c6847b06130a8953d16ca9
# Parent  7068c6b0114b9933507f8f73da66aa3e45ef530e
locate: respect ui.relative-paths

Differential Revision: https://phab.mercurial-scm.org/D5875

diff -r 7068c6b0114b -r eeab8c1c926b mercurial/commands.py
--- 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