test-copies: add test chaining multiple merge
ClosedPublic

Authored by marmoute on Dec 15 2020, 4:07 AM.

Download Raw Diff

Details

Reviewers

Group Reviewers

Commits

rHG075b2499e3d6: test-copies: add test chaining multiple merge
rHG428f8bfcb83d: test-copies: add test chaining multiple merge

Summary

Right now, the copy tracing logic take the right decision for merges, but it
does not keep track of the right information about these decision and can fall
into later traps. We start with highlighting this possibility by adding new
tests, and we will fix them later.

Check the inline test documentation for details.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Dec 15 2020, 4:07 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 15 2020, 4:07 AM

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

marmoute added a child revision: D9612: copies: rearrange all value comparison conditional.Dec 15 2020, 4:07 AM

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

Alphare accepted this revision.Jan 8 2021, 5:27 AM

marmoute retitled this revision from copies-test: add test chaining multiple merge to test-copies: add test chaining multiple merge.Feb 22 2021, 9:34 AM

marmoute added a child revision: D10048: test-copies: remove revision number from log.

marmoute removed a child revision: D9612: copies: rearrange all value comparison conditional.

marmoute updated this revision to Diff 25723.

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

marmoute added a commit: rHG428f8bfcb83d: test-copies: add test chaining multiple merge.Feb 24 2021, 10:56 AM

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

