Mercurial > hg-stable

changeset 48545:fa159bb463e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: avoid a call to `pycompat.strkwargs()` Differential Revision: https://phab.mercurial-scm.org/D11886
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 14:11:58 -0800
parents 58a3be48ddd2
children 5151b0f6519e
files mercurial/simplemerge.py
diffstat 1 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Mon Dec 06 23:17:43 2021 -0800
+++ b/mercurial/simplemerge.py	Tue Dec 07 14:11:58 2021 -0800
@@ -516,25 +516,23 @@
 
     m3 = Merge3Text(basetext, localtext, othertext)
     extrakwargs = {
-        b"localorother": opts.get("localorother", None),
-        b'minimize': True,
+        "localorother": opts.get("localorother", None),
+        'minimize': True,
     }
     if mode == b'union':
-        extrakwargs[b'start_marker'] = None
-        extrakwargs[b'mid_marker'] = None
-        extrakwargs[b'end_marker'] = None
+        extrakwargs['start_marker'] = None
+        extrakwargs['mid_marker'] = None
+        extrakwargs['end_marker'] = None
     elif name_base is not None:
-        extrakwargs[b'base_marker'] = b'|||||||'
-        extrakwargs[b'name_base'] = name_base
-        extrakwargs[b'minimize'] = False
+        extrakwargs['base_marker'] = b'|||||||'
+        extrakwargs['name_base'] = name_base
+        extrakwargs['minimize'] = False
 
     if mode == b'mergediff':
         lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
     else:
         lines = list(
-            m3.merge_lines(
-                name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
-            )
+            m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
         )
         conflicts = m3.conflicts and not mode == b'union'