This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D8741 merge: document return values of manifestmerge() and calculateupdates()
Closed	pulkit	D8740 merge: refactor code to advise fsmonitor in separate function
Closed	pulkit	D8739 mergestate: document what mergestate._results is for
Closed	pulkit	D8738 mergestate: rename a helpless variable name to bit helpful one
Closed	pulkit	D8737 mergestate: remove unnecessary recordactions() from mergestate class
Closed	pulkit	D8719 mergestate: document mergestate records in an organized way
Closed	pulkit	D8718 mergestate: remove unused unsupported related mergestate records
Closed	pulkit	D8717 mergestate: add comments about couple of record types and minor reorder
Closed	pulkit	D8716 mergestate: remove unrequired RECORD_RESOLVED_OTHER record
Closed	pulkit	D8715 mergestate: rename addpath() -> addpathonflict() to prevent confusion

Diff 21974

	i += 2			i += 2

	self._stateextras[filename] = extras			self._stateextras[filename] = extras
	elif rtype == RECORD_LABELS:			elif rtype == RECORD_LABELS:
	labels = record.split(b'\0', 2)			labels = record.split(b'\0', 2)
	self._labels = [l for l in labels if len(l) > 0]			self._labels = [l for l in labels if len(l) > 0]
	elif not rtype.islower():			elif not rtype.islower():
	unsupported.add(rtype)			unsupported.add(rtype)
				# contains a mapping of form:
				# {filename : (merge_return_value, action_to_be_performed}
				# these are results of re-running merge process
				# this dict is used to perform actions on dirstate caused by re-running
				# the merge
	self._results = {}			self._results = {}
	self._dirty = False			self._dirty = False

	if unsupported:			if unsupported:
	raise error.UnsupportedMergeRecords(unsupported)			raise error.UnsupportedMergeRecords(unsupported)

	def _readrecords(self):			def _readrecords(self):
	"""Read merge state from disk and return a list of record (TYPE, data)			"""Read merge state from disk and return a list of record (TYPE, data)