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

testing_support/git_test_utils.py

 # 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.
 
 import atexit
 import collections
 import copy
 import datetime
 import hashlib
 import os
@@ skipping 238 matching lines @@
     Args:
       schema - An instance of GitRepoSchema
     """
     self.repo_path = tempfile.mkdtemp(dir=self.BASE_TEMP_DIR)
     self.commit_map = {}
     self._date = datetime.datetime(1970, 1, 1)
 
     self.git('init')
     for commit in schema.walk():
       self._add_schema_commit(commit, schema.data_for(commit.name))
+      self.last_commit = self[commit.name]
     if schema.master:
       self.git('update-ref', 'master', self[schema.master])
 
   def __getitem__(self, commit_name):
     """Gets the hash of a commit by its schema name.
 
     >>> r = GitRepo(GitRepoSchema('A B C'))
     >>> r['B']
     '7381febe1da03b09da47f009963ab7998a974935'
     """
@@ skipping 45 matching lines @@
       if mode and not deleted:
         os.chmod(path, mode)
 
       self.git('add', fname)
 
     rslt = self.git('commit', '--allow-empty', '-m', commit.name, env=env)
     assert rslt.retcode == 0, 'Failed to commit %s' % str(commit)
     self.commit_map[commit.name] = self.git('rev-parse', 'HEAD').stdout.strip()
     self.git('tag', 'tag_%s' % commit.name, self[commit.name])
     if commit.is_branch:
-      self.git('update-ref', 'branch_%s' % commit.name, self[commit.name])
+      self.git('branch', '-f', 'branch_%s' % commit.name, self[commit.name])
 
   def git(self, *args, **kwargs):
     """Runs a git command specified by |args| in this repo."""
     assert self.repo_path is not None
     try:
       with open(os.devnull, 'wb') as devnull:
         output = subprocess.check_output(
           ('git',) + args, cwd=self.repo_path, stderr=devnull, **kwargs)
       return self.COMMAND_OUTPUT(0, output)
     except subprocess.CalledProcessError as e:
@@ skipping 52 matching lines @@
   for the duration of all the tests in the subclass.
   """
   REPO = None
 
   @classmethod
   def setUpClass(cls):
     super(GitRepoReadOnlyTestBase, cls).setUpClass()
     assert cls.REPO is not None
     cls.repo = cls.r_schema.reify()
 
+  def setUp(self):
+    self.repo.git('checkout', '-f', self.repo.last_commit)
+
   @classmethod
   def tearDownClass(cls):
     cls.repo.nuke()
     super(GitRepoReadOnlyTestBase, cls).tearDownClass()
 
 
 class GitRepoReadWriteTestBase(GitRepoSchemaTestBase):
   """Injects a GitRepo object given the schema and content from
   GitRepoSchemaTestBase into TestCase classes which subclass this.
 
   This GitRepo will appear as self.repo, and will be deleted and recreated for
   each test function in the subclass.
   """
   REPO = None
 
   def setUp(self):
     super(GitRepoReadWriteTestBase, self).setUp()
     self.repo = self.r_schema.reify()
 
   def tearDown(self):
     self.repo.nuke()
     super(GitRepoReadWriteTestBase, self).tearDown()