cat: respect ui.relative-paths for "skipping missing subrepository"
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 08 Feb 2019 13:54:20 -0800
changeset 41663 28ce9184d495
parent 41662 0a5a6675c86c
child 41664 0cbf491db7ee
cat: respect ui.relative-paths for "skipping missing subrepository" Differential Revision: https://phab.mercurial-scm.org/D5914
mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri Feb 08 13:51:29 2019 -0800
+++ b/mercurial/cmdutil.py	Fri Feb 08 13:54:20 2019 -0800
@@ -2367,6 +2367,7 @@
         write(abs)
         err = 0
 
+    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
     for subpath in sorted(ctx.substate):
         sub = ctx.sub(subpath)
         try:
@@ -2377,7 +2378,7 @@
                 err = 0
         except error.RepoLookupError:
             ui.status(_("skipping missing subrepository: %s\n") %
-                      matcher.rel(subpath))
+                      uipathfn(subpath))
 
     return err