Mercurial > hg
changeset 41686:935e06e95b91
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 10 Feb 2019 22:18:19 -0800 |
| parents | b81ecf3571d5 |
| children | fee1a4935c27 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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'))