Closed by commit rHG428f8bfcb83d: test-copies: add test chaining multiple merge (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute added a commit: rHG075b2499e3d6: test-copies: add test chaining multiple merge.Feb 24 2021, 12:10 PM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-copies-chain-merge.t (172 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24281		Dec 15 2020, 4:07 AM	★	★
Diff 2	24374		Dec 17 2020, 4:04 PM	★	★
Diff 3	24401		Dec 18 2020, 9:12 AM	★	★
Diff 4	24408		Dec 18 2020, 9:31 AM	★	★
Diff 5	24416		Dec 18 2020, 9:54 AM	★	★
Diff 6	24454		Dec 21 2020, 3:00 AM	★	★
Diff 7	24570		Jan 5 2021, 3:38 AM	★	★
Diff 8	24593		Jan 5 2021, 9:01 AM	★	★
Diff 9	25723		Feb 22 2021, 9:34 AM	★	★
Diff 10	25764		Feb 22 2021, 11:34 AM	★	★
Diff 11	25829	rHG428f8bfcb83d62db77a55b46bfe4ea750d4840d9	Dec 14 2020, 11:56 AM	★	★

Commit	Parents	Author	Summary	Date
de6d8aee6c24	09229c183afe	Pierre-Yves David		Dec 14 2020, 11:56 AM

Status	Author	Revision
Closed	SimonSapin	D9686 copies-rust: send PyBytes values back be dropped ino the parent thread
Closed	SimonSapin	D9685 copies-rust: introduce PyBytesWithData to reduce GIL requirement
Closed	SimonSapin	D9684 copies-rust: move CPU-heavy Rust processing into a child thread
Closed	SimonSapin	D9683 copies-rust: split up combine_changeset_copies function into a struct
Closed	SimonSapin	D9682 copies-rust: extract generic map merge logic from merge_copies_dict
Closed	marmoute	D9656 copies-rust: use imrs::OrdSet instead of imrs::HashSet
Closed	marmoute	D9655 copies-rust: use simpler overwrite when value on both side are identical
Closed	marmoute	D9654 copies-rust: make more use of the new comparison property
Closed	marmoute	D9653 copies-rust: implement PartialEqual manually
Closed	marmoute	D9652 copies-rust: record "overwritten" information from both side on delete
Closed	marmoute	D9651 copies-rust: refactor the "deletion" case
Closed	marmoute	D9650 copies-rust: process copy information of both parent at the same time
Closed	marmoute	D9649 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()`
Closed	marmoute	D9648 copies-rust: extract the processing of a single copy information
Closed	marmoute	D9647 copies-rust: use matching to select the final copies information
Closed	marmoute	D9646 copies-rust: get the parents' copies earlier
Closed	marmoute	D9645 copies-rust: remove the ancestor Oracle logic
Closed	marmoute	D9644 copies-rust: track "overwrites" directly within CopySource
Closed	marmoute	D9643 copies-rust: add methods to build and update CopySource
Closed	marmoute	D9657 copies-rust: fix reverted argument when merging tiny minor or major
Closed	marmoute	D9642 copies-rust: rename TimeStampedPathCopy to CopySource
Closed	marmoute	D9641 copies-rust: rename TimeStampedPathCopies to InternalPathCopies
Closed	marmoute	D9613 copies: detect case when a merge decision overwrite previous data
Closed	marmoute	D9612 copies: rearrange all value comparison conditional
Closed	marmoute	D10059 test-copies: introduce merge chains test for the P/Q merges
Closed	marmoute	D10058 test-copies: add a case involving the `b` and a new `r` branch
Closed	marmoute	D10057 test-copies: introduce case combining the `p` and `q` branch
Closed	marmoute	D10056 test-copies: add a `q` branch similar to the `e` but on the new files
Closed	marmoute	D10055 test-copies: add a `p` branch similar to the `a` but on the new files
Closed	marmoute	D10054 test-copies: move the new files in the `i` branch
Closed	marmoute	D10053 test-copies: add 3 new files with their own content
Closed	marmoute	D10052 test-copies: introduce merge chaing test for the A/E + change tests
Closed	marmoute	D10051 test-copies: add a "change during merge" variant to the A+E test
Closed	marmoute	D10050 test-copies: filter out the linkrev part of `debugindex`
Closed	marmoute	D10049 test-copies: use "case-id" instead of revision number when listing sidedata
Closed	marmoute	D10048 test-copies: remove revision number from log
Closed	marmoute	D9611 test-copies: add test chaining multiple merge
Closed	marmoute	D9610 test-copies: add test chaining multiple merges
Closed	marmoute	D9609 test-copies: add test chaining multiple merges
Closed	marmoute	D10047 test-copies: add subcase titles for various "conflicting" information variant
Closed	marmoute	D10046 test-copies: improve description of the B+F case
Closed	marmoute	D10045 test-copies: improve description of the C+H case
Closed	marmoute	D10044 test-copies: improve description of the B+C "revert/restore" case
Closed	marmoute	D10043 test-copies: improve description of the G+C case
Closed	marmoute	D10042 test-copies: improve description of the G+F case
Closed	marmoute	D10041 test-copies: improve description of the D+G case
Closed	marmoute	D10040 test-copies: improve description of the A+E case
Closed	marmoute	D10039 test-copies: improve description of the B+D case
Closed	marmoute	D10038 test-copies: improve description of the B+C case
Closed	marmoute	D10037 test-copies: improve description of the A+B case
Closed	marmoute	D10036 test-copies: use intermediate variable some commit descriptions
Closed	marmoute	D10035 test-copies: don't use empty file for "same content" cases
Closed	marmoute	D9591 copies: rename value/other variable to minor/major for clarity
Closed	marmoute	D9590 copies: extract value comparison in the python copy tracing
Closed	marmoute	D9607 hghave: add some official category for known-bad and missing-good output
Closed	marmoute	D9608 copies: stop attempt to avoid extra dict copies around branching
Closed	marmoute	D9592 copies: deal with the "same revision" special case earlier
Closed	marmoute	D9589 copies-tests: update to null in test-copies-chain-merge.t
Closed	marmoute	D9588 copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Closed	marmoute	D9587 test-copies: reinstall initial identical (empty) files for chained copied
Closed	marmoute	D9586 copies: explain the "arbitrary" copy source pick in case of conflict
Closed	marmoute	D9585 copies: properly match result during changeset centric copy tracing
Closed	marmoute	D9584 copies: avoid early return in _combine_changeset_copies
Closed	marmoute	D9499 copies-rust: record overwrite when merging
Closed	marmoute	D9498 copies-rust: make the comparison aware of the revision being current merged
Closed	marmoute	D9497 copies-rust: start recording overwrite as they happens
Closed	marmoute	D9496 copies-rust: rename Oracle.is_ancestor to Oracle.is_overwrite
Closed	marmoute	D9495 copies-rust: use the `entry` API for copy information too
Closed	marmoute	D9494 copies-rust: use the entry API to overwrite deleted entry
Closed	marmoute	D9493 copies-rust: tokenize all paths into integer
Closed	marmoute	D9492 copies-rust: pre-introduce a PathToken type and use it where applicable
Closed	marmoute	D9491 copies-rust: add smarter approach for merging small mapping with large mapping
Closed	marmoute	D9426 copies-rust: hide most of the comparison details inside a closure
Closed	marmoute	D9425 copies-rust: move the mapping merging into a else clause
Closed	marmoute	D9424 copies-rust: extract conflicting value comparison in its own function
Closed	marmoute	D9423 copies: no longer cache the ChangedFiles during copy tracing
Closed	marmoute	D9422 copies: iterate over children directly (instead of parents)
Closed	marmoute	D9581 copies: document the current algorithm step

Diff 24374

tests/test-copies-chain-merge.t

	o 2 i-2: c -move-> d			o 2 i-2: c -move-> d
	\|			\|
	o 1 i-1: a -move-> c			o 1 i-1: a -move-> c
	\|			\|
	o 0 i-0 initial commit: a b h			o 0 i-0 initial commit: a b h



				Subcase: chaining "merged" information during a merge
				``````````````````````````````````````````````````````

				When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.

				(extra unrelated changes)

				$ hg up 'desc("f-2")'
				2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
				$ echo n > unrelated-n
				$ hg add unrelated-n
				$ hg ci -m 'n-1: unrelated changes (based on the "f" series of changes)'
				created new head

				$ hg up 'desc("g-1")'
				2 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo o > unrelated-o
				$ hg add unrelated-o
				$ hg ci -m 'o-1: unrelated changes (based on "g" changes)'
				created new head

				(merge variant 1)

				$ hg up 'desc("mFGm")'
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
				$ hg merge 'desc("o-1")'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -m 'mFG,Om: simple merge'

				(merge variant 2)

				$ hg up 'desc("o-1")'
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
				$ hg merge 'desc("FGm")'
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
				(branch merge, don't forget to commit)
				$ hg ci -m 'mO,FGm: simple merge'
				created new head

				(merge variant 3)

				$ hg up 'desc("mGFm")'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg merge 'desc("n-1")'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -m 'mGF,Nm: simple merge'

				(merge variant 4)

				$ hg up 'desc("n-1")'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg merge 'desc("mGFm")'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -m 'mN,GFm: simple merge'
				created new head

				$ hg log -G --rev '::(desc("mFG,Om") + desc("mO,FGm") + desc("mGF,Nm") + desc("mN,GFm"))'
				@ 53 mN,GFm: simple merge
				\|\
				+---o 52 mGF,Nm: simple merge
				\| \|/
				\| \| o 51 mO,FGm: simple merge
				\| \| \|\
				\| \| +---o 50 mFG,Om: simple merge
				\| \| \| \|/
				\| \| \| o 49 o-1: unrelated changes (based on "g" changes)
				\| \| \| \|
				\| o \| \| 48 n-1: unrelated changes (based on the "f" series of changes)
				\| \| \| \|
				o-----+ 29 mGFm-0 simple merge - the other way
				\|/ / /
				\| o / 28 mFGm-0 simple merge - one way
				\|/\|/
				\| o 25 g-1: update d
				\| \|
				o \| 22 f-2: rename i -> d
				\| \|
				o \| 21 f-1: rename h -> i
				\|/
				o 2 i-2: c -move-> d
				\|
				o 1 i-1: a -move-> c
				\|
				o 0 i-0 initial commit: a b h


	Summary of all created cases			Summary of all created cases
	----------------------------			----------------------------

	$ hg up --quiet null			$ hg up --quiet null

	(This exists to help keeping a compact list of the various cases we have built)			(This exists to help keeping a compact list of the various cases we have built)

	mCBm-1 re-add d			mCBm-1 re-add d
	mCGm-0			mCGm-0
	mCH-delete-before-conflict-m-0			mCH-delete-before-conflict-m-0
	mDBm-0 simple merge - the other way			mDBm-0 simple merge - the other way
	mDGm-0 simple merge - one way			mDGm-0 simple merge - one way
	mEA,Jm: simple merge			mEA,Jm: simple merge
	mEAm-0 simple merge - the other way			mEAm-0 simple merge - the other way
	mFBm-0 simple merge - the other way			mFBm-0 simple merge - the other way
				mFG,Om: simple merge
	mFGm-0 simple merge - one way			mFGm-0 simple merge - one way
	mGCm-0			mGCm-0
	mGDm-0 simple merge - the other way			mGDm-0 simple merge - the other way
				mGF,Nm: simple merge
	mGFm-0 simple merge - the other way			mGFm-0 simple merge - the other way
	mHC-delete-before-conflict-m-0			mHC-delete-before-conflict-m-0
	mJ,EAm: simple merge			mJ,EAm: simple merge
	mK,AEm: simple merge			mK,AEm: simple merge
	mL,BC+revertm: simple merge			mL,BC+revertm: simple merge
	mL,CB+revertm: simple merge			mL,CB+revertm: simple merge
				mN,GFm: simple merge
				mO,FGm: simple merge
				n-1: unrelated changes (based on the "f" series of changes)
				o-1: unrelated changes (based on "g" changes)


	Test that sidedata computations during upgrades are correct			Test that sidedata computations during upgrades are correct
	===========================================================			===========================================================

	We upgrade a repository that is not using sidedata (the filelog case) and			We upgrade a repository that is not using sidedata (the filelog case) and
	check that the same side data have been generated as if they were computed at			check that the same side data have been generated as if they were computed at
	commit time.			commit time.
	##### revision 46 #####			##### revision 46 #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 4			entry-0014 size 4
	'\x00\x00\x00\x00'			'\x00\x00\x00\x00'
	##### revision 47 #####			##### revision 47 #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 4			entry-0014 size 4
	'\x00\x00\x00\x00'			'\x00\x00\x00\x00'
				##### revision 48 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-n'
				added : unrelated-n, ;
				##### revision 49 #####
				1 sidedata entries
				entry-0014 size 24
				'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-o'
				added : unrelated-o, ;
				##### revision 50 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 51 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 52 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'
				##### revision 53 #####
				1 sidedata entries
				entry-0014 size 4
				'\x00\x00\x00\x00'

	#endif			#endif


	Test copy information chaining			Test copy information chaining
	==============================			==============================

	Check that matching only affect the destination and not intermediate path			Check that matching only affect the destination and not intermediate path
	M b			M b
	A d			A d
	a (filelog !)			a (filelog !)
	a (missing-correct-output sidedata !)			a (missing-correct-output sidedata !)
	a (missing-correct-output upgraded !)			a (missing-correct-output upgraded !)
	A unrelated-l			A unrelated-l
	R a			R a

				Subcase: chaining "merged" information during a merge
				``````````````````````````````````````````````````````

				When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.


				reference output:

				(for details about the filelog pick, check the mFGm/mGFm case)

				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm")' d
				A d
				a (filelog !)
				h (sidedata !)
				h (upgraded !)
				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm")' d
				A d
				a (filelog !)
				a (sidedata !)
				a (upgraded !)

				Chained output

				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mO,FGm")' d
				A d
				a (filelog !)
				h (sidedata !)
				h (upgraded !)
				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFG,Om")' d
				A d
				a (filelog !)
				h (sidedata !)
				h (upgraded !)


				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d
				A d
				a (filelog !)
				a (missing-correct-output sidedata !)
				a (missing-correct-output upgraded !)
				h (known-bad-output sidedata !)
				h (known-bad-output upgraded !)
				$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mN,GFm")' d
				A d
				a (filelog !)
				a (missing-correct-output sidedata !)
				a (missing-correct-output upgraded !)
				h (known-bad-output sidedata !)
				h (known-bad-output upgraded !)

This is an archive of the discontinued Mercurial Phabricator instance.

test-copies: add test chaining multiple mergeClosedPublic