Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 23535:72c23fa4f52f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 26 Nov 2014 15:16:22 -0500
parents 891aaa7c0c70
children f1b06a8aad42
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Nov 26 14:27:36 2014 -0500
+++ b/mercurial/cmdutil.py	Wed Nov 26 15:16:22 2014 -0500
@@ -2202,7 +2202,9 @@
     # 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(
+                _("failed to mark all new/missing files as added/removed"))
 
     return commitfunc(ui, repo, message, matcher, opts)