2011-04-05 MORITA Hajime <morrita@google.com>

        Reviewed by Adam Barth.

        webkit-patch should print git's stderr when git svn dcommit fail
        http://webkit.org/b/57861

        * Scripts/webkitpy/common/checkout/scm.py:

git-svn-id: svn://svn.chromium.org/blink/trunk@82978 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Tools/ChangeLog

+2011-04-05  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch should print git's stderr when git svn dcommit fail
+        http://webkit.org/b/57861
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2011-04-05  Mihai Parparita  <mihaip@chromium.org>
 
         Reviewed by Tony Chang.

third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive.py

@@ -81,6 +81,11 @@ class ScriptError(Exception):
         self.output = output
         self.cwd = cwd
 
+    def __str__(self):
+        if self.output:
+            return self.message + "\n" + self.output
+        return self.message
+
     def message_with_output(self, output_limit=500):
         if self.output:
             if output_limit and len(self.output) > output_limit:

third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -199,3 +199,18 @@ class ExecutiveTest(unittest.TestCase):
         self.assertTrue(executive.check_running_pid(os.getpid()))
         # Maximum pid number on Linux is 32768 by default
         self.assertFalse(executive.check_running_pid(100000))
+
+
+class ScriptErrorTest(unittest.TestCase):
+
+    def test_str_with_message(self):
+        try:
+            raise ScriptError(message="message")
+        except ScriptError, e:
+            self.assertEqual(str(e), "message")
+
+    def test_str_without_message(self):
+        try:
+            raise ScriptError(script_args=["echo", "hello"], exit_code=1, cwd="./", output="Out")
+        except ScriptError, e:
+            self.assertEqual(str(e), "Failed to run \"['echo', 'hello']\" exit_code: 1 cwd: ./\nOut""")