This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D8904 merge: drop commitinfo argument to applyupdates (API)
Closed	pulkit	D8903 merge: remove emptyactions() and use collections.defaultdict(list) instead
Closed	pulkit	D8889 merge: pass mergeresult obj in _forgetremoved() (API)
Closed	pulkit	D8888 mergeresult: introduce filemap() which yields filename based mapping
Closed	pulkit	D8887 mergeresult: add `files()` and use it
Closed	pulkit	D8886 mergeresult: introduce getfile() and use it where required
Closed	pulkit	D8885 merge: use ACTION_* constants instead of values in _filternarrowactions()
Closed	pulkit	D8884 merge: rework iteration over mergeresult object in checkpathconflicts()
Closed	pulkit	D8883 applyupdates: simplfy calculation of number of updated files
Closed	pulkit	D8882 mergeresult: yield from getactions() instead of buidling a list and returning
Closed	pulkit	D8881 sparse: replace merge action values with mergestate.ACTION_* constants
Closed	pulkit	D8880 mergeresult: implement a len() function and use it
Closed	pulkit	D8879 merge: replace use of actions dict with mergeresult object
Closed	pulkit	D8878 mergeresult: add sort argument to getactions() method
Closed	pulkit	D8877 merge: pass mergeresult obj in merge._prefetchfiles()
Closed	pulkit	D8876 merge: pass mergeresult obj instead of actions in applyupdates() (API)
Closed	pulkit	D8875 merge: pass mergeresult obj instead of actions in _checkcollision() (API)

Diff 22259


	def removefile(self, filename):			def removefile(self, filename):
	""" removes a file from the mergeresult object as the file might			""" removes a file from the mergeresult object as the file might
	not merging anymore """			not merging anymore """
	action, data, message = self._filemapping[filename]			action, data, message = self._filemapping[filename]
	del self._filemapping[filename]			del self._filemapping[filename]
	del self._actionmapping[action][filename]			del self._actionmapping[action][filename]

	def getactions(self, actions):			def getactions(self, actions, sort=False):
	""" get list of files which are marked with these actions			""" get list of files which are marked with these actions
				if sort is true, files for each action is sorted and then added

	Returns a list of tuple of form (filename, data, message)			Returns a list of tuple of form (filename, data, message)
	"""			"""
	res = []			res = []
	for a in actions:			for a in actions:
	for f, (args, msg) in pycompat.iteritems(self._actionmapping[a]):			if sort:
				for f in sorted(self._actionmapping[a]):
				args, msg = self._actionmapping[a][f]
				res.append((f, args, msg))
				else:
				for f, (args, msg) in pycompat.iteritems(
				self._actionmapping[a]
				):
	res.append((f, args, msg))			res.append((f, args, msg))
	return res			return res

	@property			@property
	def actions(self):			def actions(self):
	return self._filemapping			return self._filemapping

	@property			@property
	def diverge(self):			def diverge(self):