Make udiff print reasonable errors while not on a branch.

git_upstream_diff.py

 #!/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
 
 from git_common import current_branch, get_or_create_merge_base, config_list

[agable, 2014/03/26 15:36:24]

Would be good to sort these imports.

[iannucci, 2014/03/26 18:51:11]

Done.

-from git_common import GIT_EXE
+from git_common import GIT_EXE, upstream
 
 def main(args):
   default_args = 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 = current_branch()
+  if not cur or cur == 'HEAD':
+    print 'fatal: cannot perform git-upstream-diff while not on a branch'
+    return 1
+
+  par = upstream(cur)
+  if not par:
+    print 'fatal: branch %s has no configured upstream' % cur

[agable, 2014/03/26 15:36:24]

fatal: branch.%s.merge is not configured
?

[iannucci, 2014/03/26 18:51:11]

Yeah, but it's also ...remote. I'm changing to the standard git error message.

+    return 1
+
   cmd = [GIT_EXE, 'diff', '--patience', '-C', '-C']
   if opts.wordwise:
     cmd += ['--word-diff=color', r'--word-diff-regex=(\w+|[^[:space:]])']
-  cmd += [get_or_create_merge_base(current_branch())]
+  cmd += [get_or_create_merge_base(cur, par)]
 
   cmd += extra_args
 
   subprocess2.check_call(cmd)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))