| hg-reviewers |
Otherwise, this should be a no-op.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| (tool, premerge, _valid)) | (tool, premerge, _valid)) | ||||
| if premerge: | if premerge: | ||||
| if premerge == 'keep-merge3': | if premerge == 'keep-merge3': | ||||
| if not labels: | if not labels: | ||||
| labels = _defaultconflictlabels | labels = _defaultconflictlabels | ||||
| if len(labels) < 3: | if len(labels) < 3: | ||||
| labels.append('base') | labels.append('base') | ||||
| r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) | r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, | ||||
| quiet=True, label=labels, repo=repo) | |||||
| if not r: | if not r: | ||||
| ui.debug(" premerge successful\n") | ui.debug(" premerge successful\n") | ||||
| return 0 | return 0 | ||||
| if premerge not in validkeep: | if premerge not in validkeep: | ||||
| util.copyfile(back, a) # restore from backup and try again | util.copyfile(back, a) # restore from backup and try again | ||||
| return 1 # continue merging | return 1 # continue merging | ||||
| def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||||
| Uses the internal non-interactive simple merge algorithm for merging | Uses the internal non-interactive simple merge algorithm for merging | ||||
| files. It will fail if there are any conflicts and leave markers in | files. It will fail if there are any conflicts and leave markers in | ||||
| the partially merged file. Markers will have two sections, one for each side | the partially merged file. Markers will have two sections, one for each side | ||||
| of merge, unless mode equals 'union' which suppresses the markers.""" | of merge, unless mode equals 'union' which suppresses the markers.""" | ||||
| a, b, c, back = files | a, b, c, back = files | ||||
| ui = repo.ui | ui = repo.ui | ||||
| r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) | r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, | ||||
| label=labels, mode=mode, repo=repo) | |||||
| return True, r, False | return True, r, False | ||||
| @internaltool('union', fullmerge, | @internaltool('union', fullmerge, | ||||
| _("warning: conflicts while merging %s! " | _("warning: conflicts while merging %s! " | ||||
| "(edit, then use 'hg resolve --mark')\n"), | "(edit, then use 'hg resolve --mark')\n"), | ||||
| precheck=_mergecheck) | precheck=_mergecheck) | ||||
| def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||||
| """ | """ | ||||
| def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, | def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, | ||||
| labels=None, localorother=None): | labels=None, localorother=None): | ||||
| """ | """ | ||||
| Generic driver for _imergelocal and _imergeother | Generic driver for _imergelocal and _imergeother | ||||
| """ | """ | ||||
| assert localorother is not None | assert localorother is not None | ||||
| tool, toolpath, binary, symlink = toolconf | tool, toolpath, binary, symlink = toolconf | ||||
| a, b, c, back = files | a, b, c, back = files | ||||
| r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels, | r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco, | ||||
| localorother=localorother) | label=labels, localorother=localorother, | ||||
| repo=repo) | |||||
| return True, r | return True, r | ||||
| @internaltool('merge-local', mergeonly, precheck=_mergecheck) | @internaltool('merge-local', mergeonly, precheck=_mergecheck) | ||||
| def _imergelocal(*args, **kwargs): | def _imergelocal(*args, **kwargs): | ||||
| """ | """ | ||||
| Like :merge, but resolve all conflicts non-interactively in favor | Like :merge, but resolve all conflicts non-interactively in favor | ||||
| of the local `p1()` changes.""" | of the local `p1()` changes.""" | ||||
| success, status = _imergeauto(localorother='local', *args, **kwargs) | success, status = _imergeauto(localorother='local', *args, **kwargs) | ||||