Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 41686:935e06e95b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
41685:b81ecf3571d5 41686:935e06e95b91
4920 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: 4920 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4921 exact = m.exact(f) 4921 exact = m.exact(f)
4922 if mark: 4922 if mark:
4923 if exact: 4923 if exact:
4924 ui.warn(_('not marking %s as it is driver-resolved\n') 4924 ui.warn(_('not marking %s as it is driver-resolved\n')
4925 % f) 4925 % uipathfn(f))
4926 elif unmark: 4926 elif unmark:
4927 if exact: 4927 if exact:
4928 ui.warn(_('not unmarking %s as it is driver-resolved\n') 4928 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4929 % f) 4929 % uipathfn(f))
4930 else: 4930 else:
4931 runconclude = True 4931 runconclude = True
4932 continue 4932 continue
4933 4933
4934 # path conflicts must be resolved manually 4934 # path conflicts must be resolved manually
4938 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH) 4938 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4939 elif unmark: 4939 elif unmark:
4940 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) 4940 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4941 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH: 4941 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4942 ui.warn(_('%s: path conflict must be resolved manually\n') 4942 ui.warn(_('%s: path conflict must be resolved manually\n')
4943 % f) 4943 % uipathfn(f))
4944 continue 4944 continue
4945 4945
4946 if mark: 4946 if mark:
4947 if markcheck: 4947 if markcheck:
4948 fdata = repo.wvfs.tryread(f) 4948 fdata = repo.wvfs.tryread(f)
4983 if inst.errno != errno.ENOENT: 4983 if inst.errno != errno.ENOENT:
4984 raise 4984 raise
4985 4985
4986 if hasconflictmarkers: 4986 if hasconflictmarkers:
4987 ui.warn(_('warning: the following files still have conflict ' 4987 ui.warn(_('warning: the following files still have conflict '
4988 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') 4988 'markers:\n ') +
4989 '\n '.join(uipathfn(f) for f in hasconflictmarkers) +
4990 '\n')
4989 if markcheck == 'abort' and not all and not pats: 4991 if markcheck == 'abort' and not all and not pats:
4990 raise error.Abort(_('conflict markers detected'), 4992 raise error.Abort(_('conflict markers detected'),
4991 hint=_('use --all to mark anyway')) 4993 hint=_('use --all to mark anyway'))
4992 4994
4993 for f in tocomplete: 4995 for f in tocomplete: