This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D11443 dirstate: drop the `dirstatemap.dropfile` method
Closed	marmoute	D11442 dirstate: use `reset_state` instead of `dropfile` in test-rebuildstate.t
Closed	marmoute	D11441 dirstate: use `reset_state` instead of `dropfile` in largefile
Closed	marmoute	D11440 dirstate: use `reset_state` in `rebuild` instead of `dropfile`
Closed	marmoute	D11439 dirstate: use `reset_state` to drop file in `update_file_p1`
Closed	marmoute	D11438 dirstate: support file tracked nowhere in `reset_state`
Closed	marmoute	D11437 dirstate: drop dirstatemap.addfile
Closed	marmoute	D11436 dirstate: update the documentation of the dirstatemap API
Closed	marmoute	D11435 dirstate: drop the `_addpath` method
Closed	marmoute	D11434 dirstate: remove the `normallookup` function
Closed	marmoute	D11433 dirstatE: stop using `_normallookup` in the adddrop extension
Closed	marmoute	D11432 dirstate: replace the use of `_normallookup` in `rebuild`
Closed	marmoute	D11431 dirstate: replace the use of _normallookup in `setparents`
Closed	marmoute	D11430 dirstate: introduce a set_tracked method on "map" and "item"
Closed	marmoute	D11429 dirstate: fix restoration of "merged" state after a remove
Closed	marmoute	D11428 dirstate: inline the last two `_drop` usage
Closed	marmoute	D11427 dirstate: make a conditionnal easier to read in `setparents`
Closed	marmoute	D11426 dirstate: removed the now unused `_add` method
Closed	marmoute	D11425 dirstate: replace `_add` call in `setparent`
Closed	marmoute	D11424 dirstate: directly call the right function in `set_tracked`
Closed	marmoute	D11423 dirstate: same logic as what we did for `_drop`
Closed	marmoute	D11422 dirstate: use `tracked` property in `_addpath`

Diff 30325

mercurial/dirstatemap.py

	self._map.pop(f, None)			self._map.pop(f, None)
	else:			else:
	self.nonnormalset.add(f)			self.nonnormalset.add(f)
	if entry.from_p2:			if entry.from_p2:
	self.otherparentset.add(f)			self.otherparentset.add(f)
	entry.set_untracked()			entry.set_untracked()
	return True			return True

	def dropfile(self, f):
	"""
	Remove a file from the dirstate. Returns True if the file was
	previously recorded.
	"""
	old_entry = self._map.pop(f, None)
	self._dirs_decr(f, old_entry=old_entry)
	self.nonnormalset.discard(f)
	self.copymap.pop(f, 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)

	def nonnormalentries(self):			def nonnormalentries(self):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30281		Sep 16 2021, 10:46 AM	★	★
Diff 2	30325	rHG5e7eea91501944bb060c6bdba1bc548071262a0d	Sep 15 2021, 12:41 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: drop the `dirstatemap.dropfile` methodClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30325

mercurial/dirstatemap.py

dirstate: drop the `dirstatemap.dropfile` method
ClosedPublic

Revision Contents
Changeset List