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 30320

mercurial/dirstatemap.py

	size = size & rangemask			size = size & rangemask
	entry.set_clean(mode, size, mtime)			entry.set_clean(mode, size, mtime)
	self.copymap.pop(filename, None)			self.copymap.pop(filename, None)
	self.nonnormalset.discard(filename)			self.nonnormalset.discard(filename)

	def reset_state(			def reset_state(
	self,			self,
	filename,			filename,
	wc_tracked,			wc_tracked=False,
	p1_tracked,			p1_tracked=False,
	p2_tracked=False,			p2_tracked=False,
	merged=False,			merged=False,
	clean_p1=False,			clean_p1=False,
	clean_p2=False,			clean_p2=False,
	possibly_dirty=False,			possibly_dirty=False,
	parentfiledata=None,			parentfiledata=None,
	):			):
	"""Set a entry to a given state, diregarding all previous state			"""Set a entry to a given state, diregarding all previous state

	This is to be used by the part of the dirstate API dedicated to			This is to be used by the part of the dirstate API dedicated to
	adjusting the dirstate after a update/merge.			adjusting the dirstate after a update/merge.

	note: calling this might result to no entry existing at all if the			note: calling this might result to no entry existing at all if the
	dirstate map does not see any point at having one for this file			dirstate map does not see any point at having one for this file
	anymore.			anymore.
	"""			"""
	if merged and (clean_p1 or clean_p2):			if merged and (clean_p1 or clean_p2):
	msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'			msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
	raise error.ProgrammingError(msg)			raise error.ProgrammingError(msg)
	# copy information are now outdated			# copy information are now outdated
	# (maybe new information should be in directly passed to this function)			# (maybe new information should be in directly passed to this function)
	self.copymap.pop(filename, None)			self.copymap.pop(filename, None)

	if not (p1_tracked or p2_tracked or wc_tracked):			if not (p1_tracked or p2_tracked or wc_tracked):
	self.dropfile(filename)			old_entry = self._map.pop(filename, None)
				self._dirs_decr(filename, old_entry=old_entry)
				self.nonnormalset.discard(filename)
				self.copymap.pop(filename, None)
	return			return
	elif merged:			elif merged:
	# XXX might be merged and removed ?			# XXX might be merged and removed ?
	entry = self.get(filename)			entry = self.get(filename)
	if entry is None or not entry.tracked:			if entry is None or not entry.tracked:
	# XXX mostly replicate dirstate.other parent. We should get			# XXX mostly replicate dirstate.other parent. We should get
	# the higher layer to pass us more reliable data where `merged`			# the higher layer to pass us more reliable data where `merged`
	# actually mean merged. Dropping this clause will show failure			# actually mean merged. Dropping this clause will show failure
	)			)
	if added:			if added:
	self.copymap.pop(f, None)			self.copymap.pop(f, None)
	return ret			return ret

	def reset_state(			def reset_state(
	self,			self,
	filename,			filename,
	wc_tracked,			wc_tracked=False,
	p1_tracked,			p1_tracked=False,
	p2_tracked=False,			p2_tracked=False,
	merged=False,			merged=False,
	clean_p1=False,			clean_p1=False,
	clean_p2=False,			clean_p2=False,
	possibly_dirty=False,			possibly_dirty=False,
	parentfiledata=None,			parentfiledata=None,
	):			):
	"""Set a entry to a given state, disregarding all previous state			"""Set a entry to a given state, disregarding all previous state

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30276		Sep 16 2021, 10:45 AM	★	★
Diff 2	30320	rHG938a7769050ca6a22eec2faecf555dddb0432a0a	Sep 15 2021, 12:36 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: support file tracked nowhere in `reset_state`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30320

mercurial/dirstatemap.py

dirstate: support file tracked nowhere in `reset_state`
ClosedPublic

Revision Contents
Changeset List