Add git-map and git-short-map to depot_tools.

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 152 matching lines @@
   COMMIT_E = {
     'some/files/file2': {'data': 'file2 - merged'},
   }
 
   COMMIT_D = {
     'some/files/file2': {'data': 'file2 - vanilla\nfile2 - merged'},
   }
 
   def testHashes(self):
     ret = self.repo.run(
-      self.gc.hashes, *[
+      self.gc.hash_multi, *[
         'master',
         'master~3',
         self.repo['E']+'~',
         self.repo['D']+'^2',
         'tag_C^{}',
       ]
     )
     self.assertEqual([
       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']
+    )
+
+  def testCurrentBranch(self):
+    self.repo.git('checkout', 'branch_D')
+    self.assertEqual(self.repo.run(self.gc.current_branch), 'branch_D')
+
+  def testBranches(self):
+    self.assertEqual(self.repo.run(set, self.gc.branches()),
+                     set(('branch_D', 'root_A')))
+
+  def testTags(self):
+    self.assertEqual(set(self.repo.run(self.gc.tags)),
+                     {'tag_'+l for l in 'ABCDE'})
 
   def testParseCommitrefs(self):
     ret = self.repo.run(
       self.gc.parse_commitrefs, *[
         'master',
         'master~3',
         self.repo['E']+'~',
         self.repo['D']+'^2',
         'tag_C^{}',
       ]
@@ skipping 69 matching lines @@
     self.assertEquals(data, self.repo.git('cat-file', 'blob', data_hash).stdout)
 
   def testMkTree(self):
     tree = {}
     for i in 1, 2, 3:
       name = 'file%d' % i
       tree[name] = ('100644', 'blob', self._intern_data(name))
     tree_hash = self.repo.run(self.gc.mktree, tree)
     self.assertEquals('37b61866d6e061c4ba478e7eb525be7b5752737d', tree_hash)
 
+  def testConfig(self):
+    self.repo.git('config', '--add', 'happy.derpies', 'food')
+    self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+                      ['food'])
+    self.assertEquals(self.repo.run(self.gc.config_list, 'sad.derpies'), [])
+
+    self.repo.git('config', '--add', 'happy.derpies', 'cat')
+    self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+                      ['food', 'cat'])
+
+  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')
+
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main(
     os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')
   ))