Show More
@@ -85,9 +85,6 b' try:' | |||||
85 | raise ParseError(_('wrong number of arguments')) |
|
85 | raise ParseError(_('wrong number of arguments')) | |
86 | local, base, other = args |
|
86 | local, base, other = args | |
87 | sys.exit(simplemerge.simplemerge(uimod.ui.load(), |
|
87 | sys.exit(simplemerge.simplemerge(uimod.ui.load(), | |
88 | local, |
|
|||
89 | base, |
|
|||
90 | other, |
|
|||
91 | filebackedctx(local), |
|
88 | filebackedctx(local), | |
92 | filebackedctx(base), |
|
89 | filebackedctx(base), | |
93 | filebackedctx(other), |
|
90 | filebackedctx(other), |
@@ -341,7 +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, |
|
344 | r = simplemerge.simplemerge(ui, fcd, fca, fco, | |
345 | quiet=True, label=labels, repo=repo) |
|
345 | quiet=True, label=labels, repo=repo) | |
346 | if not r: |
|
346 | if not r: | |
347 | ui.debug(" premerge successful\n") |
|
347 | ui.debug(" premerge successful\n") | |
@@ -372,7 +372,7 b' def _merge(repo, mynode, orig, fcd, fco,' | |||||
372 |
|
372 | |||
373 | ui = repo.ui |
|
373 | ui = repo.ui | |
374 |
|
374 | |||
375 |
r = simplemerge.simplemerge(ui, |
|
375 | r = simplemerge.simplemerge(ui, fcd, fca, fco, | |
376 | label=labels, mode=mode, repo=repo) |
|
376 | label=labels, mode=mode, repo=repo) | |
377 | return True, r, False |
|
377 | return True, r, False | |
378 |
|
378 | |||
@@ -425,7 +425,7 b' def _imergeauto(repo, mynode, orig, fcd,' | |||||
425 | assert localorother is not None |
|
425 | assert localorother is not None | |
426 | tool, toolpath, binary, symlink = toolconf |
|
426 | tool, toolpath, binary, symlink = toolconf | |
427 | a, b, c, back = files |
|
427 | a, b, c, back = files | |
428 |
r = simplemerge.simplemerge(repo.ui, |
|
428 | r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, | |
429 | label=labels, localorother=localorother, |
|
429 | label=labels, localorother=localorother, | |
430 | repo=repo) |
|
430 | repo=repo) | |
431 | return True, r |
|
431 | return True, r |
@@ -419,8 +419,8 b' def _picklabels(defaults, overrides):' | |||||
419 |
|
419 | |||
420 | return [name_a, name_b, name_base] |
|
420 | return [name_a, name_b, name_base] | |
421 |
|
421 | |||
422 |
def simplemerge(ui, local |
|
422 | def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, | |
423 | localctx=None, basectx=None, otherctx=None, repo=None, **opts): |
|
423 | **opts): | |
424 | """Performs the simplemerge algorithm. |
|
424 | """Performs the simplemerge algorithm. | |
425 |
|
425 | |||
426 | {local|base|other}ctx are optional. If passed, they (local/base/other) will |
|
426 | {local|base|other}ctx are optional. If passed, they (local/base/other) will |
General Comments 0
You need to be logged in to leave comments.
Login now