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

tests/git_common_test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Unit tests for git_common.py"""
 
 import binascii
 import collections
 import os
@@ skipping 189 matching lines @@
       self.repo['D'],
       self.repo['A'],
       self.repo['B'],
       self.repo['E'],
       self.repo['C'],
     ], ret)
     self.assertEquals(
       self.repo.run(self.gc.hash_one, 'branch_D'),
       self.repo['D']
     )
+    self.assertTrue(self.repo['D'].startswith(
+        self.repo.run(self.gc.hash_one, 'branch_D', short=True)))
 
   def testStream(self):
     items = set(self.repo.commit_map.itervalues())
 
     def testfn():
       for line in self.gc.run_stream('log', '--format=%H').xreadlines():
         line = line.strip()
         self.assertIn(line, items)
         items.remove(line)
 
@@ skipping 139 matching lines @@
     self.assertEquals('catfood', self.repo.run(self.gc.root))
 
   def testUpstream(self):
     self.repo.git('commit', '--allow-empty', '-am', 'foooooo')
     self.assertEquals(self.repo.run(self.gc.upstream, 'bobly'), None)
     self.assertEquals(self.repo.run(self.gc.upstream, 'master'), None)
     self.repo.git('checkout', '-tb', 'happybranch', 'master')
     self.assertEquals(self.repo.run(self.gc.upstream, 'happybranch'),
                       'master')
 
+  def testNormalizedVersion(self):
+    self.assertTrue(all(
+        isinstance(x, int) for x in self.repo.run(self.gc.get_git_version)))
+
+  def testGetAllTrackingInfo(self):
+    self.repo.git('commit', '--allow-empty', '-am', 'foooooo')
+    self.repo.git('checkout', '-tb', 'happybranch', 'master')
+    self.repo.git('commit', '--allow-empty', '-am', 'foooooo')
+    self.repo.git('checkout', '-tb', 'child', 'happybranch')
+
+    self.repo.git('checkout', '-tb', 'to_delete', 'master')
+    self.repo.git('checkout', '-tb', 'parent_gone', 'to_delete')
+    self.repo.git('branch', '-D', 'to_delete')
+
+    actual = self.repo.run(self.gc.get_all_tracking_info)
+    supports_track = (
+        self.repo.run(self.gc.get_git_version)
+        >= self.gc.MIN_UPSTREAM_TRACK_GIT_VERSION)
+
+    expected = {
+        'happybranch': (
+            self.repo.run(self.gc.hash_one, 'happybranch', short=True),
+            'master',
+            1 if supports_track else None,
+            None
+        ),
+        'child': (
+            self.repo.run(self.gc.hash_one, 'child', short=True),
+            'happybranch',
+            None,
+            None
+        ),
+        'master': (
+            self.repo.run(self.gc.hash_one, 'master', short=True),
+            '',
+            None,
+            None
+        ),
+        '': None,
+        'parent_gone': (
+            self.repo.run(self.gc.hash_one, 'parent_gone', short=True),
+            'to_delete',
+            1 if supports_track else None,
+            None
+        ),
+        'to_delete': None
+    }
+    self.assertEquals(expected, actual)
+
 
 class GitMutableStructuredTest(git_test_utils.GitRepoReadWriteTestBase,
                                GitCommonTestBase):
   REPO_SCHEMA = """
   A B C D E F G
     B H I J K
           J L
 
   X Y Z
 
@@ skipping 274 matching lines @@
 
       self.assertEquals(self.repo.git('status', '--porcelain').stdout, STATUS_1)
 
     self.repo.run(inner)
 
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main(
     os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')
   ))