This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	phillco	D444 merge: move some of the logic in batchget() to workingfilectx
Closed	phillco	D404 filemerge: add _restorebackup
Closed	phillco	D403 filemerge: reduce creation of tempfiles until needed
Closed	phillco	D401 filemerge: add `_workingpath`
Closed	phillco	D400 filemerge: move a util copy call to filectx.write
Closed	phillco	D399 filemerge: eliminate most uses of tempfiles
Closed	phillco	D388 filemerge: extract _maketemp and _makebackup
Closed	phillco	D521 simplemerge: refactor _picklabels to be more compact
Closed	phillco	D520 simplemerge: remove check for null context

Diff 1301

	msg = _("%s looks like a binary file.") % path			msg = _("%s looks like a binary file.") % path
	if not opts.get('quiet'):			if not opts.get('quiet'):
	ui.warn(_('warning: %s\n') % msg)			ui.warn(_('warning: %s\n') % msg)
	if not opts.get('text'):			if not opts.get('text'):
	raise error.Abort(msg)			raise error.Abort(msg)
	return text			return text

	def _picklabels(defaults, overrides):			def _picklabels(defaults, overrides):
	name_a, name_b, name_base = defaults

	if len(overrides) > 0:
	name_a = overrides[0]
	if len(overrides) > 1:
	name_b = overrides[1]
	if len(overrides) > 2:
	name_base = overrides[2]
	if len(overrides) > 3:			if len(overrides) > 3:
	raise error.Abort(_("can only specify three labels."))			raise error.Abort(_("can only specify three labels."))
				result = defaults[:]
	return [name_a, name_b, name_base]			for i, override in enumerate(overrides):
				result[i] = override
				return result

	def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):			def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
	"""Performs the simplemerge algorithm.			"""Performs the simplemerge algorithm.

	The merged result is written into `localctx`.			The merged result is written into `localctx`.
	"""			"""
	def readctx(ctx):			def readctx(ctx):
	# Merges were always run in the working copy before, which means			# Merges were always run in the working copy before, which means