merge: rename conflicts to fileconflicts in _checkunknownfiles
We will need to distinguish between file conflicts and path conflicts. Rename
the conflicts variable so that it will be clearly distinct from pathconflicts,
which will be introduced in a future commit.
Differential Revision: https://phab.mercurial-scm.org/D780
--- a/mercurial/merge.py Mon Oct 02 14:05:30 2017 -0700
+++ b/mercurial/merge.py Mon Oct 02 14:05:30 2017 -0700
@@ -675,7 +675,7 @@
files. For some actions, the result is to abort; for others, it is to
choose a different action.
"""
- conflicts = set()
+ fileconflicts = set()
warnconflicts = set()
abortconflicts = set()
unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
@@ -690,14 +690,15 @@
for f, (m, args, msg) in actions.iteritems():
if m in ('c', 'dc'):
if _checkunknownfile(repo, wctx, mctx, f):
- conflicts.add(f)
+ fileconflicts.add(f)
elif m == 'dg':
if _checkunknownfile(repo, wctx, mctx, f, args[0]):
- conflicts.add(f)
+ fileconflicts.add(f)
- ignoredconflicts = set([c for c in conflicts
+ allconflicts = fileconflicts
+ ignoredconflicts = set([c for c in allconflicts
if repo.dirstate._ignore(c)])
- unknownconflicts = conflicts - ignoredconflicts
+ unknownconflicts = allconflicts - ignoredconflicts
collectconflicts(ignoredconflicts, ignoredconfig)
collectconflicts(unknownconflicts, unknownconfig)
else:
@@ -744,7 +745,7 @@
repo.ui.warn(_("%s: replacing untracked file\n") % f)
for f, (m, args, msg) in actions.iteritems():
- backup = f in conflicts
+ backup = f in fileconflicts
if m == 'c':
flags, = args
actions[f] = ('g', (flags, backup), msg)