Patchwork D5937: resolve: respect ui.relative-paths also for warning messages

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2019, 12:16 p.m.
Message ID <55508dce9335b328596e297d126bcc2e@localhost.localdomain>
Download mbox | patch
Permalink /patch/38710/
State Not Applicable
Headers show

Comments

phabricator - Feb. 13, 2019, 12:16 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf3c24966e4b: resolve: respect ui.relative-paths also for warning messages (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5937?vs=14033&id=14060

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




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

Patch

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