| OLD | NEW |
| 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 import subprocess2 | 9 import subprocess2 |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 else: | 41 else: |
| 42 # TODO(iannucci): Detect unclean workdir then stash+pop if we need to | 42 # TODO(iannucci): Detect unclean workdir then stash+pop if we need to |
| 43 # teleport to a conflicting portion of history? | 43 # teleport to a conflicting portion of history? |
| 44 run('checkout', '--track', opts.upstream, '-b', opts.branch_name) | 44 run('checkout', '--track', opts.upstream, '-b', opts.branch_name) |
| 45 get_or_create_merge_base(opts.branch_name) | 45 get_or_create_merge_base(opts.branch_name) |
| 46 except subprocess2.CalledProcessError as cpe: | 46 except subprocess2.CalledProcessError as cpe: |
| 47 sys.stdout.write(cpe.stdout) | 47 sys.stdout.write(cpe.stdout) |
| 48 sys.stderr.write(cpe.stderr) | 48 sys.stderr.write(cpe.stderr) |
| 49 return 1 | 49 return 1 |
| 50 sys.stderr.write('Switched to branch %s.\n' % opts.branch_name) | 50 sys.stderr.write('Switched to branch %s.\n' % opts.branch_name) |
| 51 return 0 |
| 51 | 52 |
| 52 | 53 |
| 53 if __name__ == '__main__': # pragma: no cover | 54 if __name__ == '__main__': # pragma: no cover |
| 54 sys.exit(main(sys.argv[1:])) | 55 try: |
| 56 sys.exit(main(sys.argv[1:])) |
| 57 except KeyboardInterrupt: |
| 58 sys.stderr.write('interrupted\n') |
| 59 sys.exit(1) |
| OLD | NEW |