Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: svn abort now depends on exit code (issue2833) stable
authorRegis Desgroppes <regis.desgroppes@nokia.com>
Tue, 31 May 2011 16:22:04 -0500
branchstable
changeset 14505 90ef40bf97e3
parent 14504 c59968e8b579
child 14506 733af5d9f6b2
subrepo: svn abort now depends on exit code (issue2833)
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Tue May 24 17:16:31 2011 -0500
+++ b/mercurial/subrepo.py	Tue May 31 16:22:04 2011 -0500
@@ -540,11 +540,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
mercurial