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.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (13 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas |
| return None | return None | ||||
| def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): | def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): | ||||
| """ | """ | ||||
| Considers any actions that care about the presence of conflicting unknown | Considers any actions that care about the presence of conflicting unknown | ||||
| files. For some actions, the result is to abort; for others, it is to | files. For some actions, the result is to abort; for others, it is to | ||||
| choose a different action. | choose a different action. | ||||
| """ | """ | ||||
| conflicts = set() | fileconflicts = set() | ||||
| warnconflicts = set() | warnconflicts = set() | ||||
| abortconflicts = set() | abortconflicts = set() | ||||
| unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') | unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') | ||||
| ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored') | ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored') | ||||
| if not force: | if not force: | ||||
| def collectconflicts(conflicts, config): | def collectconflicts(conflicts, config): | ||||
| if config == 'abort': | if config == 'abort': | ||||
| abortconflicts.update(conflicts) | abortconflicts.update(conflicts) | ||||
| elif config == 'warn': | elif config == 'warn': | ||||
| warnconflicts.update(conflicts) | warnconflicts.update(conflicts) | ||||
| for f, (m, args, msg) in actions.iteritems(): | for f, (m, args, msg) in actions.iteritems(): | ||||
| if m in ('c', 'dc'): | if m in ('c', 'dc'): | ||||
| if _checkunknownfile(repo, wctx, mctx, f): | if _checkunknownfile(repo, wctx, mctx, f): | ||||
| conflicts.add(f) | fileconflicts.add(f) | ||||
| elif m == 'dg': | elif m == 'dg': | ||||
| if _checkunknownfile(repo, wctx, mctx, f, args[0]): | 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)]) | if repo.dirstate._ignore(c)]) | ||||
| unknownconflicts = conflicts - ignoredconflicts | unknownconflicts = allconflicts - ignoredconflicts | ||||
| collectconflicts(ignoredconflicts, ignoredconfig) | collectconflicts(ignoredconflicts, ignoredconfig) | ||||
| collectconflicts(unknownconflicts, unknownconfig) | collectconflicts(unknownconflicts, unknownconfig) | ||||
| else: | else: | ||||
| for f, (m, args, msg) in actions.iteritems(): | for f, (m, args, msg) in actions.iteritems(): | ||||
| if m == 'cm': | if m == 'cm': | ||||
| fl2, anc = args | fl2, anc = args | ||||
| different = _checkunknownfile(repo, wctx, mctx, f) | different = _checkunknownfile(repo, wctx, mctx, f) | ||||
| if repo.dirstate._ignore(f): | if repo.dirstate._ignore(f): | ||||
| if abortconflicts: | if abortconflicts: | ||||
| raise error.Abort(_("untracked files in working directory " | raise error.Abort(_("untracked files in working directory " | ||||
| "differ from files in requested revision")) | "differ from files in requested revision")) | ||||
| for f in sorted(warnconflicts): | for f in sorted(warnconflicts): | ||||
| repo.ui.warn(_("%s: replacing untracked file\n") % f) | repo.ui.warn(_("%s: replacing untracked file\n") % f) | ||||
| for f, (m, args, msg) in actions.iteritems(): | for f, (m, args, msg) in actions.iteritems(): | ||||
| backup = f in conflicts | backup = f in fileconflicts | ||||
| if m == 'c': | if m == 'c': | ||||
| flags, = args | flags, = args | ||||
| actions[f] = ('g', (flags, backup), msg) | actions[f] = ('g', (flags, backup), msg) | ||||
| def _forgetremoved(wctx, mctx, branchmerge): | def _forgetremoved(wctx, mctx, branchmerge): | ||||
| """ | """ | ||||
| Forget removed files | Forget removed files | ||||