simplemerge: remove now-unused arguments
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32100		Feb 8 2022, 4:26 PM	★	★
Diff 2	32105		Feb 8 2022, 5:10 PM	★	★
Diff 3	32140		Feb 10 2022, 9:55 PM	★	★
Diff 4	32166		Feb 14 2022, 11:28 AM	★	★
Diff 5	32195	rHG7dad4665d2239ee081afb1c8462ebf50db21a3f5	Feb 7 2022, 5:07 PM	★	★

Commit	Parents	Author	Summary	Date
fa32d2405203	1af4c2c13705	Martin von Zweigbergk		Feb 7 2022, 5:07 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 32140

contrib/simplemerge

	quiet = opts.get(b'quiet')			quiet = opts.get(b'quiet')
	allow_binary = opts.get(b'text')			allow_binary = opts.get(b'text')
	ui = uimod.ui.load()			ui = uimod.ui.load()
	_verifytext(local_input, ui, quiet=quiet, allow_binary=allow_binary)			_verifytext(local_input, ui, quiet=quiet, allow_binary=allow_binary)
	_verifytext(base_input, ui, quiet=quiet, allow_binary=allow_binary)			_verifytext(base_input, ui, quiet=quiet, allow_binary=allow_binary)
	_verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)			_verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)

	merged_text, conflicts = simplemerge.simplemerge(			merged_text, conflicts = simplemerge.simplemerge(
	ui,
	local_input,			local_input,
	base_input,			base_input,
	other_input,			other_input,
	mode,			mode,
	quiet=True,
	allow_binary=allow_binary,			allow_binary=allow_binary,
	print_result=opts.get(b'print'),
	)			)
	if opts.get(b'print'):			if opts.get(b'print'):
	ui.fout.write(merged_text)			ui.fout.write(merged_text)
	else:			else:
	with open(local, 'wb') as f:			with open(local, 'wb') as f:
	f.write(merged_text)			f.write(merged_text)
	sys.exit(1 if conflicts else 0)			sys.exit(1 if conflicts else 0)
	except ParseError as e:			except ParseError as e:

mercurial/filemerge.py

	mode = b'mergediff'			mode = b'mergediff'
	elif premerge == b'keep-merge3':			elif premerge == b'keep-merge3':
	mode = b'merge3'			mode = b'merge3'
	if any(			if any(
	stringutil.binary(input.text()) for input in (local, base, other)			stringutil.binary(input.text()) for input in (local, base, other)
	):			):
	return 1 # continue merging			return 1 # continue merging
	merged_text, conflicts = simplemerge.simplemerge(			merged_text, conflicts = simplemerge.simplemerge(
	ui, local, base, other, mode=mode			local, base, other, mode=mode
	)			)
	if not conflicts or premerge in validkeep:			if not conflicts or premerge in validkeep:
	# fcd.flags() already has the merged flags (done in			# fcd.flags() already has the merged flags (done in
	# mergestate.resolve())			# mergestate.resolve())
	local.fctx.write(merged_text, local.fctx.flags())			local.fctx.write(merged_text, local.fctx.flags())
	if not conflicts:			if not conflicts:
	ui.debug(b" premerge successful\n")			ui.debug(b" premerge successful\n")
	return 0			return 0
	try:			try:
	_verifytext(local, ui)			_verifytext(local, ui)
	_verifytext(base, ui)			_verifytext(base, ui)
	_verifytext(other, ui)			_verifytext(other, ui)
	except error.Abort:			except error.Abort:
	return True, True, False			return True, True, False
	else:			else:
	merged_text, conflicts = simplemerge.simplemerge(			merged_text, conflicts = simplemerge.simplemerge(
	ui, local, base, other, mode=mode			local, base, other, mode=mode
	)			)
	# fcd.flags() already has the merged flags (done in			# fcd.flags() already has the merged flags (done in
	# mergestate.resolve())			# mergestate.resolve())
	local.fctx.write(merged_text, local.fctx.flags())			local.fctx.write(merged_text, local.fctx.flags())
	return True, conflicts, False			return True, conflicts, False


	@internaltool(			@internaltool(

mercurial/simplemerge.py

	# Maintain that behavior today for BC, though perhaps in the future			# Maintain that behavior today for BC, though perhaps in the future
	# it'd be worth considering whether merging encoded data (what the			# it'd be worth considering whether merging encoded data (what the
	# repository usually sees) might be more useful.			# repository usually sees) might be more useful.
	self._text = self.fctx.decodeddata()			self._text = self.fctx.decodeddata()
	return self._text			return self._text


	def simplemerge(			def simplemerge(
	ui,
	local,			local,
	base,			base,
	other,			other,
	mode=b'merge',			mode=b'merge',
	quiet=False,
	allow_binary=False,			allow_binary=False,
	print_result=False,
	):			):
	"""Performs the simplemerge algorithm.			"""Performs the simplemerge algorithm.

	The merged result is written into `localctx`.			The merged result is written into `localctx`.
	"""			"""

	if not allow_binary:			if not allow_binary:
	_verifytext(local)			_verifytext(local)

This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: remove now-unused argumentsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 32140

contrib/simplemerge

mercurial/filemerge.py

mercurial/simplemerge.py

simplemerge: remove now-unused arguments
ClosedPublic

Revision Contents
Changeset List