This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D11515 dirstate: drop the from_p2_removed method
Closed	marmoute	D11514 dirstate: inline the `from_p2_removed` logic
Closed	marmoute	D11513 dirstate: drop the merged_removed method
Closed	marmoute	D11512 dirstate: inline the merged_removed logic
Closed	marmoute	D11511 dirstate: drop some safety assert in largefile
Closed	marmoute	D11510 dirstate: drop unused condition in `from_p2`
Closed	SimonSapin	D11517 dirstate: Remove the Rust abstraction DirstateMapMethods
Closed	SimonSapin	D11516 dirstate: Remove the flat Rust DirstateMap implementation
Closed	SimonSapin	D11507 dirstate: drop all logic around the "non-normal" sets
Closed	SimonSapin	D11506 dirstate: use a new `drop_merge_data` in `setparent`
Closed	SimonSapin	D11505 dirstate: move parent state handling in the dirstatemap
Closed	SimonSapin	D11504 dirstate: stop checking for path collision when adjusting parents
Closed	SimonSapin	D11503 dirstate: drop the `_updatedfiles` set
Closed	SimonSapin	D11502 dirstate: drop the `clearambiguoustimes` method for the map
Closed	SimonSapin	D11501 dirstate: simplify the ambiguity clearing at write time

Diff 30427

	p1_tracked=True,			p1_tracked=True,
	possibly_dirty=True,			possibly_dirty=True,
	)			)
	# Also fix up otherparent markers			# Also fix up otherparent markers
	elif s.from_p2:			elif s.from_p2:
	source = self._map.copymap.get(f)			source = self._map.copymap.get(f)
	if source:			if source:
	copies[f] = source			copies[f] = source
	self._check_new_tracked_filename(f)
	self._map.reset_state(			self._map.reset_state(
	f,			f,
	p1_tracked=False,			p1_tracked=False,
	wc_tracked=True,			wc_tracked=True,
	)			)
	return copies			return copies

	def setbranch(self, branch):			def setbranch(self, branch):