This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9040 merge: use in-memory mergestate when using in-memory context
Closed	martinvonz	D9039 mergestate: extract a base class to be shared by future memmergestate
Closed	martinvonz	D9038 mergestate: extract overridable methods for making/restoring file backups
Closed	martinvonz	D9037 mergestate: initialize all properties in __init__()
Closed	martinvonz	D9036 mergestate: remove unnecessary clearing of `localctx` and `otherctx`
Closed	martinvonz	D9035 mergestate: move most of of reset() into start()
Closed	martinvonz	D9034 mergestate: make clean() only be about creating a clean mergestate
Closed	martinvonz	D9033 mergestate: split up reset() for its two use cases
Closed	martinvonz	D9032 mergestate: simplify reset(), knowing that `other` and `node` go together
Closed	martinvonz	D9031 mergestate: make some callers not pass pointless node argument

Diff 22682

	(updated, merged, removed, unresolved) that describes how many			(updated, merged, removed, unresolved) that describes how many
	files were affected by the update, and filedata is as described in			files were affected by the update, and filedata is as described in
	batchget.			batchget.
	"""			"""

	_prefetchfiles(repo, mctx, mresult)			_prefetchfiles(repo, mctx, mresult)

	updated, merged, removed = 0, 0, 0			updated, merged, removed = 0, 0, 0
	ms = mergestatemod.mergestate.clean(			ms = mergestatemod.mergestate.clean(repo)
	repo, wctx.p1().node(), mctx.node(), labels			ms.start(wctx.p1().node(), mctx.node(), labels)
	)

	for f, op in pycompat.iteritems(mresult.commitinfo):			for f, op in pycompat.iteritems(mresult.commitinfo):
	# the other side of filenode was choosen while merging, store this in			# the other side of filenode was choosen while merging, store this in
	# mergestate so that it can be reused on commit			# mergestate so that it can be reused on commit
	ms.addcommitinfo(f, op)			ms.addcommitinfo(f, op)

	moves = []			moves = []

	The resolve command transitions between 'u' and 'r' for conflicts and			The resolve command transitions between 'u' and 'r' for conflicts and
	'pu' and 'pr' for path conflicts.			'pu' and 'pr' for path conflicts.
	'''			'''

	statepathv1 = b'merge/state'			statepathv1 = b'merge/state'
	statepathv2 = b'merge/state2'			statepathv2 = b'merge/state2'

	@staticmethod			@staticmethod
	def clean(repo, node=None, other=None, labels=None):			def clean(repo):
	"""Initialize a brand new merge state, removing any existing state on			"""Initialize a brand new merge state, removing any existing state on
	disk."""			disk."""
	ms = mergestate(repo)			ms = mergestate(repo)
	ms.reset()			ms.reset()
	ms.start(node, other, labels)
	return ms			return ms

	@staticmethod			@staticmethod
	def read(repo):			def read(repo):
	"""Initialize the merge state, reading it from disk."""			"""Initialize the merge state, reading it from disk."""
	ms = mergestate(repo)			ms = mergestate(repo)
	ms._read()			ms._read()
	return ms			return ms