This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12144

simplemerge: store input data in MergeInput
ClosedPublic

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

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG59c6724ddccb: simplemerge: store input data in MergeInput

Summary

I want to be able to update the file contents for support for partial
conflict resolution. Having the text available (and later settable) on
MergeInput will enable that.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

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: D12145: simplemerge: convert MergeInput to regular, non-attr.ib class.Feb 8 2022, 4:26 PM

Alphare accepted this revision.Feb 9 2022, 10:50 AM

This revision is now accepted and ready to land.Feb 9 2022, 10:50 AM

martinvonz removed a child revision: D12145: simplemerge: convert MergeInput to regular, non-attr.ib class.Feb 10 2022, 9:54 PM

martinvonz added a parent revision: D12145: simplemerge: convert MergeInput to regular, non-attr.ib class.Feb 10 2022, 9:55 PM

martinvonz retitled this revision from simplemerge: store file contents in MergeInput type to simplemerge: store input data in MergeInput.

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

martinvonz added a child revision: D12146: simplemerge: let extension check for binary inputs (unless `--text`).

martinvonz updated this revision to Diff 32134.

martinvonz added a commit: rHG59c6724ddccb: simplemerge: store input data in MergeInput.Feb 15 2022, 7:56 AM

Closed by commit rHG59c6724ddccb: simplemerge: store input data in MergeInput (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/simplemerge.py (32 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32093		Feb 8 2022, 4:26 PM	★	★
Diff 2	32134		Feb 10 2022, 9:55 PM	★	★
Diff 3	32188	rHG59c6724ddccb6cb1df2a6bc5c17d18fc76a7a2c3	Feb 10 2022, 2:00 PM	★	★

Commit	Parents	Author	Summary	Date
cf3514f628e3	5042516b048c	Martin von Zweigbergk		Feb 10 2022, 2:00 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 32134

mercurial/simplemerge.py

	class MergeInput(object):			class MergeInput(object):
	def __init__(self, fctx, label=None, label_detail=None):			def __init__(self, fctx, label=None, label_detail=None):
	self.fctx = fctx			self.fctx = fctx
	self.label = label			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			# separated by a ':'. The label is padded to make the ':' aligned among
	# all merge inputs.			# all merge inputs.
	self.label_detail = label_detail			self.label_detail = label_detail
				self._text = None

				def text(self):
				if self._text is None:
				# Merges were always run in the working copy before, which means
				# they used decoded data, if the user defined any repository
				# filters.
				#
				# Maintain that behavior today for BC, though perhaps in the future
				# it'd be worth considering whether merging encoded data (what the
				# repository usually sees) might be more useful.
				self._text = self.fctx.decodeddata()
				return self._text


	def simplemerge(			def simplemerge(
	ui,			ui,
	local,			local,
	base,			base,
	other,			other,
	mode=b'merge',			mode=b'merge',
	quiet=False,			quiet=False,
	allow_binary=False,			allow_binary=False,
	print_result=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`.
	"""			"""

	def readctx(ctx):			def readctx(input):
	# Merges were always run in the working copy before, which means
	# they used decoded data, if the user defined any repository
	# filters.
	#
	# Maintain that behavior today for BC, though perhaps in the future
	# it'd be worth considering whether merging encoded data (what the
	# repository usually sees) might be more useful.
	return _verifytext(			return _verifytext(
	ctx.decodeddata(),			input.text(),
	ctx.path(),			input.fctx.path(),
	ui,			ui,
	quiet=quiet,			quiet=quiet,
	allow_binary=allow_binary,			allow_binary=allow_binary,
	)			)

	try:			try:
	localtext = readctx(local.fctx)			localtext = readctx(local)
	basetext = readctx(base.fctx)			basetext = readctx(base)
	othertext = readctx(other.fctx)			othertext = readctx(other)
	except error.Abort:			except error.Abort:
	return True			return True

	m3 = Merge3Text(basetext, localtext, othertext)			m3 = Merge3Text(basetext, localtext, othertext)
	conflicts = False			conflicts = False
	if mode == b'union':			if mode == b'union':
	lines = _resolve(m3, (1, 2))			lines = _resolve(m3, (1, 2))
	elif mode == b'local':			elif mode == b'local':