2009-06-23 Eric Seidel <eric@webkit.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jun 2009 09:01:36 +0000 (09:01 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jun 2009 09:01:36 +0000 (09:01 +0000)
        Reviewed by Mark Rowe.

        * Scripts/modules/scm.py: Fix commit_with_message to return the commit output.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@44982 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/modules/scm.py

index c393ecd..63ffb10 100644 (file)
@@ -2,6 +2,12 @@
 
         Reviewed by Mark Rowe.
 
+        * Scripts/modules/scm.py: Fix commit_with_message to return the commit output.
+
+2009-06-23  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Mark Rowe.
+
         * Scripts/modules/scm.py: Fix error seen when commiting r44979.
 
 2009-06-18  Eric Seidel  <eric@webkit.org>
index 89cc2cf..51a5609 100644 (file)
@@ -203,8 +203,12 @@ class SVN(SCM):
         return "svn-create-patch"
 
     def commit_with_message(self, message):
-        commit_process = subprocess.Popen('svn commit -F -', stdin=subprocess.PIPE, shell=True)
-        commit_process.communicate(message)
+        commit_process = subprocess.Popen('svn commit -F -', stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=True)
+        (out, error) = commit_process.communicate(message)
+        return_code = commit_process.wait()
+        if return_code:
+            log("Commit failure: %d" % return_code) # We really should handle the failure
+        return out
 
 # All git-specific logic should go here.
 class Git(SCM):
@@ -266,7 +270,7 @@ class Git(SCM):
 
     def commit_with_message(self, message):
         self.commit_locally_with_message(message)
-        self.push_local_commits_to_server()
+        return self.push_local_commits_to_server()
 
     # Git-specific methods: