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/737009
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrew Moylan <amoylan@chromium.org>
diff --git a/git_rebase_update.py b/git_rebase_update.py
index 0d8710d..4545ec9 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -161,6 +161,7 @@
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)