This is an archive of the discontinued Mercurial Phabricator instance.

To people using the merge-tools.<tool>.premerge=keep* feature: what is the feature for? Is it so the merge tool can parse the markers? Because no current merge tools understand the new conflict style, of course. Is there another reason to have this feature (yet)?

In D9606#144553, @martinvonz wrote:

To people using the merge-tools.<tool>.premerge=keep* feature: what is the feature for? Is it so the merge tool can parse the markers? Because no current merge tools understand the new conflict style, of course. Is there another reason to have this feature (yet)?

Ah, @spectral explained to me that they use vim (the plain editor, not vimdiff or anything) as a "merge tool", just so they get to do the conflict resolution synchronously, without getting dropped to the command line. So please proceed with reviewing this patch :)

pulkit accepted this revision.Dec 17 2020, 5:50 AM

This revision is now accepted and ready to land.Dec 17 2020, 5:50 AM

martinvonz added a commit: rHG3ca5ca380a34: filemerge: add support for the new "mergediff" marker style to premerge.Dec 17 2020, 6:57 AM

Closed by commit rHG3ca5ca380a34: filemerge: add support for the new "mergediff" marker style to premerge (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/filemerge.py (11 lines)
M			mercurial/helptext/config.txt (13 lines)
M			relnotes/next (4 lines)
M			tests/test-merge-tools.t (40 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24275		Dec 14 2020, 9:37 PM	★	★
Diff 2	24276		Dec 15 2020, 1:00 AM	★	★
Diff 3	24336	rHG3ca5ca380a3477a81402947e23fc50d13a4bd9d9	Dec 14 2020, 9:09 PM	★	★

Commit	Parents	Author	Summary	Date
64b7e7c4f27a	d6afa9c149c3	Martin von Zweigbergk		Dec 14 2020, 9:09 PM

Diff 24276

mercurial/filemerge.py

	def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):			def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
	tool, toolpath, binary, symlink, scriptfn = toolconf			tool, toolpath, binary, symlink, scriptfn = toolconf
	if symlink or fcd.isabsent() or fco.isabsent():			if symlink or fcd.isabsent() or fco.isabsent():
	return 1			return 1
	unused, unused, unused, back = files			unused, unused, unused, back = files

	ui = repo.ui			ui = repo.ui

	validkeep = [b'keep', b'keep-merge3']			validkeep = [b'keep', b'keep-merge3', b'keep-mergediff']

	# do we attempt to simplemerge first?			# do we attempt to simplemerge first?
	try:			try:
	premerge = _toolbool(ui, tool, b"premerge", not binary)			premerge = _toolbool(ui, tool, b"premerge", not binary)
	except error.ConfigError:			except error.ConfigError:
	premerge = _toolstr(ui, tool, b"premerge", b"").lower()			premerge = _toolstr(ui, tool, b"premerge", b"").lower()
	if premerge not in validkeep:			if premerge not in validkeep:
	_valid = b', '.join([b"'" + v + b"'" for v in validkeep])			_valid = b', '.join([b"'" + v + b"'" for v in validkeep])
	raise error.ConfigError(			raise error.ConfigError(
	_(b"%s.premerge not valid ('%s' is neither boolean nor %s)")			_(b"%s.premerge not valid ('%s' is neither boolean nor %s)")
	% (tool, premerge, _valid)			% (tool, premerge, _valid)
	)			)

	if premerge:			if premerge:
	if premerge == b'keep-merge3':			mode = b'merge'
				if premerge in {b'keep-merge3', b'keep-mergediff'}:
	if not labels:			if not labels:
	labels = _defaultconflictlabels			labels = _defaultconflictlabels
	if len(labels) < 3:			if len(labels) < 3:
	labels.append(b'base')			labels.append(b'base')
	r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)			if premerge == b'keep-mergediff':
				mode = b'mergediff'
				r = simplemerge.simplemerge(
				ui, fcd, fca, fco, quiet=True, label=labels, mode=mode
				)
	if not r:			if not r:
	ui.debug(b" premerge successful\n")			ui.debug(b" premerge successful\n")
	return 0			return 0
	if premerge not in validkeep:			if premerge not in validkeep:
	# restore from backup and try again			# restore from backup and try again
	_restorebackup(fcd, back)			_restorebackup(fcd, back)
	return 1 # continue merging			return 1 # continue merging

