This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	valentin.gatienbaron	D4379 resolve: add config to make hg resolve not re-merge by default
Closed	valentin.gatienbaron	D4378 resolve: add a flag for the default behavior of re-merging
Closed	valentin.gatienbaron	D4377 resolve: make condition clearer, and able to handle a new flag

Diff 10575

	"""			"""

	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	confirm = ui.configbool('commands', 'resolve.confirm')			confirm = ui.configbool('commands', 'resolve.confirm')
	flaglist = 'all mark unmark list no_status'.split()			flaglist = 'all mark unmark list no_status'.split()
	all, mark, unmark, show, nostatus = \			all, mark, unmark, show, nostatus = \
	[opts.get(o) for o in flaglist]			[opts.get(o) for o in flaglist]

	if (show and (mark or unmark)) or (mark and unmark):			if len(list(filter(None, [show, mark, unmark]))) > 1:
	raise error.Abort(_("too many options specified"))			raise error.Abort(_("too many options specified"))
	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'))

	if confirm:			if confirm: