| durin42 |
| hg-reviewers |
We have nice constants now. Let's use them to make the code
easier to reason about.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| fm = ui.formatter('resolve', opts) | fm = ui.formatter('resolve', opts) | ||||
| ms = mergemod.mergestate.read(repo) | ms = mergemod.mergestate.read(repo) | ||||
| m = scmutil.match(repo[None], pats, opts) | m = scmutil.match(repo[None], pats, opts) | ||||
| # Labels and keys based on merge state. Unresolved path conflicts show | # Labels and keys based on merge state. Unresolved path conflicts show | ||||
| # as 'P'. Resolved path conflicts show as 'R', the same as normal | # as 'P'. Resolved path conflicts show as 'R', the same as normal | ||||
| # resolved conflicts. | # resolved conflicts. | ||||
| mergestateinfo = { | mergestateinfo = { | ||||
| 'u': ('resolve.unresolved', 'U'), | mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'), | ||||
| 'r': ('resolve.resolved', 'R'), | mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'), | ||||
| 'pu': ('resolve.unresolved', 'P'), | mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'), | ||||
| 'pr': ('resolve.resolved', 'R'), | mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'), | ||||
| 'd': ('resolve.driverresolved', 'D'), | mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved', | ||||
| 'D'), | |||||
| } | } | ||||
| for f in ms: | for f in ms: | ||||
| if not m(f): | if not m(f): | ||||
| continue | continue | ||||
| label, key = mergestateinfo[ms[f]] | label, key = mergestateinfo[ms[f]] | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | ||||
| fm.write('path', '%s\n', f, label=label) | fm.write('path', '%s\n', f, label=label) | ||||
| fm.end() | fm.end() | ||||
| return 0 | return 0 | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| ms = mergemod.mergestate.read(repo) | ms = mergemod.mergestate.read(repo) | ||||
| if not (ms.active() or repo.dirstate.p2() != nullid): | if not (ms.active() or repo.dirstate.p2() != nullid): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _('resolve command not applicable when not merging')) | _('resolve command not applicable when not merging')) | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| if ms.mergedriver and ms.mdstate() == 'u': | if (ms.mergedriver | ||||
| and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED): | |||||
| proceed = mergemod.driverpreprocess(repo, ms, wctx) | proceed = mergemod.driverpreprocess(repo, ms, wctx) | ||||
| ms.commit() | ms.commit() | ||||
| # allow mark and unmark to go through | # allow mark and unmark to go through | ||||
| if not mark and not unmark and not proceed: | if not mark and not unmark and not proceed: | ||||
| return 1 | return 1 | ||||
| m = scmutil.match(wctx, pats, opts) | m = scmutil.match(wctx, pats, opts) | ||||
| ret = 0 | ret = 0 | ||||
| didwork = False | didwork = False | ||||
| runconclude = False | runconclude = False | ||||
| tocomplete = [] | tocomplete = [] | ||||
| for f in ms: | for f in ms: | ||||
| if not m(f): | if not m(f): | ||||
| continue | continue | ||||
| didwork = True | didwork = True | ||||
| # 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] == "d": | 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) | % 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) | % 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 ("pu", "pr"): | if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH, | ||||
| mergemod.MERGE_RECORD_RESOLVED_PATH): | |||||
| if mark: | if mark: | ||||
| ms.mark(f, "pr") | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH) | ||||
| elif unmark: | elif unmark: | ||||
| ms.mark(f, "pu") | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) | ||||
| elif ms[f] == "pu": | 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) | % f) | ||||
| continue | continue | ||||
| if mark: | if mark: | ||||
| ms.mark(f, "r") | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) | ||||
| elif unmark: | elif unmark: | ||||
| ms.mark(f, "u") | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED) | ||||
| else: | else: | ||||
| # backup pre-resolve (merge uses .orig for its own purposes) | # backup pre-resolve (merge uses .orig for its own purposes) | ||||
| a = repo.wjoin(f) | a = repo.wjoin(f) | ||||
| try: | try: | ||||
| util.copyfile(a, a + ".resolve") | util.copyfile(a, a + ".resolve") | ||||
| except (IOError, OSError) as inst: | except (IOError, OSError) as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||