Patchwork D5914: cat: respect ui.relative-paths for "skipping missing subrepository"

login
register
mail settings
Submitter phabricator
Date Feb. 10, 2019, 3:41 a.m.
Message ID <9dc4b4faf2d57d6a64d194009909be34@localhost.localdomain>
Download mbox | patch
Permalink /patch/38642/
State Not Applicable
Headers show

Comments

phabricator - Feb. 10, 2019, 3:41 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG28ce9184d495: cat: respect ui.relative-paths for &quot;skipping missing subrepository&quot; (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5914?vs=13941&id=13995

REVISION DETAIL
  https://phab.mercurial-scm.org/D5914

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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