This is an archive of the discontinued Mercurial Phabricator instance.

	flaglist = 'all mark unmark list no_status re_merge'.split()			flaglist = 'all mark unmark list no_status re_merge'.split()
	all, mark, unmark, show, nostatus, remerge = \			all, mark, unmark, show, nostatus, remerge = \
	[opts.get(o) for o in flaglist]			[opts.get(o) for o in flaglist]

	actioncount = len(list(filter(None, [show, mark, unmark, remerge])))			actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
	if actioncount > 1:			if actioncount > 1:
	raise error.Abort(_("too many actions specified"))			raise error.Abort(_("too many actions specified"))
	elif (actioncount == 0			elif (actioncount == 0
	and ui.config('commands', 'resolve.explicit-re-merge')):			and ui.configbool('commands', 'resolve.explicit-re-merge')):
	hint = _('use --mark, --unmark, --list or --re-merge')			hint = _('use --mark, --unmark, --list or --re-merge')
	raise error.Abort(_('no action specified'), hint=hint)			raise error.Abort(_('no action specified'), hint=hint)
	if pats and all:			if pats and all:
	raise error.Abort(_("can't specify --all and patterns"))			raise error.Abort(_("can't specify --all and patterns"))
	if not (all or pats or show or mark or unmark):			if not (all or pats or show or mark or unmark):
	raise error.Abort(_('no files or directories specified'),			raise error.Abort(_('no files or directories specified'),
	hint=('use --all to re-merge all unresolved files'))			hint=('use --all to re-merge all unresolved files'))

resolve: ui.config -> ui.configbool, for better validationClosedPublic