# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1549865899 28800
# Node ID 935e06e95b914345738167a1716b00f9b26de81a
# Parent  b81ecf3571d55006a9ef227829fdbedace8f4bf8
resolve: respect ui.relative-paths also for warning messages

I guess this should have been part of 72a9aacff645 (resolve: respect
ui.relative-paths, 2019-01-29).

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

diff -r b81ecf3571d5 -r 935e06e95b91 mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 11 09:40:24 2019 -0800
+++ b/mercurial/commands.py	Sun Feb 10 22:18:19 2019 -0800
@@ -4922,11 +4922,11 @@
                 if mark:
                     if exact:
                         ui.warn(_('not marking %s as it is driver-resolved\n')
-                                % f)
+                                % uipathfn(f))
                 elif unmark:
                     if exact:
                         ui.warn(_('not unmarking %s as it is driver-resolved\n')
-                                % f)
+                                % uipathfn(f))
                 else:
                     runconclude = True
                 continue
@@ -4940,7 +4940,7 @@
                     ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
                 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
                     ui.warn(_('%s: path conflict must be resolved manually\n')
-                            % f)
+                            % uipathfn(f))
                 continue
 
             if mark:
@@ -4985,7 +4985,9 @@
 
         if hasconflictmarkers:
             ui.warn(_('warning: the following files still have conflict '
-                      'markers:\n  ') + '\n  '.join(hasconflictmarkers) + '\n')
+                      'markers:\n  ') +
+                    '\n  '.join(uipathfn(f) for f in hasconflictmarkers) +
+                    '\n')
             if markcheck == 'abort' and not all and not pats:
                 raise error.Abort(_('conflict markers detected'),
                                   hint=_('use --all to mark anyway'))