This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D12085 relnotes: add note about changed labels texts
Closed	martinvonz	D12025 graft: attempt to make merge labels more helpful
Closed	martinvonz	D12024 shelve: attempt to make merge labels more helpful
Closed	martinvonz	D12023 histedit: attempt to make merge labels more helpful
Closed	martinvonz	D12022 update: set custom conflict label for base commit
Closed	martinvonz	D12021 merge: set custom conflict label for base commit
Closed	martinvonz	D12020 rebase: set custom conflict label for base commit
Closed	martinvonz	D12019 simplemerge: take over formatting of label from `filemerge`
Closed	martinvonz	D12018 filemerge: pass `simplemerge.MergeInput` to tool functions
Closed	martinvonz	D12017 filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Closed	martinvonz	D12016 filemerge: always define a "base" label
Closed	martinvonz	D12015 filemerge: set default labels a little earlier
Closed	martinvonz	D12014 filemerge: remove unused arguments from `_merge()`
Closed	martinvonz	D12013 simplemerge: take arguments as annotated context objects
Closed	martinvonz	D12012 filemerge: make `labels` a required arg for `_premerge()`
Closed	martinvonz	D12011 filemerge: remove unnecessary check for empty string
Closed	martinvonz	D12010 tests: also test spaces in conflict marker labels

Diff 31711

	if ctx.node() is None:			if ctx.node() is None:
	ctx = ctx.p1()			ctx = ctx.p1()

	props = {b'ctx': ctx}			props = {b'ctx': ctx}
	templateresult = template.renderdefault(props)			templateresult = template.renderdefault(props)

	label = (b'%s:' % label).ljust(pad + 1)			label = (b'%s:' % label).ljust(pad + 1)
	mark = b'%s %s' % (label, templateresult)			mark = b'%s %s' % (label, templateresult)

	if mark:
	mark = mark.splitlines()[0] # split for safety			mark = mark.splitlines()[0] # split for safety

	# 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')			# 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
	return stringutil.ellipsis(mark, 80 - 8)			return stringutil.ellipsis(mark, 80 - 8)


	_defaultconflictlabels = [b'local', b'other']			_defaultconflictlabels = [b'local', b'other']