Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugignore: respect ui.relative-paths
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 07 Feb 2019 23:41:44 -0800
changeset 41636 be8741d42836
parent 41635 446e1dcc3b5c
child 41637 252cc56c9ff6
debugignore: respect ui.relative-paths Not because I care about this, but I want to get rid of match.uipath() and it's easier to respect the config than not. Differential Revision: https://phab.mercurial-scm.org/D5898
mercurial/debugcommands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/debugcommands.py	Fri Feb 08 13:31:26 2019 -0800
+++ b/mercurial/debugcommands.py	Thu Feb 07 23:41:44 2019 -0800
@@ -1086,6 +1086,7 @@
         ui.write("%s\n" % pycompat.byterepr(ignore))
     else:
         m = scmutil.match(repo[None], pats=files)
+        uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
         for f in m.files():
             nf = util.normpath(f)
             ignored = None
@@ -1102,16 +1103,16 @@
                             break
             if ignored:
                 if ignored == nf:
-                    ui.write(_("%s is ignored\n") % m.uipath(f))
+                    ui.write(_("%s is ignored\n") % uipathfn(f))
                 else:
                     ui.write(_("%s is ignored because of "
                                "containing folder %s\n")
-                             % (m.uipath(f), ignored))
+                             % (uipathfn(f), ignored))
                 ignorefile, lineno, line = ignoredata
                 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
                          % (ignorefile, lineno, line))
             else:
-                ui.write(_("%s is not ignored\n") % m.uipath(f))
+                ui.write(_("%s is not ignored\n") % uipathfn(f))
 
 @command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts,
          _('-c|-m|FILE'))
mercurial