This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32094		Feb 8 2022, 4:26 PM	★	★
Diff 2	32133		Feb 10 2022, 9:55 PM	★	★
Diff 3	32187	rHGaed8ef33db8b6f97cc72bcb3d1c903549993115b	Feb 4 2022, 9:36 PM	★	★

Commit	Parents	Author	Summary	Date
5042516b048c	a0cf81061ce7	Martin von Zweigbergk		Feb 4 2022, 9:36 PM

Status	Author	Revision
Closed	martinvonz	D12171 filemerge: put temporary files in single temp dir by default
Closed	martinvonz	D12154 filemerge: move check for identical sides out of filemerge()
Closed	martinvonz	D12153 mergestate: use an early return for trivial merges
Closed	martinvonz	D12151 simplemerge: remove now-unused arguments
Closed	martinvonz	D12150 merge: fix documented order of `labels` argument
Closed	martinvonz	D12149 filemerge: when not keeping premerge, don't write markers to context
Closed	martinvonz	D12148 simplemerge: move printing of merge result to extension
Closed	martinvonz	D12169 simplemerge: remove code for checking binary input now that callers do it
Closed	martinvonz	D12147 simplemerge: let filemerge check for binary inputs
Closed	martinvonz	D12146 simplemerge: let extension check for binary inputs (unless `--text`)
Closed	martinvonz	D12144 simplemerge: store input data in MergeInput
Closed	martinvonz	D12145 simplemerge: convert MergeInput to regular, non-attr.ib class
Closed	martinvonz	D12152 simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments

Diff 32133

	# along with this program; if not, see <http://www.gnu.org/licenses/>.			# along with this program; if not, see <http://www.gnu.org/licenses/>.

	# mbp: "you know that thing where cvs gives you conflict markers?"			# mbp: "you know that thing where cvs gives you conflict markers?"
	# s: "i hate that."			# s: "i hate that."

	from __future__ import absolute_import			from __future__ import absolute_import

	from .i18n import _			from .i18n import _
	from .thirdparty import attr
	from . import (			from . import (
	error,			error,
	mdiff,			mdiff,
	pycompat,			pycompat,
	)			)
	from .utils import stringutil			from .utils import stringutil


	if what == b'conflict':			if what == b'conflict':
	for side in sides:			for side in sides:
	lines.extend(group_lines[side])			lines.extend(group_lines[side])
	else:			else:
	lines.extend(group_lines)			lines.extend(group_lines)
	return lines			return lines


	@attr.s
	class MergeInput(object):			class MergeInput(object):
	fctx = attr.ib()			def __init__(self, fctx, label=None, label_detail=None):
	label = attr.ib(default=None)			self.fctx = fctx
				self.label = label
	# If the "detail" part is set, then that is rendered after the label and			# If the "detail" part is set, then that is rendered after the label and
	# separated by a ':'. The label is padded to make the ':' aligned among all			# separated by a ':'. The label is padded to make the ':' aligned among
	# merge inputs.			# all merge inputs.
	label_detail = attr.ib(default=None)			self.label_detail = label_detail


	def simplemerge(			def simplemerge(
	ui,			ui,
	local,			local,
	base,			base,
	other,			other,
	mode=b'merge',			mode=b'merge',