mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 10:41:31 +00:00
013731e832
Handle KeyboardInterrupt gracefully rather the printing a backtrace. Most users of these tools don't expect a backtrace when then hit Ctrl-C. Also, fix a few other inconsistencies found in the python startup code of these different scripts: - always call main function 'main' (rather than 'Main') - always return 0 from main function - if main takes args never include argv[0] Review URL: https://codereview.chromium.org/955993006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294250 0039d316-1c4b-4281-b951-d872f2087c98
50 lines
1.3 KiB
Python
Executable File
50 lines
1.3 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# Copyright 2014 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
import argparse
|
|
import sys
|
|
|
|
import subprocess2
|
|
|
|
import git_common as git
|
|
|
|
def main(args):
|
|
default_args = git.config_list('depot-tools.upstream-diff.default-args')
|
|
args = default_args + args
|
|
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('--wordwise', action='store_true', default=False,
|
|
help=(
|
|
'Print a colorized wordwise diff '
|
|
'instead of line-wise diff'))
|
|
opts, extra_args = parser.parse_known_args(args)
|
|
|
|
cur = git.current_branch()
|
|
if not cur or cur == 'HEAD':
|
|
print 'fatal: Cannot perform git-upstream-diff while not on a branch'
|
|
return 1
|
|
|
|
par = git.upstream(cur)
|
|
if not par:
|
|
print 'fatal: No upstream configured for branch \'%s\'' % cur
|
|
return 1
|
|
|
|
cmd = [git.GIT_EXE, 'diff', '--patience', '-C', '-C']
|
|
if opts.wordwise:
|
|
cmd += ['--word-diff=color', r'--word-diff-regex=(\w+|[^[:space:]])']
|
|
cmd += [git.get_or_create_merge_base(cur, par)]
|
|
|
|
cmd += extra_args
|
|
|
|
return subprocess2.check_call(cmd)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
try:
|
|
sys.exit(main(sys.argv[1:]))
|
|
except KeyboardInterrupt:
|
|
sys.stderr.write('interrupted\n')
|
|
sys.exit(1)
|