Commit bfc4082f authored by Andrew Moylan's avatar Andrew Moylan Committed by Commit Bot

Flush stdout before squash attempt

This change inserts a flush after "..." in lines like:

  Failed! Attempting to squash mybranch ... Failed!
and:
  Failed! Attempting to squash mybranch ... Success!

This way the user can follow the progress better and has an indication
of why the rebase is taking longer than they might expect.

Bug:
Change-Id: Ie04db2879fccd363d7b0f13b7a5217f1c13fd0e2
Reviewed-on: https://chromium-review.googlesource.com/737009Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrew Moylan <amoylan@chromium.org>
parent 83fd81f8
......@@ -161,6 +161,7 @@ def rebase_branch(branch, parent, start_hash):
if not rebase_ret.success:
# TODO(iannucci): Find collapsible branches in a smarter way?
print "Failed! Attempting to squash", branch, "...",
sys.stdout.flush()
squash_branch = branch+"_squash_attempt"
git.run('checkout', '-b', squash_branch)
git.squash_current_branch(merge_base=start_hash)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment