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 30269

mercurial/dirstate.py

	if s is None:			if s is None:
	continue			continue

	# Discard "merged" markers when moving away from a merge state			# Discard "merged" markers when moving away from a merge state
	if s.merged:			if s.merged:
	source = self._map.copymap.get(f)			source = self._map.copymap.get(f)
	if source:			if source:
	copies[f] = source			copies[f] = source
	self._normallookup(f)			self._map.reset_state(
				f,
				wc_tracked=True,
				p1_tracked=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._check_new_tracked_filename(f)
	self._updatedfiles.add(f)			self._updatedfiles.add(f)
	self._map.reset_state(			self._map.reset_state(

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30269		Sep 16 2021, 10:43 AM	★	★
Diff 2	30313	rHG625b84c1abddaaca8e76c6ab057f6fdddc6aaadd	Sep 15 2021, 12:16 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: replace the use of _normallookup in `setparents`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30269

mercurial/dirstate.py

dirstate: replace the use of _normallookup in `setparents`
ClosedPublic

Revision Contents
Changeset List