Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: git_squash_branch.py

Issue 955993006: Handle KeyboardInterrupt consistently in python scripts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: tweek test expectations Created 5 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« clang_format.py ('K') | « git_retry.py ('k') | git_try.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import argparse 6 import argparse
7 import sys 7 import sys
8 8
9 from git_common import squash_current_branch 9 from git_common import squash_current_branch
10 10
11 def main(args): 11 def main(args):
12 parser = argparse.ArgumentParser() 12 parser = argparse.ArgumentParser()
13 parser.add_argument( 13 parser.add_argument(
14 '-m', '--message', metavar='<msg>', default='git squash commit.', 14 '-m', '--message', metavar='<msg>', default='git squash commit.',
15 help='Use the given <msg> as the first line of the commit message.') 15 help='Use the given <msg> as the first line of the commit message.')
16 opts = parser.parse_args(args) 16 opts = parser.parse_args(args)
17 squash_current_branch(opts.message) 17 squash_current_branch(opts.message)
18 return 0
19
18 20
19 if __name__ == '__main__': 21 if __name__ == '__main__':
20 sys.exit(main(sys.argv[1:])) 22 try:
23 sys.exit(main(sys.argv[1:]))
24 except KeyboardInterrupt:
25 sys.stderr.write('interrupted\n')
26 sys.exit(1)
OLDNEW
« clang_format.py ('K') | « git_retry.py ('k') | git_try.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698