# HG changeset patch
# User Regis Desgroppes <regis.desgroppes@nokia.com>
# Date 1306876924 18000
# Node ID 278a4e0fdfedb074d8140382b06628a17b7d7c3b
# Parent  37901cf0680bca44d677e8e7ae447f441bd8c8f5
subrepo: svn abort now depends on exit code (issue2833)

diff -r 37901cf0680b -r 278a4e0fdfed mercurial/subrepo.py
--- a/mercurial/subrepo.py	Tue May 31 12:41:22 2011 +0200
+++ b/mercurial/subrepo.py	Tue May 31 16:22:04 2011 -0500
@@ -544,11 +544,13 @@
         env['LC_MESSAGES'] = 'C'
         p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                             universal_newlines=True, env=env)
+                              universal_newlines=True, env=env)
         stdout, stderr = p.communicate()
         stderr = stderr.strip()
+        if p.returncode:
+            raise util.Abort(stderr or 'exited with code %d' % p.returncode)
         if stderr:
-            raise util.Abort(stderr)
+            self._ui.warn(stderr + '\n')
         return stdout
 
     @propertycache