martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY The `ui` argument is no longer needed now that we don't handle `--print` in the library code. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12151 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -495,7 +495,7 @@ raise error.Abort(msg) -def simplemerge(ui, local, base, other, **opts): +def simplemerge(local, base, other, **opts): """Performs the simplemerge algorithm. The merged result is written into `localctx`. diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -437,7 +437,7 @@ return 1 else: merged_text, conflicts = simplemerge.simplemerge( - ui, local, base, other, mode=mode + local, base, other, mode=mode ) if merged_text is not None and ( not conflicts or premerge in validkeep @@ -488,7 +488,7 @@ conflicts = True else: merged_text, conflicts = simplemerge.simplemerge( - ui, local, base, other, mode=mode + local, base, other, mode=mode ) # fcd.flags() already has the merged flags (done in # mergestate.resolve()) diff --git a/contrib/simplemerge b/contrib/simplemerge --- a/contrib/simplemerge +++ b/contrib/simplemerge @@ -107,7 +107,7 @@ sys.exit(1) merged_text, conflicts = simplemerge.simplemerge( - ui, local_input, base_input, other_input, **opts + local_input, base_input, other_input, **opts ) if merged_text is not None: if opts['print']: To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
