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

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11902

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

Authored by martinvonz on Dec 10 2021, 9:01 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbd27dad294b7: simplemerge: remove now-unused `localorother` argument from `merge_lines()`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (38 lines)

Diff 31558

mercurial/simplemerge.py

self, self,
name_a=None, name_a=None,
name_b=None, name_b=None,
name_base=None, name_base=None,
start_marker=b'<<<<<<<', start_marker=b'<<<<<<<',
mid_marker=b'=======', mid_marker=b'=======',
end_marker=b'>>>>>>>', end_marker=b'>>>>>>>',
base_marker=None, base_marker=None,
localorother=None,
minimize=False, minimize=False,
): ):
"""Return merge in cvs-like form.""" """Return merge in cvs-like form."""
self.conflicts = False self.conflicts = False
newline = b'\n' newline = b'\n'
if len(self.a) > 0: if len(self.a) > 0:
if self.a[0].endswith(b'\r\n'): if self.a[0].endswith(b'\r\n'):
newline = b'\r\n' newline = b'\r\n'
yield self.base[i] yield self.base[i]
elif what == b'a' or what == b'same': elif what == b'a' or what == b'same':
for i in range(t[1], t[2]): for i in range(t[1], t[2]):
yield self.a[i] yield self.a[i]
elif what == b'b': elif what == b'b':
for i in range(t[1], t[2]): for i in range(t[1], t[2]):
yield self.b[i] yield self.b[i]
elif what == b'conflict': 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 self.conflicts = True
if start_marker is not None: if start_marker is not None:
yield start_marker + newline yield start_marker + newline
for i in range(t[3], t[4]): for i in range(t[3], t[4]):
yield self.a[i] yield self.a[i]
if base_marker is not None: if base_marker is not None:
yield base_marker + newline yield base_marker + newline
for i in range(t[1], t[2]): for i in range(t[1], t[2]):
yield self.base[i] yield self.base[i]
if mid_marker is not None: if mid_marker is not None:
yield mid_marker + newline yield mid_marker + newline
for i in range(t[5], t[6]): for i in range(t[5], t[6]):
yield self.b[i] yield self.b[i]
if end_marker is not None: if end_marker is not None:
yield end_marker + newline yield end_marker + newline
else: else:
raise ValueError(what) raise ValueError(what)
def merge_groups(self): def merge_groups(self):
"""Yield sequence of line groups. Each one is a tuple: """Yield sequence of line groups. Each one is a tuple:
'unchanged', lines 'unchanged', lines
Lines unchanged from base Lines unchanged from base