This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10219

copies: detect files as `touched/salvaged` if they only existed on one side
ClosedPublic

Authored by marmoute on Mar 15 2021, 10:19 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGc52c3c4cbd3f: copies: detect files as `touched/salvaged` if they only existed on one side

Summary

The file cannot be merged if there was content to merge on the other side. So
the previous record was wrong.

In the general case, the file existed only on one side and got touched during the
merge. So it should detected as touched.

They are a special case where the merge manually prevent the file to be deleted.
In this case the file is marked as salvaged.

The result of this salvaged recording, copy-tracing-wise, is the same as
recording it as merged. This is probably why they were recorded as merged in
the first place.

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.Mar 15 2021, 10:19 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 15 2021, 10:19 AM

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

marmoute added a child revision: D10220: copies: distinguish between merged and touched files during upgrade.Mar 15 2021, 10:19 AM

pulkit accepted this revision.Mar 17 2021, 6:13 AM

This revision is now accepted and ready to land.Mar 17 2021, 6:13 AM

pulkit updated this revision to Diff 26519.Mar 19 2021, 4:37 PM

marmoute added a commit: rHGc52c3c4cbd3f: copies: detect files as `touched/salvaged` if they only existed on one side.Mar 22 2021, 2:30 PM

Closed by commit rHGc52c3c4cbd3f: copies: detect files as `touched/salvaged` if they only existed on one side (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/metadata.py (20 lines)
M			tests/test-copies-chain-merge.t (44 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26364		Mar 15 2021, 10:19 AM	★	★
Diff 2	26519		Mar 19 2021, 4:37 PM	★	★
Diff 3	26547	rHGc52c3c4cbd3f269b673971073939b95948e95202	Mar 15 2021, 8:37 AM	★	★

Status	Author	Revision
Closed	marmoute	D10220 copies: distinguish between merged and touched files during upgrade
Closed	marmoute	D10219 copies: detect files as `touched/salvaged` if they only existed on one side
Closed	marmoute	D10088 test-copies: add a test updating file content while salvaging it
Closed	marmoute	D10218 test-copies: show some wrong ChangedFiles upgrade
Closed	pulkit	D10149 commit: get info from mergestate whether a file was merged or not
Closed	marmoute	D10087 test-copies: add a test updating file content while merging a pure overwrite
Closed	pulkit	D10148 mergestate: don't pop stateextras when there are no conflicts on filemerge
Closed	pulkit	D10147 commit: reorder if-else conditional to give mergestate info priority

Diff 26547

mercurial/metadata.py

	│ │ │🄱 No Changes │🄳 No Changes │ │			│ │ │🄱 No Changes │🄳 No Changes │ │
	│ ø │🄰 No Changes │ OR │ OR │🄵 No Changes │			│ ø │🄰 No Changes │ OR │ OR │🄵 No Changes │
	│ │ │🄲 Deleted[1] │🄴 Salvaged[2]│ [3] │			│ │ │🄲 Deleted[1] │🄴 Salvaged[2]│ [3] │
	├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤			├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
	│ │🄶 No Changes │ │ │ │			│ │🄶 No Changes │ │ │ │
	│ (Some, None) │ OR │🄻 Deleted │ ø │ ø │			│ (Some, None) │ OR │🄻 Deleted │ ø │ ø │
	│ │🄷 Deleted[1] │ │ │ │			│ │🄷 Deleted[1] │ │ │ │
	├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤			├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
	│ │🄸 No Changes │ │ │ │			│ │🄸 No Changes │ │ │ 🄽 Touched │
	│ (None, Some) │ OR │ ø │🄼 Added │🄽 Merged │			│ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │
	│ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │			│ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │
	├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤			├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
	│ │ │ │ │ │			│ │ │ │ 🄾 Touched │ │
	│ (Some, Some) │🄺 No Changes │ ø │🄾 Merged │🄿 Merged │			│ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │🄿 Merged │
	│ │ [3] │ │ (copied?) │ (copied?) │			│ │ [3] │ │ (copied?) │ (copied?) │
	└──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘			└──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘

	Special case [1]:			Special case [1]:

	The situation is:			The situation is:
	- parent-A: file exists,			- parent-A: file exists,
	- parent-B: no file,			- parent-B: no file,
	if d1[0][0] is None and d2[0][0] is None:			if d1[0][0] is None and d2[0][0] is None:
	# case 🄼 — both deleted the file.			# case 🄼 — both deleted the file.
	md.mark_added(filename)			md.mark_added(filename)
	copy_candidates.append(filename)			copy_candidates.append(filename)
	elif d1[1][0] is None and d2[1][0] is None:			elif d1[1][0] is None and d2[1][0] is None:
	# case 🄻 — both deleted the file.			# case 🄻 — both deleted the file.
	md.mark_removed(filename)			md.mark_removed(filename)
	elif d1[1][0] is not None and d2[1][0] is not None:			elif d1[1][0] is not None and d2[1][0] is not None:
	# case 🄽 🄾 🄿			if d1[0][0] is None or d2[0][0] is None:
				if any(_find(ma, filename) is not None for ma in mas):
				# case 🅀 or 🅁
				md.mark_salvaged(filename)
				else:
				# case 🄽 🄾 : touched
				md.mark_touched(filename)
				else:
				# case 🄿 : merged
	md.mark_merged(filename)			md.mark_merged(filename)
	copy_candidates.append(filename)			copy_candidates.append(filename)
	else:			else:
	# Impossible case, the post-merge file status cannot be None on			# Impossible case, the post-merge file status cannot be None on
	# one side and Something on the other side.			# one side and Something on the other side.
	assert False, "unreachable"			assert False, "unreachable"

	# Iteration over remaining d2 content deal with the first column of the			# Iteration over remaining d2 content deal with the first column of the
	# table.			# table.

tests/test-copies-chain-merge.t

	touched : d, ; (no-upgraded no-upgraded-parallel !)			touched : d, ; (no-upgraded no-upgraded-parallel !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)			'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
	merged : d, ; (upgraded-parallel known-bad-output !)			merged : d, ; (upgraded-parallel known-bad-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)			'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
	merged : d, ; (upgraded known-bad-output !)			merged : d, ; (upgraded known-bad-output !)
	##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" #####			##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
	salvaged : d, ; (no-upgraded no-upgraded-parallel !)			salvaged : d, ;
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
	merged : d, ; (upgraded known-bad-output !)
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !)
	salvaged : d, ; (upgraded missing-correct-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
	merged : d, ; (upgraded-parallel known-bad-output !)
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
	salvaged : d, ; (upgraded-parallel missing-correct-output !)
	##### revision "mBC-change-m-0 merge explicitely revive deleted file - B side" #####			##### revision "mBC-change-m-0 merge explicitely revive deleted file - B side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
	salvaged : d, ; (no-upgraded no-upgraded-parallel !)			salvaged : d, ;
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
	merged : d, ; (upgraded known-bad-output !)
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !)
	salvaged : d, ; (upgraded missing-correct-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
	merged : d, ; (upgraded-parallel known-bad-output !)
	'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
	salvaged : d, ; (upgraded-parallel missing-correct-output !)
	##### revision "j-1" #####			##### revision "j-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'			'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
	added : unrelated-j, ;			added : unrelated-j, ;
	##### revision "k-1" #####			##### revision "k-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-k'			'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-k'
	added : unrelated-k, ;			added : unrelated-k, ;
	##### revision "mAE,Km" #####			##### revision "mAE,Km" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 4			entry-0014 size 4
	'\x00\x00\x00\x00'			'\x00\x00\x00\x00'
	##### revision "mK,AEm" #####			##### revision "mK,AEm" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 4			entry-0014 size 4
	'\x00\x00\x00\x00'			'\x00\x00\x00\x00'
	##### revision "mEA,Jm" #####			##### revision "mEA,Jm" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
	touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)			touched : unrelated-j, ;
	'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
	merged : unrelated-j, ; (upgraded known-bad-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
	merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
	##### revision "mJ,EAm" #####			##### revision "mJ,EAm" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
	touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)			touched : unrelated-j, ;
	'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
	merged : unrelated-j, ; (upgraded known-bad-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
	merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
	##### revision "s-1" #####			##### revision "s-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s'			'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s'
	added : unrelated-s, ;			added : unrelated-s, ;
	##### revision "t-1" #####			##### revision "t-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	o i-0 initial commit: a b h p q r			o i-0 initial commit: a b h p q r


	'a' is the the copy source of 'd'			'a' is the the copy source of 'd'

	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-change-m-0")'			$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-change-m-0")'
	M b			M b
	A d			A d
	a (no-compatibility no-changeset no-upgraded no-upgraded-parallel !)			a (no-compatibility no-changeset !)
	a (upgraded missing-correct-output !)
	a (upgraded-parallel missing-correct-output !)
	A t			A t
	p			p
	R a			R a
	R p			R p
	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-change-m-0")'			$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-change-m-0")'
	M b			M b
	A d			A d
	a (no-compatibility no-changeset !)			a (no-compatibility no-changeset !)