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 30255

mercurial/dirstate.py

	self._addpath(filename, added=True)			self._addpath(filename, added=True)
	self._map.copymap.pop(filename, None)			self._map.copymap.pop(filename, None)

	def _drop(self, filename):			def _drop(self, filename):
	"""internal function to drop a file from the dirstate"""			"""internal function to drop a file from the dirstate"""
	if self._map.dropfile(filename):			if self._map.dropfile(filename):
	self._dirty = True			self._dirty = True
	self._updatedfiles.add(filename)			self._updatedfiles.add(filename)
	self._map.copymap.pop(filename, None)

	def _discoverpath(self, path, normed, ignoremissing, exists, storemap):			def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
	if exists is None:			if exists is None:
	exists = os.path.lexists(os.path.join(self._root, path))			exists = os.path.lexists(os.path.join(self._root, path))
	if not exists:			if not exists:
	# Maybe a path component exists			# Maybe a path component exists
	if not ignoremissing and b'/' in path:			if not ignoremissing and b'/' in path:
	d, f = path.rsplit(b'/', 1)			d, f = path.rsplit(b'/', 1)

mercurial/dirstatemap.py

	def dropfile(self, f):			def dropfile(self, f):
	"""			"""
	Remove a file from the dirstate. Returns True if the file was			Remove a file from the dirstate. Returns True if the file was
	previously recorded.			previously recorded.
	"""			"""
	old_entry = self._map.pop(f, None)			old_entry = self._map.pop(f, None)
	self._dirs_decr(f, old_entry=old_entry)			self._dirs_decr(f, old_entry=old_entry)
	self.nonnormalset.discard(f)			self.nonnormalset.discard(f)
				self.copymap.pop(f, None)
	return old_entry is not None			return old_entry is not None

	def clearambiguoustimes(self, files, now):			def clearambiguoustimes(self, files, now):
	for f in files:			for f in files:
	e = self.get(f)			e = self.get(f)
	if e is not None and e.need_delay(now):			if e is not None and e.need_delay(now):
	e.set_possibly_dirty()			e.set_possibly_dirty()
	self.nonnormalset.add(f)			self.nonnormalset.add(f)
	#			#
	# the inner rust dirstate map code need to be adjusted once the API			# the inner rust dirstate map code need to be adjusted once the API
	# for dirstate/dirstatemap/DirstateItem is a bit more settled			# for dirstate/dirstatemap/DirstateItem is a bit more settled
	self._rustmap.removefile(f, in_merge=True)			self._rustmap.removefile(f, in_merge=True)

	def removefile(self, args, *kwargs):			def removefile(self, args, *kwargs):
	return self._rustmap.removefile(args, *kwargs)			return self._rustmap.removefile(args, *kwargs)

	def dropfile(self, args, *kwargs):			def dropfile(self, f, args, *kwargs):
	return self._rustmap.dropfile(args, *kwargs)			self._rustmap.copymap().pop(f, None)
				return self._rustmap.dropfile(f, args, *kwargs)

	def clearambiguoustimes(self, args, *kwargs):			def clearambiguoustimes(self, args, *kwargs):
	return self._rustmap.clearambiguoustimes(args, *kwargs)			return self._rustmap.clearambiguoustimes(args, *kwargs)

	def nonnormalentries(self):			def nonnormalentries(self):
	return self._rustmap.nonnormalentries()			return self._rustmap.nonnormalentries()

	def get(self, args, *kwargs):			def get(self, args, *kwargs):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30247		Sep 14 2021, 5:20 PM	★	★
Diff 2	30255	rHG7ab99007fce5011ad463a77dea72fc4db555fd5c	Sep 1 2021, 8:44 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: move the copymap drop inside dropfileClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30255

mercurial/dirstate.py

mercurial/dirstatemap.py

dirstate: move the copymap drop inside dropfile
ClosedPublic

Revision Contents
Changeset List