Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/simplemerge.py @ 48552:bd27dad294b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove now-unused `localorother` argument from `merge_lines()` Differential Revision: https://phab.mercurial-scm.org/D11902
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 22:45:31 -0800
parents fb691fa90807
children 59524cb1cd73
comparison
equal deleted inserted replaced
48551:fb691fa90807 48552:bd27dad294b7
94 name_base=None, 94 name_base=None,
95 start_marker=b'<<<<<<<', 95 start_marker=b'<<<<<<<',
96 mid_marker=b'=======', 96 mid_marker=b'=======',
97 end_marker=b'>>>>>>>', 97 end_marker=b'>>>>>>>',
98 base_marker=None, 98 base_marker=None,
99 localorother=None,
100 minimize=False, 99 minimize=False,
101 ): 100 ):
102 """Return merge in cvs-like form.""" 101 """Return merge in cvs-like form."""
103 self.conflicts = False 102 self.conflicts = False
104 newline = b'\n' 103 newline = b'\n'
126 yield self.a[i] 125 yield self.a[i]
127 elif what == b'b': 126 elif what == b'b':
128 for i in range(t[1], t[2]): 127 for i in range(t[1], t[2]):
129 yield self.b[i] 128 yield self.b[i]
130 elif what == b'conflict': 129 elif what == b'conflict':
131 if localorother == b'local': 130 self.conflicts = True
132 for i in range(t[3], t[4]): 131 if start_marker is not None:
133 yield self.a[i] 132 yield start_marker + newline
134 elif localorother == b'other': 133 for i in range(t[3], t[4]):
135 for i in range(t[5], t[6]): 134 yield self.a[i]
136 yield self.b[i] 135 if base_marker is not None:
137 else: 136 yield base_marker + newline
138 self.conflicts = True 137 for i in range(t[1], t[2]):
139 if start_marker is not None: 138 yield self.base[i]
140 yield start_marker + newline 139 if mid_marker is not None:
141 for i in range(t[3], t[4]): 140 yield mid_marker + newline
142 yield self.a[i] 141 for i in range(t[5], t[6]):
143 if base_marker is not None: 142 yield self.b[i]
144 yield base_marker + newline 143 if end_marker is not None:
145 for i in range(t[1], t[2]): 144 yield end_marker + newline
146 yield self.base[i]
147 if mid_marker is not None:
148 yield mid_marker + newline
149 for i in range(t[5], t[6]):
150 yield self.b[i]
151 if end_marker is not None:
152 yield end_marker + newline
153 else: 145 else:
154 raise ValueError(what) 146 raise ValueError(what)
155 147
156 def merge_groups(self): 148 def merge_groups(self):
157 """Yield sequence of line groups. Each one is a tuple: 149 """Yield sequence of line groups. Each one is a tuple: