This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12148

simplemerge: move printing of merge result to extension
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG6ae3c97a0919: simplemerge: move printing of merge result to extension

Summary

The mercurial.simplemerge module still has some command-lines
processing that doesn't belong in such a low-level module. This patch
moves the handling of hg simplemerge --print to the extension by
having mercurial.simplemerge.simplemerge() return the merged text.

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.

Event Timeline

martinvonz created this revision.Feb 8 2022, 4:26 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 8 2022, 4:26 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D12149: filemerge: when not keeping premerge, don't write markers to context.Feb 8 2022, 4:26 PM

martinvonz removed a parent revision: D12147: simplemerge: let filemerge check for binary inputs.Feb 10 2022, 9:54 PM

martinvonz removed a child revision: D12149: filemerge: when not keeping premerge, don't write markers to context.

martinvonz added a parent revision: D12169: simplemerge: remove code for checking binary input now that callers do it.Feb 10 2022, 9:55 PM

martinvonz edited the summary of this revision. (Show Details)

martinvonz added a child revision: D12149: filemerge: when not keeping premerge, don't write markers to context.

martinvonz updated this revision to Diff 32138.

Alphare added a subscriber: Alphare.Feb 14 2022, 5:47 AM

Alphare added inline comments.

contrib/simplemerge
133	Shouldn't this be using `util.writefile`?

martinvonz updated this revision to Diff 32165.Feb 14 2022, 11:28 AM

martinvonz marked an inline comment as done.Feb 14 2022, 11:28 AM

Alphare accepted this revision.Feb 15 2022, 7:52 AM

This revision is now accepted and ready to land.Feb 15 2022, 7:52 AM

martinvonz added a commit: rHG6ae3c97a0919: simplemerge: move printing of merge result to extension.Feb 15 2022, 7:56 AM

Closed by commit rHG6ae3c97a0919: simplemerge: move printing of merge result to extension (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/simplemerge (26 lines)
M			mercurial/filemerge.py (19 lines)
M			mercurial/simplemerge.py (9 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32097		Feb 8 2022, 4:26 PM	★	★
Diff 2	32138		Feb 10 2022, 9:55 PM	★	★
Diff 3	32165		Feb 14 2022, 11:28 AM	★	★
Diff 4	32191	rHG6ae3c97a09196bae94e9a6a7085ffb760a560eba	Jan 14 2022, 11:17 AM	★	★

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 32191

contrib/simplemerge


	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
	context,			context,
	error,			error,
	fancyopts,			fancyopts,
	simplemerge,			simplemerge,
	ui as uimod,			ui as uimod,
				util,
	)			)
	from mercurial.utils import procutil, stringutil			from mercurial.utils import procutil, stringutil

	options = [			options = [
	(b'L', b'label', [], _(b'labels to use on conflict markers')),			(b'L', b'label', [], _(b'labels to use on conflict markers')),
	(b'a', b'text', None, _(b'treat all files as text')),			(b'a', b'text', None, _(b'treat all files as text')),
	(b'p', b'print', None, _(b'print results instead of overwriting LOCAL')),			(b'p', b'print', None, _(b'print results instead of overwriting LOCAL')),
	(b'', b'no-minimal', None, _(b'no effect (DEPRECATED)')),			(b'', b'no-minimal', None, _(b'no effect (DEPRECATED)')),

	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)

	sys.exit(			merged_text, conflicts = simplemerge.simplemerge(
	simplemerge.simplemerge(
	ui,			ui,
	local_input,			local_input,
	base_input,			base_input,
	other_input,			other_input,
	mode,			mode,
	quiet=True,			quiet=True,
	allow_binary=allow_binary,			allow_binary=allow_binary,
	print_result=opts.get(b'print'),			print_result=opts.get(b'print'),
	)			)
	)			if opts.get(b'print'):
				ui.fout.write(merged_text)
				else:
				util.writefile(local, merged_text)
				AlphareUnsubmitted Done Shouldn't this be using `util.writefile`? Alphare: Shouldn't this be using `util.writefile`?
				sys.exit(1 if conflicts else 0)
	except ParseError as e:			except ParseError as e:
	e = stringutil.forcebytestr(e)			e = stringutil.forcebytestr(e)
	procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e))			procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e))
	showhelp()			showhelp()
	sys.exit(1)			sys.exit(1)
	except error.Abort as e:			except error.Abort as e:
	procutil.stderr.write(b"abort: %s\n" % e)			procutil.stderr.write(b"abort: %s\n" % e)
	sys.exit(255)			sys.exit(255)
	except KeyboardInterrupt:			except KeyboardInterrupt:
	sys.exit(255)			sys.exit(255)

mercurial/filemerge.py

	if premerge == b'keep-mergediff':			if premerge == b'keep-mergediff':
	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
	r = simplemerge.simplemerge(			merged_text, conflicts = simplemerge.simplemerge(
	ui, local, base, other, quiet=True, mode=mode			ui, local, base, other, mode=mode
	)			)
	if not r:			# fcd.flags() already has the merged flags (done in
				# mergestate.resolve())
				local.fctx.write(merged_text, local.fctx.flags())
				if not conflicts:
	ui.debug(b" premerge successful\n")			ui.debug(b" premerge successful\n")
	return 0			return 0
	if premerge not in validkeep:			if premerge not in validkeep:
	# restore from backup and try again			# restore from backup and try again
	_restorebackup(local.fctx, backup)			_restorebackup(local.fctx, backup)
	return 1 # continue merging			return 1 # continue merging


	ui = repo.ui			ui = repo.ui

	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
	r = simplemerge.simplemerge(ui, local, base, other, mode=mode)			else:
	return True, r, False			merged_text, conflicts = simplemerge.simplemerge(
				ui, local, base, other, mode=mode
				)
				# fcd.flags() already has the merged flags (done in
				# mergestate.resolve())
				local.fctx.write(merged_text, local.fctx.flags())
				return True, conflicts, False


	@internaltool(			@internaltool(
	b'union',			b'union',
	fullmerge,			fullmerge,
	_(			_(
	b"warning: conflicts while merging %s! "			b"warning: conflicts while merging %s! "
	b"(edit, then use 'hg resolve --mark')\n"			b"(edit, then use 'hg resolve --mark')\n"

mercurial/simplemerge.py

	elif mode == b'merge3':			elif mode == b'merge3':
	labels = _format_labels(local, other, base)			labels = _format_labels(local, other, base)
	lines, conflicts = render_merge3(m3, *labels)			lines, conflicts = render_merge3(m3, *labels)
	else:			else:
	labels = _format_labels(local, other)			labels = _format_labels(local, other)
	lines, conflicts = render_minimized(m3, *labels)			lines, conflicts = render_minimized(m3, *labels)

	mergedtext = b''.join(lines)			mergedtext = b''.join(lines)
	if print_result:			return mergedtext, conflicts
	ui.fout.write(mergedtext)
	else:
	# local.fctx.flags() already has the merged flags (done in
	# mergestate.resolve())
	local.fctx.write(mergedtext, local.fctx.flags())

	return conflicts