git_cl.py - Issue 549513002: Return 1 from git_cl land when you Ctrl-C it in the middle.

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_cl.py

Issue 549513002: Return 1 from git_cl land when you Ctrl-C it in the middle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 3 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_cl.py

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

index 65524207863dc006b2375af2c1b72d3829abd39d..077eab69c465d4c34385dcdd0bb2e5089d264774 100755

--- a/git_cl.py

+++ b/git_cl.py

@@ -2037,6 +2037,7 @@ def SendUpstream(parser, args, cmd):

print 'Failed to push. If this persists, please file a bug.'

return 1

+ killed = False

if pushed_to_pending:

try:

revision = WaitForRealCommit(remote, revision, base_branch, branch)

@@ -2044,6 +2045,7 @@ def SendUpstream(parser, args, cmd):

# real ref.

pushed_to_pending = False

except KeyboardInterrupt:

+ killed = True

pass

Michael Moss 2014/09/05 17:23:25 nit: remove pass

if cl.GetIssue():

@@ -2081,7 +2083,7 @@ def SendUpstream(parser, args, cmd):

if os.path.isfile(hook):

RunCommand([hook, merge_base], error_ok=True)

- return 0

+ return 1 if killed else 0

def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):

« no previous file with comments | « no previous file | no next file » | no next file with comments »