This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11999

merge: consider the file merged when using :merge-{local,other}
ClosedPublic

Authored by martinvonz on Jan 14 2022, 12:48 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG50de08904c63: merge: consider the file merged when using :merge-{local,other}
rHG60a06b0d0c36: merge: consider the file merged when using :merge-{local,other}

Summary

Returning None from simplemerge() means that the caller interprets
it as "no merge was necessary (because two sides matched)". See
6217040b2780 and issue2680 for some background. However,
simplemerge() shouldn't even get called in such scenarios, and
returning None means that the file is not considered merged, even
though the contents actually were. See the affected test cases.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 14 2022, 12:48 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 14 2022, 12:48 PM

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

This makes the message more consistent with merging FILE, which always bothered me slightly

This revision is now accepted and ready to land.Jan 17 2022, 8:00 AM

martinvonz added a commit: rHG60a06b0d0c36: merge: consider the file merged when using :merge-{local,other}.Jan 17 2022, 8:16 AM

Closed by commit rHG60a06b0d0c36: merge: consider the file merged when using :merge-{local,other} (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHG50de08904c63: merge: consider the file merged when using :merge-{local,other}.Jan 17 2022, 11:00 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/simplemerge.py (5 lines)
M			tests/test-annotate.t (2 lines)
M			tests/test-conflict.t (2 lines)
M			tests/test-copies-chain-merge.t (8 lines)
M			tests/test-merge-internal-tools-pattern.t (2 lines)

Commit	Parents	Author	Summary	Date
be0ba96c553a	b0ff1997d557	Martin von Zweigbergk		Jan 14 2022, 12:28 PM

Status	Author	Revision
Closed	martinvonz	D11999 merge: consider the file merged when using :merge-{local,other}
Closed	martinvonz	D11998 simplemerge: delete unused exception class `CantReprocessAndShowBase`
Closed	martinvonz	D11981 simplemerge: change _minimize() to minimize a single conflict
Closed	martinvonz	D11980 simplemerge: make minimize() a free function
Closed	martinvonz	D11979 simplemerge: simplify and rename `render_markers()`
Closed	martinvonz	D11978 simplemerge: split out function for rendering :merge3 conflict markers
Closed	martinvonz	D11977 simplemerge: move default labels to simplemerge extension
Closed	martinvonz	D11976 simplemerge: use same newline detection for :mergediff as for :merge[3]
Closed	martinvonz	D11975 simplemerge: clarify names of functions that render conflict markers
Closed	martinvonz	D11974 simplemerge: make merge_lines() a free function
Closed	martinvonz	D11973 simplemerge: convert `merge_lines()` away from generator
Closed	martinvonz	D11972 simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels

Diff 31655

mercurial/simplemerge.py

	# repository usually sees) might be more useful.			# repository usually sees) might be more useful.
	return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts)			return _verifytext(ctx.decodeddata(), ctx.path(), ui, opts)

	try:			try:
	localtext = readctx(localctx)			localtext = readctx(localctx)
	basetext = readctx(basectx)			basetext = readctx(basectx)
	othertext = readctx(otherctx)			othertext = readctx(otherctx)
	except error.Abort:			except error.Abort:
	return 1			return True

	m3 = Merge3Text(basetext, localtext, othertext)			m3 = Merge3Text(basetext, localtext, othertext)
	conflicts = False			conflicts = False
	mode = opts.get('mode', b'merge')			mode = opts.get('mode', b'merge')
	if mode == b'union':			if mode == b'union':
	lines = _resolve(m3, (1, 2))			lines = _resolve(m3, (1, 2))
	elif mode == b'local':			elif mode == b'local':
	lines = _resolve(m3, (1,))			lines = _resolve(m3, (1,))
	mergedtext = b''.join(lines)			mergedtext = b''.join(lines)
	if opts.get('print'):			if opts.get('print'):
	ui.fout.write(mergedtext)			ui.fout.write(mergedtext)
	else:			else:
	# localctx.flags() already has the merged flags (done in			# localctx.flags() already has the merged flags (done in
	# mergestate.resolve())			# mergestate.resolve())
	localctx.write(mergedtext, localctx.flags())			localctx.write(mergedtext, localctx.flags())

	if conflicts:			return conflicts
	return 1

