This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D12119 narrow: allow merging non-conflicting change outside of the narrow spec
Closed	marmoute	D12118 merge-actions: add some information about the "changes" the action do
Closed	marmoute	D12117 merge-actions: have an attribute for narrow safetiness
Closed	marmoute	D12116 merge-actions: add an explicite "no_op" attribute
Closed	marmoute	D12115 merge-actions: gather all created action into a set
Closed	marmoute	D12114 merge-actions: make merge action a full featured object
Closed	marmoute	D12113 convert: use the merge action constant
Closed	marmoute	D12112 large-file: use the merge action constant
Closed	marmoute	D12111 merge: stop using merge action for pathconflict option
Closed	marmoute	D12110 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12109 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12108 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12107 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12106 merge: break up two not-so-one-liner for extra readability
Closed	marmoute	D12105 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12104 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12103 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12102 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12101 merge: break up a not-so-one-liner for readability

Diff 32059

	_unpack = struct.unpack			_unpack = struct.unpack


	def _getcheckunknownconfig(repo, section, name):			def _getcheckunknownconfig(repo, section, name):
	config = repo.ui.config(section, name)			config = repo.ui.config(section, name)
	valid = [b'abort', b'ignore', b'warn']			valid = [b'abort', b'ignore', b'warn']
	if config not in valid:			if config not in valid:
	validstr = b', '.join([b"'" + v + b"'" for v in valid])			validstr = b', '.join([b"'" + v + b"'" for v in valid])
	raise error.ConfigError(			msg = _(b"%s.%s not valid ('%s' is none of %s)")
	_(b"%s.%s not valid ('%s' is none of %s)")			msg %= (section, name, config, validstr)
	% (section, name, config, validstr)			raise error.ConfigError(msg)
	)
	return config			return config


	def _checkunknownfile(repo, wctx, mctx, f, f2=None):			def _checkunknownfile(repo, wctx, mctx, f, f2=None):
	if wctx.isinmemory():			if wctx.isinmemory():
	# Nothing to do in IMM because nothing in the "working copy" can be an			# Nothing to do in IMM because nothing in the "working copy" can be an
	# unknown file.			# unknown file.
	#			#