D780: merge: rename conflicts to fileconflicts in _checkunknownfiles
mbthomas (Mark Thomas)
phabricator at mercurial-scm.org
Fri Sep 22 09:28:25 UTC 2017
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D780
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -672,7 +672,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')
@@ -687,14 +687,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:
@@ -741,7 +742,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)
To: mbthomas, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list