tests/test-annotate.t

	> 4 baz:4			> 4 baz:4
	> y			> y
	> z			> z
	> EOF			> EOF
	$ hg ci -m 'baz: mostly rewrite with some content from 24'			$ hg ci -m 'baz: mostly rewrite with some content from 24'
	created new head			created new head
	$ hg merge --tool :merge-other 24			$ hg merge --tool :merge-other 24
	merging baz			merging baz
	1 files updated, 0 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 forgetting about baz rewrite'			$ hg ci -m 'merge forgetting about baz rewrite'
	$ cat > baz << EOF			$ cat > baz << EOF
	> 0			> 0
	> 0			> 0
	> 1 baz:1			> 1 baz:1
	> 2+ baz:2			> 2+ baz:2
	> 3+ baz:3			> 3+ baz:3

tests/test-conflict.t

	End of file			End of file

	$ hg up -C			$ hg up -C
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	updated to "18b51d585961: Add some stuff at the beginning"			updated to "18b51d585961: Add some stuff at the beginning"
	1 other heads for branch "default"			1 other heads for branch "default"
	$ hg merge --tool :merge-local			$ hg merge --tool :merge-local
	merging a			merging a
	2 files updated, 0 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)
	$ cat a			$ cat a
	Start of file			Start of file


	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	3			3
	4			4
	5			5
	Hop we are done.			Hop we are done.


	End of file			End of file

tests/test-copies-chain-merge.t

	- the "q-" branch renaming 'r' to 'v' (through 'w')			- the "q-" branch renaming 'r' to 'v' (through 'w')

	$ case_desc="merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content)"			$ case_desc="merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content)"

	$ hg up 'desc("p-2")'			$ hg up 'desc("p-2")'
	3 files updated, 0 files merged, 2 files removed, 0 files unresolved			3 files updated, 0 files merged, 2 files removed, 0 files unresolved
	$ hg merge 'desc("q-2")' --tool ':union'			$ hg merge 'desc("q-2")' --tool ':union'
	merging v			merging v
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 1 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 "mPQm-0 $case_desc - one way"			$ hg ci -m "mPQm-0 $case_desc - one way"
	$ hg up 'desc("q-2")'			$ hg up 'desc("q-2")'
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("p-2")' --tool ':union'			$ hg merge 'desc("p-2")' --tool ':union'
	merging v			merging v
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 1 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 "mQPm-0 $case_desc - the other way"			$ hg ci -m "mQPm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'			$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
	o mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way			o mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
	\|\			\|\
	+---o mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way			+---o mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
	\| \|/			\| \|/
	6 files updated, 0 files merged, 0 files removed, 0 files unresolved			6 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo "some update" >> d			$ echo "some update" >> d
	$ hg commit -m "g-1: update d"			$ hg commit -m "g-1: update d"
	created new head			created new head
	$ hg up 'desc("d-2")'			$ hg up 'desc("d-2")'
	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("g-1")' --tool :union			$ hg merge 'desc("g-1")' --tool :union
	merging d			merging d
	1 files updated, 0 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 "mDGm-0 $case_desc - one way"			$ hg ci -m "mDGm-0 $case_desc - one way"
	$ hg up 'desc("g-1")'			$ hg up 'desc("g-1")'
	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("d-2")' --tool :union			$ hg merge 'desc("d-2")' --tool :union
	merging d			merging d
	1 files updated, 0 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 "mGDm-0 $case_desc - the other way"			$ hg ci -m "mGDm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'			$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
	@ mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way			@ mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
	\|\			\|\
	+---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way			+---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
	\| \|/			\| \|/

tests/test-merge-internal-tools-pattern.t

	$ hg ci -Am "Adding fourth line v2 (commit 5)"			$ hg ci -Am "Adding fourth line v2 (commit 5)"
	created new head			created new head

	$ echo "[merge-patterns]" > .hg/hgrc			$ echo "[merge-patterns]" > .hg/hgrc
	$ echo "* = internal:union" >> .hg/hgrc			$ echo "* = internal:union" >> .hg/hgrc

	$ hg merge 3			$ hg merge 3
	merging f			merging f
	1 files updated, 0 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)

	$ cat f			$ cat f
	line 1			line 1
	line 2			line 2
	third line			third line
	line 4b			line 4b
	line 4a			line 4a

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31655		Jan 14 2022, 12:48 PM	★	★
Diff 2	31677	rHG60a06b0d0c36c0209169e87a5f425e17e0b1a68e	Jan 14 2022, 12:28 PM	★	★