From patchwork Wed Dec 9 09:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D9550: simplemerge: write output only once it's complete From: phabricator X-Patchwork-Id: 47845 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Wed, 9 Dec 2020 09:28:42 +0000 martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `simplemerge()` can write either to `ui.fout` or to the file context (for in-memory merge). This patch simplifies the code a bit by making it build the output the same way regardless of where it's written, and then writes the whole output at once. I don't think it will be a problem that we don't output anything until the whole file is merged even if the file is large. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9550 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -499,14 +499,9 @@ extrakwargs[b'name_base'] = name_base extrakwargs[b'minimize'] = False - lines = [] - for line in m3.merge_lines( + lines = m3.merge_lines( name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) - ): - if opts.get('print'): - ui.fout.write(line) - else: - lines.append(line) + ) # merge flags if necessary flags = localctx.flags() @@ -518,8 +513,10 @@ addedflags = (localflags ^ otherflags) - baseflags flags = b''.join(sorted(commonflags | addedflags)) - if not opts.get('print'): - mergedtext = b''.join(lines) + mergedtext = b''.join(lines) + if opts.get('print'): + ui.fout.write(mergedtext) + else: localctx.write(mergedtext, flags) if m3.conflicts and not mode == b'union':