This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8989

commit: force create a new filenode if it was set in mergestate by merge
ClosedPublic

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

Download Raw Diff

Details

Reviewers

marmoute

Group Reviewers

hg-reviewers

Commits

rHG479cce8c9882: commit: force create a new filenode if it was set in mergestate by merge

Summary

For reasons mentioned in previous commits, we will like to forcefully create a
new filenode sometimes.

Combination of this patch and previous one, we fixed a case in
test-merge-combination.t.

This does not yet results in conflict where it should, I need to investigate
more about what's happening as it should be a change-delete conflict now.

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

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

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

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

mharbison72 mentioned this in D8457: [RFC] metadataonlyctx: demonstrate an error reusing manifest nodes.Sep 5 2020, 1:39 PM

pulkit added a child revision: D9003: merge: store cases when a file is absent post merge in commitinfo.Sep 9 2020, 9:45 AM

pulkit updated this revision to Diff 22588.

Cf feedback on the previous changeset about the semantic of the message.

Also, did you says you wanted to gate this behind a conflig flag for now ?

You should also document the effect on test-merge-criss-cross.t, small bump of the idea of having a summary of the issues in the test itself so we can track they status.

marmoute requested changes to this revision.Sep 11 2020, 5:17 AM

This revision now requires changes to proceed.Sep 11 2020, 5:17 AM

pulkit added a child revision: D9029: tests: add some more debugmergestate calls in `test-merge-criss-cross.t`.Sep 17 2020, 5:50 AM

pulkit removed a child revision: D9003: merge: store cases when a file is absent post merge in commitinfo.

pulkit updated this revision to Diff 22673.

pulkit added a commit: rHG479cce8c9882: commit: force create a new filenode if it was set in mergestate by merge.Sep 28 2020, 7:20 AM

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

Closed by commit rHG479cce8c9882: commit: force create a new filenode if it was set in mergestate by merge (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commit.py (13 lines)
M			tests/test-merge-criss-cross.t (35 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22553		Sep 5 2020, 3:11 AM	★	★
Diff 2	22588		Sep 9 2020, 9:45 AM	★	★
Diff 3	22673		Sep 17 2020, 5:50 AM	★	★
Diff 4	22874	rHG479cce8c9882ae34208d84dec438719ca4f850f5	Sep 3 2020, 4:28 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 22874

mercurial/commit.py

	elif not fparentancestors:			elif not fparentancestors:
	# TODO: this whole if-else might be simplified much more			# TODO: this whole if-else might be simplified much more
	if (			if (
	ms.active()			ms.active()
	and ms.extras(fname).get(b'filenode-source') == b'other'			and ms.extras(fname).get(b'filenode-source') == b'other'
	):			):
	fparent1, fparent2 = fparent2, nullid			fparent1, fparent2 = fparent2, nullid

				force_new_node = False
				# The file might have been deleted by merge code and user explicitly choose
				# to revert the file and keep it. The other case can be where there is
				# change-delete or delete-change conflict and user explicitly choose to keep
				# the file. The goal is to create a new filenode for users explicit choices
				if (
				repo.ui.configbool(b'experimental', b'merge-track-salvaged')
				and ms.active()
				and ms.extras(fname).get(b'merge-removal-candidate') == b'yes'
				):
				force_new_node = True
	# is the file changed?			# is the file changed?
	text = fctx.data()			text = fctx.data()
	if fparent2 != nullid or meta or flog.cmp(fparent1, text):			if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node:
	if touched is None: # do not overwrite added			if touched is None: # do not overwrite added
	touched = 'modified'			touched = 'modified'
	fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)			fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)
	# are just the flags changed during merge?			# are just the flags changed during merge?
	elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():			elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
	touched = 'modified'			touched = 'modified'
	fnode = fparent1			fnode = fparent1
	else:			else:

tests/test-merge-criss-cross.t

	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
	extra: other-file (filenode-source = other)			extra: other-file (filenode-source = other)
	$ 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			$ hg debugrevlogindex the-file
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 0 4b69178b9bda 000000000000 000000000000			0 0 4b69178b9bda 000000000000 000000000000
	1 1 59e363a07dc8 4b69178b9bda 000000000000			1 1 59e363a07dc8 4b69178b9bda 000000000000
				2 5 885af55420b3 59e363a07dc8 000000000000 (newfilenode !)

	$ hg update 'desc("updating-both-file")'			$ hg update 'desc("updating-both-file")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ 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 debugmergestate			$ hg debugmergestate
	local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071			local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
	other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b			other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
	file: the-file (state "r")			file: the-file (state "r")
	local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")			local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
	XXX: This should create a new filenode because user explicitly decided to keep			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)			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			will think that file remain unchanged and user explicit choice will not be taken
	in consideration.			in consideration.
	$ hg debugrevlogindex the-file			$ hg debugrevlogindex the-file
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 0 4b69178b9bda 000000000000 000000000000			0 0 4b69178b9bda 000000000000 000000000000
	1 1 59e363a07dc8 4b69178b9bda 000000000000			1 1 59e363a07dc8 4b69178b9bda 000000000000
				2 5 885af55420b3 59e363a07dc8 000000000000 (newfilenode !)

	$ hg log -G -T '{node\|short} {desc}\n'			$ hg log -G -T '{node\|short} {desc}\n'
	@ 5e3eccec60d8 merge-keeping-the-file-from-updated			@ 5e3eccec60d8 merge-keeping-the-file-from-updated
	\|\			\|\
	+---o e9b708131723 merge-keeping-the-file-from-deleted			+---o 38a4c3e7cac8 merge-keeping-the-file-from-deleted (newfilenode !)
				+---o e9b708131723 merge-keeping-the-file-from-deleted (old !)
	\| \|/			\| \|/
	+---o a4e0e44229dc merge-deleting-the-file-from-updated			+---o a4e0e44229dc merge-deleting-the-file-from-updated
	\| \|/			\| \|/
	+---o adfd88e5d7d3 merge-deleting-the-file-from-deleted			+---o adfd88e5d7d3 merge-deleting-the-file-from-deleted
	\| \|/			\| \|/
	\| o 7801bc9b9899 delete-the-file			\| o 7801bc9b9899 delete-the-file
	\| \|			\| \|
	o \| 9b610631ab29 updating-both-file			o \| 9b610631ab29 updating-both-file
	other-file			other-file

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in 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, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				the-file (newfilenode !)

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in 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, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file

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

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	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("merge-deleting-the-file-from-deleted")'			$ hg merge 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	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("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				the-file (newfilenode !)

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file

	(merging two "keeping" together → no conflict)			(merging two "keeping" together → no conflict)

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	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("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-deleted-the-file-from-deleted")'			$ hg merge 'desc("merge-deleted-the-file-from-deleted")'
	abort: empty revision set			abort: empty revision set
	[255]			[255]
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	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("merge-deleting-the-file-from-updated")'			$ hg merge 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file

	(merging two "keeping" together → no conflict)			(merging two "keeping" together → no conflict)

	$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'			$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)