mercurial/helptext/config.txt

	Some operations define custom labels to assist with identifying the revisions,			Some operations define custom labels to assist with identifying the revisions,
	accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If custom			accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If custom
	labels are not available, these will be ``local``, ``other``, and ``base``,			labels are not available, these will be ``local``, ``other``, and ``base``,
	respectively.			respectively.
	(default: ``$local $base $other``)			(default: ``$local $base $other``)

	``premerge``			``premerge``
	Attempt to run internal non-interactive 3-way merge tool before			Attempt to run internal non-interactive 3-way merge tool before
	launching external tool. Options are ``true``, ``false``, ``keep`` or			launching external tool. Options are ``true``, ``false``, ``keep``,
	``keep-merge3``. The ``keep`` option will leave markers in the file if the			``keep-merge3``, or ``keep-mergediff`` (experimental). The ``keep`` option
	premerge fails. The ``keep-merge3`` will do the same but include information			will leave markers in the file if the premerge fails. The ``keep-merge3``
	about the base of the merge in the marker (see internal :merge3 in			will do the same but include information about the base of the merge in the
	:hg:`help merge-tools`).			marker (see internal :merge3 in :hg:`help merge-tools`). The
	(default: True)			``keep-mergediff`` option is similar but uses a different marker style
				(see internal :merge3 in :hg:`help merge-tools`). (default: True)

	``binary``			``binary``
	This tool can merge binary files. (default: False, unless tool			This tool can merge binary files. (default: False, unless tool
	was selected by file pattern match)			was selected by file pattern match)

	``symlink``			``symlink``
	This tool can merge symlinks. (default: False)			This tool can merge symlinks. (default: False)

relnotes/next

	operations has been further reduced.			operations has been further reduced.

	* There is a new internal merge tool called `internal:mergediff` (can			* There is a new internal merge tool called `internal:mergediff` (can
	be set as the value for the `merge` config in the `[ui]`			be set as the value for the `merge` config in the `[ui]`
	section). It resolves merges the same was as `internal:merge` and			section). It resolves merges the same was as `internal:merge` and
	`internal:merge3`, but it shows conflicts differently. Instead of			`internal:merge3`, but it shows conflicts differently. Instead of
	showing 2 or 3 snapshots of the conflicting pieces of code, it			showing 2 or 3 snapshots of the conflicting pieces of code, it
	shows one snapshot and a diff. This may be useful when at least one			shows one snapshot and a diff. This may be useful when at least one
	side of the conflict is similar to the base.			side of the conflict is similar to the base. The new marker style
				is also supported by "premerge" as
				`merge-tools.<tool>.premerge=keep-mergediff`.

	== New Experimental Features ==			== New Experimental Features ==

	* `experimental.single-head-per-branch:public-changes-only` can be used			* `experimental.single-head-per-branch:public-changes-only` can be used
	restrict the single head check to public revision. This is useful for			restrict the single head check to public revision. This is useful for
	overlay repository that have both a publishing and non-publishing view			overlay repository that have both a publishing and non-publishing view
	of the same storage.			of the same storage.

tests/test-merge-tools.t

	=======			=======
	revision 4			revision 4
	>>>>>>> merge rev: 81448d39c9a0 - test: revision 4			>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	R f			R f

				premerge=keep-mergediff keeps conflict markers with base content:

				$ beforemerge
				[merge-tools]
				false.whatever=
				true.priority=1
				true.executable=cat
				# hg update -C 1
				$ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff
				merging f
				<<<<<<<
				------- base
				+++++++ working copy: ef83787e2614 - test: revision 1
				-revision 0
				+revision 1
				space
				======= merge rev: 81448d39c9a0 - test: revision 4
				revision 4
				>>>>>>>
				revision 0
				space
				revision 4
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ aftermerge
				# cat f
				<<<<<<<
				------- base
				+++++++ working copy: ef83787e2614 - test: revision 1
				-revision 0
				+revision 1
				space
				======= merge rev: 81448d39c9a0 - test: revision 4
				revision 4
				>>>>>>>
				# hg stat
				M f
				# hg resolve --list
				R f

	premerge=keep respects ui.mergemarkers=basic:			premerge=keep respects ui.mergemarkers=basic:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: add support for the new "mergediff" marker style to premergeClosedPublic

Details

Diff Detail

Event Timeline