This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8987

tests: add few debugrevlogindex and a log call to see changes in next test
ClosedPublic

Authored by pulkit on Sep 5 2020, 3:10 AM.

Download Raw Diff

Details

Reviewers

marmoute

Group Reviewers

hg-reviewers

Commits

rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test

Summary

In upcoming patches, we will create a new filenode in couple of cases. Let's add
some debugrevlogindex and a log call so that we can observe those changes
better.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

pulkit created this revision.Sep 5 2020, 3:10 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 5 2020, 3:10 AM

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

pulkit added a child revision: D8988: merge: store commitinfo if mergetool resolved a dc or cd conflict.Sep 5 2020, 3:10 AM

pulkit edited parent revisions, added: D8982: merge: disable `m2-vs-ma` diff optimization in case of flat manifests; removed: D8986: debugmergestate: sort extras before printing.Sep 9 2020, 9:44 AM

pulkit updated this revision to Diff 22586.

Looks good.

Maybe explaining why "this should create a new file node" would better.

pulkit edited parent revisions, added: D9027: merge: check new filenode creation config before disabling optimization; removed: D8982: merge: disable `m2-vs-ma` diff optimization in case of flat manifests.Sep 17 2020, 5:49 AM

pulkit added a child revision: D9028: tests: add some debugmergestate calls in `test-merge-criss-cross.t`.

pulkit removed a child revision: D8988: merge: store commitinfo if mergetool resolved a dc or cd conflict.

pulkit updated this revision to Diff 22670.

pulkit added a commit: rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test.Sep 28 2020, 7:20 AM

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

Closed by commit rHG76b69f81629c: tests: add few debugrevlogindex and a log call to see changes in next test (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-merge-criss-cross.t (42 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22551		Sep 5 2020, 3:10 AM	★	★
Diff 2	22586		Sep 9 2020, 9:44 AM	★	★
Diff 3	22670		Sep 17 2020, 5:49 AM	★	★
Diff 4	22871	rHG76b69f81629c791e30187ee40f8eaa1666ff8e9e	Sep 3 2020, 4:24 AM	★	★

Commit	Parents	Author	Summary	Date
ffc79d53afaa	6f55bbcae7a2	Pulkit Goyal		Sep 3 2020, 4:24 AM

Status	Author	Revision
Closed	pulkit	D8986 debugmergestate: sort extras before printing
Closed	pulkit	D8985 commit: fix a wrong argument name in documentation
Closed	pulkit	D8984 commit: pass mergestate into _filecommit() instead of re-reading it
Closed	pulkit	D9003 merge: store cases when a file is absent post merge in commitinfo
Closed	pulkit	D9029 tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8989 commit: force create a new filenode if it was set in mergestate by merge
Closed	pulkit	D8988 merge: store commitinfo if mergetool resolved a dc or cd conflict
Closed	pulkit	D9028 tests: add some debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8987 tests: add few debugrevlogindex and a log call to see changes in next test
Closed	pulkit	D9027 merge: check new filenode creation config before disabling optimization
Changes Planned	pulkit	D8982 merge: disable `m2-vs-ma` diff optimization in case of flat manifests
Closed	pulkit	D8981 scmutil: introduce function to check whether repo uses treemanifest or not
Closed	pulkit	D9026 configitems: add a new config option to control new filenode functionality
Closed	pulkit	D9025 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Closed	pulkit	D9002 mergestate: introduce a new ACTION_KEEP_NEW
Changes Planned	pulkit	D8977 merge: check for dir rename dest before adding ACTION_KEEP
Closed	pulkit	D8983 merge: move initial handling of mergeactions near to later one

Diff 22670

tests/test-merge-criss-cross.t

	$ hg update 'desc("delete-the-file")'			$ hg update 'desc("delete-the-file")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("updating-both-file")' -t :local			$ hg merge 'desc("updating-both-file")' -t :local
	1 files updated, 1 files merged, 0 files removed, 0 files unresolved			1 files updated, 1 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m "merge-deleting-the-file-from-deleted"			$ hg ci -m "merge-deleting-the-file-from-deleted"
	$ hg manifest			$ hg manifest
	other-file			other-file
				$ hg debugrevlogindex the-file
				rev linkrev nodeid p1 p2
				0 0 4b69178b9bda 000000000000 000000000000
				1 1 59e363a07dc8 4b69178b9bda 000000000000

	$ hg update 'desc("updating-both-file")'			$ hg update 'desc("updating-both-file")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("delete-the-file")' -t :other			$ hg merge 'desc("delete-the-file")' -t :other
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m "merge-deleting-the-file-from-updated"			$ hg ci -m "merge-deleting-the-file-from-updated"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
				$ hg debugrevlogindex the-file
				rev linkrev nodeid p1 p2
				0 0 4b69178b9bda 000000000000 000000000000
				1 1 59e363a07dc8 4b69178b9bda 000000000000

	$ hg update 'desc("delete-the-file")'			$ hg update 'desc("delete-the-file")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("updating-both-file")' -t :other			$ hg merge 'desc("updating-both-file")' -t :other
	1 files updated, 1 files merged, 0 files removed, 0 files unresolved			1 files updated, 1 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m "merge-keeping-the-file-from-deleted"			$ hg ci -m "merge-keeping-the-file-from-deleted"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
	the-file			the-file

				XXX: This should create a new filenode because user explicitly decided to keep
				the file. If we reuse the same filenode, future merges (criss-cross ones mostly)
				will think that file remain unchanged and user explicit choice will not be taken
				in consideration.
				$ hg debugrevlogindex the-file
				rev linkrev nodeid p1 p2
				0 0 4b69178b9bda 000000000000 000000000000
				1 1 59e363a07dc8 4b69178b9bda 000000000000

	$ hg update 'desc("updating-both-file")'			$ hg update 'desc("updating-both-file")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("delete-the-file")' -t :local			$ hg merge 'desc("delete-the-file")' -t :local
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 files updated, 1 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m "merge-keeping-the-file-from-updated"			$ hg ci -m "merge-keeping-the-file-from-updated"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
	the-file			the-file

				XXX: This should create a new filenode because user explicitly decided to keep
				the file. If we reuse the same filenode, future merges (criss-cross ones mostly)
				will think that file remain unchanged and user explicit choice will not be taken
				in consideration.
				$ hg debugrevlogindex the-file
				rev linkrev nodeid p1 p2
				0 0 4b69178b9bda 000000000000 000000000000
				1 1 59e363a07dc8 4b69178b9bda 000000000000

				$ hg log -G -T '{node\|short} {desc}\n'
				@ 5e3eccec60d8 merge-keeping-the-file-from-updated
				\|\
				+---o e9b708131723 merge-keeping-the-file-from-deleted
				\| \|/
				+---o a4e0e44229dc merge-deleting-the-file-from-updated
				\| \|/
				+---o adfd88e5d7d3 merge-deleting-the-file-from-deleted
				\| \|/
				\| o 7801bc9b9899 delete-the-file
				\| \|
				o \| 9b610631ab29 updating-both-file
				\|/
				o 955800955977 root-commit


	There the resulting merge together (leading to criss cross situation). Check			There the resulting merge together (leading to criss cross situation). Check
	the conflict is properly detected.			the conflict is properly detected.

	(merging two deletion together → no conflict)			(merging two deletion together → no conflict)

	$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'			$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleting-the-file-from-updated")'			$ hg merge 'desc("merge-deleting-the-file-from-updated")'