( )⚙ D5937 resolve: respect ui.relative-paths also for warning messages

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5937

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

Authored by martinvonz on Feb 11 2019, 12:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG935e06e95b91: resolve: respect ui.relative-paths also for warning messages
rHGdf3c24966e4b: resolve: respect ui.relative-paths also for warning messages
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)

Diff 14033

mercurial/commands.py

# don't let driver-resolved files be marked, and run the conclude # don't let driver-resolved files be marked, and run the conclude
# step if asked to resolve # step if asked to resolve
if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
exact = m.exact(f) exact = m.exact(f)
if mark: if mark:
if exact: if exact:
ui.warn(_('not marking %s as it is driver-resolved\n') ui.warn(_('not marking %s as it is driver-resolved\n')
% f) % uipathfn(f))
elif unmark: elif unmark:
if exact: if exact:
ui.warn(_('not unmarking %s as it is driver-resolved\n') ui.warn(_('not unmarking %s as it is driver-resolved\n')
% f) % uipathfn(f))
else: else:
runconclude = True runconclude = True
continue continue
# path conflicts must be resolved manually # path conflicts must be resolved manually
if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH, if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
mergemod.MERGE_RECORD_RESOLVED_PATH): mergemod.MERGE_RECORD_RESOLVED_PATH):
if mark: if mark:
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH) ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
elif unmark: elif unmark:
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH: elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
ui.warn(_('%s: path conflict must be resolved manually\n') ui.warn(_('%s: path conflict must be resolved manually\n')
% f) % uipathfn(f))
continue continue
if mark: if mark:
if markcheck: if markcheck:
fdata = repo.wvfs.tryread(f) fdata = repo.wvfs.tryread(f)
if filemerge.hasconflictmarkers(fdata) and \ if filemerge.hasconflictmarkers(fdata) and \
ms[f] != mergemod.MERGE_RECORD_RESOLVED: ms[f] != mergemod.MERGE_RECORD_RESOLVED:
hasconflictmarkers.append(f) hasconflictmarkers.append(f)
util.rename(a + ".resolve", util.rename(a + ".resolve",
scmutil.backuppath(ui, repo, f)) scmutil.backuppath(ui, repo, f))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
if hasconflictmarkers: if hasconflictmarkers:
ui.warn(_('warning: the following files still have conflict ' 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: if markcheck == 'abort' and not all and not pats:
raise error.Abort(_('conflict markers detected'), raise error.Abort(_('conflict markers detected'),
hint=_('use --all to mark anyway')) hint=_('use --all to mark anyway'))
for f in tocomplete: for f in tocomplete:
try: try:
# resolve file # resolve file
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}