[PATCH 5 of 9 V2] commit: abort if --addremove is specified, but fails

[Martin von Zweigbergk]

On Sat Nov 29 2014 at 9:53:38 PM Matt Harbison <matt_harbison at yahoo.com>
wrote:

> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1417032982 18000
> #      Wed Nov 26 15:16:22 2014 -0500
> # Node ID 31e3071ecdb39568755995b21e4961a7e77cee49
> # Parent  9559f266ac03e53d20b2a2035bf5e417f37b79d3
> commit: abort if --addremove is specified, but fails
>
> This will be required when subrepo support is added, in order to ensure
> consistent commits when a subrepo flavor doesn't support addremove.
>
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -2200,7 +2200,8 @@
>      # extract addremove carefully -- this function can be called from a
> command
>      # that doesn't support addremove
>      if opts.get('addremove'):
> -        scmutil.addremove(repo, matcher, opts)
> +        if scmutil.addremove(repo, matcher, opts) != 0:
> +            raise util.Abort(_("addremove failed"))


Do you think something like "failed to mark new/missing files as
added/removed" makes more sense to the user? (Taken from 'hg commit
--help'.)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141202/2f8ffafa/attachment.html>