Patchwork D11902: simplemerge: remove now-unused `localorother` argument from `merge_lines()`

login
register
mail settings
Submitter phabricator
Date Dec. 11, 2021, 2:02 a.m.
Message ID <differential-rev-PHID-DREV-n5bzfagaal5p5viomygy-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50228/
State New
Headers show

Comments

phabricator - Dec. 11, 2021, 2:02 a.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11902

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -96,7 +96,6 @@ 
         mid_marker=b'=======',
         end_marker=b'>>>>>>>',
         base_marker=None,
-        localorother=None,
         minimize=False,
     ):
         """Return merge in cvs-like form."""
@@ -128,28 +127,21 @@ 
                 for i in range(t[1], t[2]):
                     yield self.b[i]
             elif what == b'conflict':
-                if localorother == b'local':
-                    for i in range(t[3], t[4]):
-                        yield self.a[i]
-                elif localorother == b'other':
-                    for i in range(t[5], t[6]):
-                        yield self.b[i]
-                else:
-                    self.conflicts = True
-                    if start_marker is not None:
-                        yield start_marker + newline
-                    for i in range(t[3], t[4]):
-                        yield self.a[i]
-                    if base_marker is not None:
-                        yield base_marker + newline
-                        for i in range(t[1], t[2]):
-                            yield self.base[i]
-                    if mid_marker is not None:
-                        yield mid_marker + newline
-                    for i in range(t[5], t[6]):
-                        yield self.b[i]
-                    if end_marker is not None:
-                        yield end_marker + newline
+                self.conflicts = True
+                if start_marker is not None:
+                    yield start_marker + newline
+                for i in range(t[3], t[4]):
+                    yield self.a[i]
+                if base_marker is not None:
+                    yield base_marker + newline
+                    for i in range(t[1], t[2]):
+                        yield self.base[i]
+                if mid_marker is not None:
+                    yield mid_marker + newline
+                for i in range(t[5], t[6]):
+                    yield self.b[i]
+                if end_marker is not None:
+                    yield end_marker + newline
             else:
                 raise ValueError(what)