This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10220

copies: distinguish between merged and touched files during upgrade
ClosedPublic

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

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG433cef8f3104: copies: distinguish between merged and touched files during upgrade

Summary

This a filenode being different between p1, p2 and result does not necessarily
means a merges happens. For example p2 could be a strict newer version of p1, so
the p2 version is picked by the manifest merging, but then the file is manually
updated before the commit.

In this case the file should be detected as touched.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

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

✅ refresh by Heptapod after a successful CI run (🐙 💚)

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

marmoute added a commit: rHG433cef8f3104: copies: distinguish between merged and touched files during upgrade.Mar 22 2021, 2:30 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG433cef8f3104: copies: distinguish between merged and touched files during upgrade (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 (16 lines)
M			tests/test-copies-chain-merge.t (26 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26365		Mar 15 2021, 10:19 AM	★	★
Diff 2	26369		Mar 15 2021, 2:10 PM	★	★
Diff 3	26520		Mar 19 2021, 4:37 PM	★	★
Diff 4	26548	rHG433cef8f3104bed1560e4403b8870cf8c4bf688d	Mar 12 2021, 9:17 PM	★	★

Commit	Parents	Author	Summary	Date
3ced71cb176c	f077fc7c0705	Pierre-Yves David		Mar 12 2021, 9:17 PM

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 26520

mercurial/metadata.py

	│ │🄶 No Changes │ │ │ │			│ │🄶 No Changes │ │ │ │
	│ (Some, None) │ OR │🄻 Deleted │ ø │ ø │			│ (Some, None) │ OR │🄻 Deleted │ ø │ ø │
	│ │🄷 Deleted[1] │ │ │ │			│ │🄷 Deleted[1] │ │ │ │
	├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤			├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
	│ │🄸 No Changes │ │ │ 🄽 Touched │			│ │🄸 No Changes │ │ │ 🄽 Touched │
	│ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │			│ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │
	│ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │			│ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │
	├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤			├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
	│ │ │ │ 🄾 Touched │ │			│ │ │ │ 🄾 Touched │ 🄿 Merged │
	│ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │🄿 Merged │			│ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │OR 🅂 Touched │
	│ │ [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,
	ancestor of the node in parent-A, or where parent-A and parent-B are two			ancestor of the node in parent-A, or where parent-A and parent-B are two
	branches of the same file history, yet not merge-filenode were created			branches of the same file history, yet not merge-filenode were created
	(while the "merge" should have led to a "modification").			(while the "merge" should have led to a "modification").

	Detecting such cases (and not recording the file as modified) would be a			Detecting such cases (and not recording the file as modified) would be a
	nice bonus. However do not any of this yet.			nice bonus. However do not any of this yet.
	"""			"""

				repo = ctx.repo()
	md = ChangingFiles()			md = ChangingFiles()

	m = ctx.manifest()			m = ctx.manifest()
	p1m = p1_ctx.manifest()			p1m = p1_ctx.manifest()
	p2m = p2_ctx.manifest()			p2m = p2_ctx.manifest()
	diff_p1 = p1m.diff(m)			diff_p1 = p1m.diff(m)
	diff_p2 = p2m.diff(m)			diff_p2 = p2m.diff(m)

	if d1[0][0] is None or d2[0][0] is None:			if d1[0][0] is None or d2[0][0] is None:
	if any(_find(ma, filename) is not None for ma in mas):			if any(_find(ma, filename) is not None for ma in mas):
	# case 🅀 or 🅁			# case 🅀 or 🅁
	md.mark_salvaged(filename)			md.mark_salvaged(filename)
	else:			else:
	# case 🄽 🄾 : touched			# case 🄽 🄾 : touched
	md.mark_touched(filename)			md.mark_touched(filename)
	else:			else:
	# case 🄿 : merged			fctx = repo.filectx(filename, fileid=d1[1][0])
				if fctx.p2().rev() == nullrev:
				# case 🅂
				# lets assume we can trust the file history. If the
				# filenode is not a merge, the file was not merged.
				md.mark_touched(filename)
				else:
				# case 🄿
	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

	##### revision "mEA-change-m-0 merge with file update and copies info on both side - A side" #####			##### revision "mEA-change-m-0 merge with file update and copies info on both side - A side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'			'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
	merged : f, ;			merged : f, ;
	##### revision "mBF-change-m-0 merge with extra change - B side" #####			##### revision "mBF-change-m-0 merge with extra change - B side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
	touched : d, ; (no-upgraded no-upgraded-parallel !)			touched : d, ;
	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !)
	touched : d, ; (upgraded missing-correct-output !)
	'\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\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
	touched : d, ; (upgraded-parallel 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 !)
	##### revision "mFB-change-m-0 merge with extra change - B side" #####			##### revision "mFB-change-m-0 merge with extra change - B side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d'
	touched : d, ; (no-upgraded no-upgraded-parallel !)			touched : d, ;
	'\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\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (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'			'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d'
	salvaged : d, ;			salvaged : d, ;
	##### 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
	\|			\|
	o i-0 initial commit: a b h p q r			o i-0 initial commit: a b h p q r

	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBF-change-m-0")'			$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBF-change-m-0")'
	M b			M b
	A d			A d
	h (filelog !)			h (filelog !)
	h (sidedata !)			h (sidedata !)
	a (upgraded known-bad-output !)			h (upgraded !)
	h (upgraded missing-correct-output !)			h (upgraded-parallel !)
	a (upgraded-parallel known-bad-output !)
	h (upgraded-parallel missing-correct-output !)
	h (changeset !)			h (changeset !)
	h (compatibility !)			h (compatibility !)
	A t			A t
	p			p
	R a			R a
	R h			R h
	R p			R p
	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")'			$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")'