This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11429

dirstate: fix restoration of "merged" state after a remove
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:43 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG87b3010c08e0: dirstate: fix restoration of "merged" state after a remove

Summary

Before this change, "merged" file that get removed and re-added later were
recorded as "from_p2" instead.

This came from 8fe74328f700, a 2014 changeset that start explicitly doing so
for reason I have not been able to fully grasp. The graft test mentioned in
the description are still happy after this changeset.

So this changeset restore what seems to be the intended behavior. Restoring
information as it was before the removal.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 16 2021, 10:43 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 16 2021, 10:43 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D11430: dirstate: introduce a set_tracked method on "map" and "item".Sep 16 2021, 10:43 AM

Alphare accepted this revision.Sep 20 2021, 6:09 AM

This revision is now accepted and ready to land.Sep 20 2021, 6:09 AM

marmoute added a commit: rHG87b3010c08e0: dirstate: fix restoration of "merged" state after a remove.Sep 20 2021, 10:07 AM

Closed by commit rHG87b3010c08e0: dirstate: fix restoration of "merged" state after a remove (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstate.py (5 lines)
M			tests/test-merge-remove.t (8 lines)

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 30311

mercurial/dirstate.py

	# "merged" or coming from other parent (-2) before			# "merged" or coming from other parent (-2) before
	# being removed, restore that state.			# being removed, restore that state.
	entry = self._map.get(f)			entry = self._map.get(f)
	if entry is not None:			if entry is not None:
	# XXX this should probably be dealt with a a lower level			# XXX this should probably be dealt with a a lower level
	# (see `merged_removed` and `from_p2_removed`)			# (see `merged_removed` and `from_p2_removed`)
	if entry.merged_removed or entry.from_p2_removed:			if entry.merged_removed or entry.from_p2_removed:
	source = self._map.copymap.get(f)			source = self._map.copymap.get(f)
				if entry.merged_removed:
				self._addpath(f, merged=True)
				else:
	self._addpath(f, from_p2=True)			self._addpath(f, from_p2=True)
	self._map.copymap.pop(f, None)			self._map.copymap.pop(f, None)
	if source is not None:			if source is not None:
	self.copy(source, f)			self.copy(source, f)
	return			return
	elif entry.merged or entry.from_p2:			elif entry.merged or entry.from_p2:
	return			return
	self._addpath(f, possibly_dirty=True)			self._addpath(f, possibly_dirty=True)
	self._map.copymap.pop(f, None)			self._map.copymap.pop(f, None)

tests/test-merge-remove.t


	$ cp F foo1			$ cp F foo1
	$ cp B bar			$ cp B bar
	$ hg add -v foo1 bar			$ hg add -v foo1 bar
	adding bar			adding bar
	adding foo1			adding foo1

	$ hg debugstate --no-dates			$ hg debugstate --no-dates
	n 0 -2 unset bar			m 0 -2 unset bar
	n 0 -2 unset foo1			m 0 -2 unset foo1
	copy: foo -> foo1			copy: foo -> foo1

	$ hg st -qC			$ hg st -qC
	M bar			M bar
	M foo1			M foo1
	foo			foo


	Reverting foo1 and bar:			Reverting foo1 and bar:

	$ hg revert -vr . foo1 bar			$ hg revert -vr . foo1 bar
	saving current version of bar as bar.orig			saving current version of bar as bar.orig
	saving current version of foo1 as foo1.orig			saving current version of foo1 as foo1.orig
	reverting bar			reverting bar
	reverting foo1			reverting foo1

	$ hg debugstate --no-dates			$ hg debugstate --no-dates
	n 0 -2 unset bar			m 0 -2 unset bar
	n 0 -2 unset foo1			m 0 -2 unset foo1
	copy: foo -> foo1			copy: foo -> foo1

	$ hg st -qC			$ hg st -qC
	M bar			M bar
	M foo1			M foo1
	foo			foo

	$ hg diff			$ hg diff

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30267		Sep 16 2021, 10:43 AM	★	★
Diff 2	30311	rHG87b3010c08e04f0f9da3d460549cbaca5c1ee578	Sep 15 2021, 5:13 AM	★	★