Give git map-branches extra information behind -v and -vv flags.

git_common.py

 # 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.
 
 # Monkeypatch IMapIterator so that Ctrl-C can kill everything properly.
 # Derived from https://gist.github.com/aljungberg/626518
 import multiprocessing.pool
 from multiprocessing.pool import IMapIterator
 def wrapper(func):
   def wrap(self, timeout=None):
@@ skipping 73 matching lines @@
     # crbug.com/315421
     r'The requested URL returned error: 500 while accessing',
 
     # crbug.com/388876
     r'Connection timed out',
 )
 
 GIT_TRANSIENT_ERRORS_RE = re.compile('|'.join(GIT_TRANSIENT_ERRORS),
                                      re.IGNORECASE)
 
+# Version which for-each-ref format string first supported upstream:track.

[Matt Giuca, 2014/09/01 05:12:50]

This is hard to read and I don't know what it's saying. Can you rewrite it?

[calamity, 2014/09/01 06:53:41]

Done.

+MIN_UPSTREAM_TRACK_GIT_VERSION = (1, 9)
 
 class BadCommitRefException(Exception):
   def __init__(self, refs):
     msg = ('one of %s does not seem to be a valid commitref.' %
            str(refs))
     super(BadCommitRefException, self).__init__(msg)
 
 
 def memoize_one(**kwargs):
   """Memoizes a single-argument pure function.
@@ skipping 325 matching lines @@
     base = actual_merge_base
     manual_merge_base(branch, base, parent)
 
   return base
 
 
 def hash_multi(*reflike):
   return run('rev-parse', *reflike).splitlines()
 
 
-def hash_one(reflike):
-  return run('rev-parse', reflike)
+def hash_one(reflike, short=False):
+  args = ['rev-parse', reflike]
+  if short:
+    args.insert(1, '--short')
+  return run(*args)
 
 
 def in_rebase():
   git_dir = run('rev-parse', '--git-dir')
   return (
     os.path.exists(os.path.join(git_dir, 'rebase-merge')) or
     os.path.exists(os.path.join(git_dir, 'rebase-apply')))
 
 
 def intern_f(f, kind='blob'):
@@ skipping 258 matching lines @@
     return None
   return ret
 
 
 def upstream(branch):
   try:
     return run('rev-parse', '--abbrev-ref', '--symbolic-full-name',
                branch+'@{upstream}')
   except subprocess2.CalledProcessError:
     return None
+
+def normalized_version():

[iannucci, 2014/08/29 18:41:47]

add a docstring, it's not obvious that this is getting the version of the git
client.

[Matt Giuca, 2014/09/01 05:12:50]

Can you rename it to "get_git_version". Maybe then it won't need a docstring.

[calamity, 2014/09/01 06:53:41]

Done.

[calamity, 2014/09/01 06:53:42]

Done. Left the docstring in anyway.

+  version_string = run('--version')
+  version_match = re.search(r'(\d+.)+(\d+)', version_string)
+  version = version_match.group() if version_match else ''
+
+  return tuple(int(x) for x in version.split('.'))
+
+
+def get_all_tracking_info():
+  format_string = (
+      '--format=%(refname:short):%(objectname:short):%(upstream:short):')
+  if normalized_version() >= MIN_UPSTREAM_TRACK_GIT_VERSION:
+    format_string += '%(upstream:track)'
+
+  info_map = {}
+  data = run('for-each-ref', format_string, 'refs/heads')
+  for line in data.splitlines():
+    (branch, branch_hash, upstream_branch, tracking_status) = line.split(':')

[iannucci, 2014/08/29 18:41:47]

won't this be wrong if your git version is < 1.9?

We could fill this info in for < 1.9 by running upstream() on each branch though

[calamity, 2014/09/01 06:53:42]

It makes tracking_status an empty string which then makes ahead and behind None.

upstream() won't work for tracking_status since tracking_status is the [ x
ahead, x behind ] information. To get this in git < 1.9, we'd need to run git
branch -vv and parse out the information there.

That's probably do-able but a touch less safe than this.

Unless you meant wrong in some other way?

[iannucci, 2014/09/02 22:31:27]

I think the .split(':') will explode on the assignment (not enough values to
unpack into tuple)... but now I see that you're adding the extra ':' for both
versions :)

+
+    ahead_match = re.search(r'ahead \d+', tracking_status)
+    ahead = ahead_match.group() if ahead_match else ''

[iannucci, 2014/08/29 18:41:47]

let's cast these to int() or None for this function. it makes more sense than
returning a string

[calamity, 2014/09/01 06:53:42]

Done.

+
+    behind_match = re.search(r'behind \d+', tracking_status)
+    behind = behind_match.group() if behind_match else ''
+
+    info_map[branch] = {
+        'hash': branch_hash,
+        'upstream': upstream_branch,
+        'ahead': ahead,
+        'behind': behind
+    }

[iannucci, 2014/08/29 18:41:47]

let's use a namedtuple for this, instead of a freeform dict

[calamity, 2014/09/01 06:53:42]

Oh, cool!

+  return info_map