D5915: cmdutil: migrate previously missed instances to uipathfn

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Fri Feb 8 17:36:29 EST 2019


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I seem to have missed these two instances in https://phab.mercurial-scm.org/rHG15f63ac122ea3ee97c67e868d055c3c310725fe4 (files:
  respect ui.relative-paths, 2019-01-29) and https://phab.mercurial-scm.org/rHG7068c6b0114b9933507f8f73da66aa3e45ef530e (revert:
  respect ui.relative-paths, 2019-02-05).

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2193,7 +2193,7 @@
                     ret = 0
             except error.LookupError:
                 ui.status(_("skipping missing subrepository: %s\n")
-                               % m.rel(subpath))
+                               % uipathfn(subpath))
 
     return ret
 
@@ -2825,7 +2825,7 @@
                 for f in names:
                     if f.startswith(path_):
                         return
-                ui.warn("%s: %s\n" % (m.rel(path), msg))
+                ui.warn("%s: %s\n" % (uipathfn(path), msg))
 
             for abs in ctx.walk(matchmod.badmatch(m, badfn)):
                 if abs not in names:



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


More information about the Mercurial-devel mailing list