[PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

[Martin von Zweigbergk]

+mercurial-devel (sorry, missed that again)

On Mon, Mar 6, 2017 at 9:10 AM, Martin von Zweigbergk
<martinvonz at google.com> wrote:
> On Mon, Mar 6, 2017 at 7:00 AM, Yuya Nishihara <yuya at tcha.org> wrote:
>> On Mon, 27 Feb 2017 16:31:28 -0800, Martin von Zweigbergk via Mercurial-devel wrote:
>>> # HG changeset patch
>>> # User Martin von Zweigbergk <martinvonz at google.com>
>>> # Date 1486973155 28800
>>> #      Mon Feb 13 00:05:55 2017 -0800
>>> # Node ID c88aa4bc36ee81b0837d2949501d6b4fcf825c38
>>> # Parent  ae37f4578e3af6fd4cb7c29c9ab06ad0efd726da
>>> update: allow setting default update check to "noconflict"
>>
>>> @@ -1593,6 +1599,13 @@
>>>              repo, wc, p2, pas, branchmerge, force, mergeancestor,
>>>              followcopies, matcher=matcher, mergeforce=mergeforce)
>>>
>>> +        if updatecheck == 'noconflict':
>>> +            for f, (m, args, msg) in actionbyfile.iteritems():
>>> +                if m not in ('g', 'k', 'r'):
>>> +                    msg = _("uncommitted changes")
>>> +                    hint = _("commit or update --merge to allow merge")
>>> +                    raise error.Abort(msg, hint=hint)
>>
>> Also queued this, thanks.
>
> Thanks.
>
> I'm not sure if you saw Ryan's comment.  I'll address that as a follow-up patch.
>
>> I'm not perfectly sure if this ('g', 'k', 'r') list
>> is exhaustive, but it would go safer side in case it lacks something.
>
> Exactly :-)