This is an archive of the discontinued Mercurial Phabricator instance.

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 31676

	from . import (			from . import (
	error,			error,
	mdiff,			mdiff,
	pycompat,			pycompat,
	)			)
	from .utils import stringutil			from .utils import stringutil


	class CantReprocessAndShowBase(Exception):
	pass


	def intersect(ra, rb):			def intersect(ra, rb):
	"""Given two ranges return the range where they intersect or None.			"""Given two ranges return the range where they intersect or None.

	>>> intersect((0, 10), (0, 6))			>>> intersect((0, 10), (0, 6))
	(0, 6)			(0, 6)
	>>> intersect((0, 10), (5, 15))			>>> intersect((0, 10), (5, 15))
	(5, 10)			(5, 10)
	>>> intersect((0, 10), (10, 15))			>>> intersect((0, 10), (10, 15))

	or stringutil.binary(btext)			or stringutil.binary(btext)
	):			):
	raise error.Abort(b"don't know how to merge binary files")			raise error.Abort(b"don't know how to merge binary files")
	simplemerge.Merge3Text.__init__(			simplemerge.Merge3Text.__init__(
	self, basetext, atext, btext, base, a, b			self, basetext, atext, btext, base, a, b
	)			)


	CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase


	def split_lines(t):			def split_lines(t):
	return util.stringio(t).readlines()			return util.stringio(t).readlines()


	############################################################			############################################################
	# test case data from the gnu diffutils manual			# test case data from the gnu diffutils manual
	# common base			# common base
	TZU = split_lines(			TZU = split_lines(