# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1607497553 28800
# Node ID fd75e5c53ec315b2b70f9dfcec89e99178236111
# Parent  5510e2ac213f91d95c6de24af6632c780edeb06e
simplemerge: avoid quadratic concatenation when building output text

I haven't checked if the difference is measurable, but the new version
is no less readable or idiomatic, so I don't think performance numbers
are needed.

Differential Revision: https://phab.mercurial-scm.org/D9549

diff -r 5510e2ac213f -r fd75e5c53ec3 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Tue Dec 08 22:59:17 2020 -0800
+++ b/mercurial/simplemerge.py	Tue Dec 08 23:05:53 2020 -0800
@@ -499,14 +499,14 @@
         extrakwargs[b'name_base'] = name_base
         extrakwargs[b'minimize'] = False
 
-    mergedtext = b""
+    lines = []
     for line in m3.merge_lines(
         name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
     ):
         if opts.get('print'):
             ui.fout.write(line)
         else:
-            mergedtext += line
+            lines.append(line)
 
     # merge flags if necessary
     flags = localctx.flags()
@@ -519,6 +519,7 @@
         flags = b''.join(sorted(commonflags | addedflags))
 
     if not opts.get('print'):
+        mergedtext = b''.join(lines)
         localctx.write(mergedtext, flags)
 
     if m3.conflicts and not mode == b'union':