commit 56a624ac5686f8b7ec0d69f3143bb83179c2bacc
author iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 26 21:23:09 2014 +0000
committer iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 26 21:23:09 2014 +0000
tree a63fb33fe06ae8d910a04eccd9f2114d17625e76
parent e88578a09cd68f1b9ac8cf6eda4bc79e9f5991ef

Fix the print of the rebase error message, and make the output prettier too.

For some reason .output doesn't throw an AttributeError, but returns None ,
instead. .stdout is the correct attribute.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212493003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259695 0039d316-1c4b-4281-b951-d872f2087c98

git_common.py

diff --git a/git_common.py b/git_common.py
index 284c18c..80398ba 100644
--- a/git_common.py
+++ b/git_common.py
@@ -432,7 +432,7 @@
   except subprocess2.CalledProcessError as cpe:
     if abort:
       run('rebase', '--abort')
-    return RebaseRet(False, cpe.output)
+    return RebaseRet(False, cpe.stdout)
 
 
 def remove_merge_base(branch):

git_rebase_update.py

diff --git a/git_rebase_update.py b/git_rebase_update.py
index 9d353c6..37f3066 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -137,6 +137,9 @@
       else:
         # rebase and leave in mid-rebase state.
         git.rebase(parent, start_hash, branch)
+        print "Failed!"
+        print
+        print "Here's what git-rebase had to say:"
         print squash_ret.message
         print
         print textwrap.dedent(