This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	863		Aug 14 2017, 2:16 AM	★	★
Diff 2	1042		Aug 17 2017, 2:40 PM	★	★
Diff 3	1288	rHG1ad3085239ad7458c05575565927107dfd58e408	Aug 25 2017, 12:30 AM	★	★

Status	Author	Revision
Closed	phillco	D383 simplemerge: simplify code now that we always write to a context
Closed	phillco	D382 simplemerge: make context parameters non-optional
Closed	phillco	D381 simplemerge: stop accepting, and passing, file parameters
Closed	phillco	D380 simplemerge: stop reading from, and writing to, files
Closed	phillco	D379 simplemerge: use context paths for default labels instead of file paths
Closed	phillco	D378 contrib: make simplemerge script pass context-like objects
Closed	phillco	D435 simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`
Closed	phillco	D434 context: add `decodeddata()` to basefilectx
Closed	phillco	D376 filemerge: extract `_picklabels` as a helper function
Closed	phillco	D375 simplemerge: write merge result to the localctx, if passed
Closed	phillco	D374 simplemerge: use contexts to read file data from, if passed
Closed	phillco	D373 filemerge: pass contexts to simplemerge
Closed	phillco	D372 simplemerge: add optional context parameters to simplemerge
Closed	phillco	D371 simplemerge: extract verifytext as a helper function

Diff 1288

mercurial/simplemerge.py

	name_b = overrides[1]			name_b = overrides[1]
	if len(overrides) > 2:			if len(overrides) > 2:
	name_base = overrides[2]			name_base = overrides[2]
	if len(overrides) > 3:			if len(overrides) > 3:
	raise error.Abort(_("can only specify three labels."))			raise error.Abort(_("can only specify three labels."))

	return [name_a, name_b, name_base]			return [name_a, name_b, name_base]

	def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None,			def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
	**opts):
	"""Performs the simplemerge algorithm.			"""Performs the simplemerge algorithm.

	{local\|base\|other}ctx are optional. If passed, they (local/base/other) will			The merged result is written into `localctx`.
	be read from and the merge result written to (local). You should pass
	explicit labels in this mode since the default is to use the file paths.
	"""			"""
	def readctx(ctx):			def readctx(ctx):
	if not ctx:			if not ctx:
				martinvonzUnsubmitted Not Done Can this still be true? I.e., is it valid to pass None instead of one of the contexts? martinvonz: Can this still be true? I.e., is it valid to pass None instead of one of the contexts?
				phillcoAuthorUnsubmitted Not Done Sent as D520. phillco: Sent as D520.
	return None			return None
	# Merges were always run in the working copy before, which means			# Merges were always run in the working copy before, which means
	# they used decoded data, if the user defined any repository			# they used decoded data, if the user defined any repository
	# filters.			# filters.
	#			#
	# 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.

This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: make context parameters non-optionalClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 1288

mercurial/simplemerge.py

simplemerge: make context parameters non-optional
ClosedPublic

Revision Contents
Changeset List