This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D11421 dirstate: introduce a `set_clean` method on dirstate's map and items
Closed	marmoute	D11420 dirstate: extract the logic to check file/dirname collision when adding a file
Closed	marmoute	D11419 dirstate: make dirstatemap.set_untracked deal with added file
Closed	marmoute	D11418 dirstate: remove some usage of `_drop`
Closed	marmoute	D11417 dirstate: move the copymap drop inside dropfile

Diff 30256

	This function is to be called outside of "update/merge" case. For			This function is to be called outside of "update/merge" case. For
	example by a command like `hg remove X`.			example by a command like `hg remove X`.

	return True the file was previously tracked, False otherwise.			return True the file was previously tracked, False otherwise.
	"""			"""
	entry = self._map.get(filename)			entry = self._map.get(filename)
	if entry is None:			if entry is None:
	return False			return False
	elif entry.added:
	self._drop(filename)
	return True
	else:			else:
	self._dirty = True			self._dirty = True
	self._updatedfiles.add(filename)			self._updatedfiles.add(filename)
				if entry.added:
				self._map.dropfile(filename)
				else:
	self._map.set_untracked(filename)			self._map.set_untracked(filename)
	return True			return True

	@requires_no_parents_change			@requires_no_parents_change
	def set_clean(self, filename, parentfiledata=None):			def set_clean(self, filename, parentfiledata=None):
	"""record that the current state of the file on disk is known to be clean"""			"""record that the current state of the file on disk is known to be clean"""
	self._dirty = True			self._dirty = True
	self._updatedfiles.add(filename)			self._updatedfiles.add(filename)
	if parentfiledata:			if parentfiledata: