git_rebase_update.py - Issue 212493003: Fix the print of the rebase error message, and make the output prettier too.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_rebase_update.py

Issue 212493003: Fix the print of the rebase error message, and make the output prettier too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: git_rebase_update.py

diff --git a/git_rebase_update.py b/git_rebase_update.py

index 9d353c6de996d9c3a80f56ef687672b060c8ea4f..37f306658188e688cc6cdccc1341b375307b3c14 100755

--- a/git_rebase_update.py

+++ b/git_rebase_update.py

@@ -137,6 +137,9 @@ def rebase_branch(branch, parent, start_hash):

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 textwrap.dedent(

« no previous file with comments | « git_common.py ('k') | no next file » | no next file with comments »