Show More
@@ -341,8 +341,7 b' def _premerge(repo, fcd, fco, fca, toolc' | |||||
341 | labels = _defaultconflictlabels |
|
341 | labels = _defaultconflictlabels | |
342 | if len(labels) < 3: |
|
342 | if len(labels) < 3: | |
343 | labels.append('base') |
|
343 | labels.append('base') | |
344 | r = simplemerge.simplemerge(ui, fcd, fca, fco, |
|
344 | r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels) | |
345 | quiet=True, label=labels, repo=repo) |
|
|||
346 | if not r: |
|
345 | if not r: | |
347 | ui.debug(" premerge successful\n") |
|
346 | ui.debug(" premerge successful\n") | |
348 | return 0 |
|
347 | return 0 | |
@@ -371,8 +370,7 b' def _merge(repo, mynode, orig, fcd, fco,' | |||||
371 | of merge, unless mode equals 'union' which suppresses the markers.""" |
|
370 | of merge, unless mode equals 'union' which suppresses the markers.""" | |
372 | ui = repo.ui |
|
371 | ui = repo.ui | |
373 |
|
372 | |||
374 | r = simplemerge.simplemerge(ui, fcd, fca, fco, |
|
373 | r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode) | |
375 | label=labels, mode=mode, repo=repo) |
|
|||
376 | return True, r, False |
|
374 | return True, r, False | |
377 |
|
375 | |||
378 | @internaltool('union', fullmerge, |
|
376 | @internaltool('union', fullmerge, | |
@@ -423,9 +421,8 b' def _imergeauto(repo, mynode, orig, fcd,' | |||||
423 | """ |
|
421 | """ | |
424 | assert localorother is not None |
|
422 | assert localorother is not None | |
425 | tool, toolpath, binary, symlink = toolconf |
|
423 | tool, toolpath, binary, symlink = toolconf | |
426 | r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, |
|
424 | r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels, | |
427 |
|
|
425 | localorother=localorother) | |
428 | repo=repo) |
|
|||
429 | return True, r |
|
426 | return True, r | |
430 |
|
427 | |||
431 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) |
|
428 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) |
@@ -413,7 +413,7 b' def _picklabels(defaults, overrides):' | |||||
413 | result[i] = override |
|
413 | result[i] = override | |
414 | return result |
|
414 | return result | |
415 |
|
415 | |||
416 |
def simplemerge(ui, localctx, basectx, otherctx, |
|
416 | def simplemerge(ui, localctx, basectx, otherctx, **opts): | |
417 | """Performs the simplemerge algorithm. |
|
417 | """Performs the simplemerge algorithm. | |
418 |
|
418 | |||
419 | The merged result is written into `localctx`. |
|
419 | The merged result is written into `localctx`. |
General Comments 0
You need to be logged in to leave comments.
Login now