Added remote 'git' branch awareness to 'gclient'

testing_support/fake_repos.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import datetime
 import errno
@@ skipping 70 matching lines @@
       cwd=repo)
   match = re.search(r'(\d+)', out)
   if not match:
     raise Exception('Commit failed', out)
   rev = match.group(1)
   status = subprocess2.check_output(['svn', 'status'], cwd=repo)
   assert len(status) == 0, status
   logging.debug('At revision %s' % rev)
   return rev
 
+def update_ref_git(repo, ref, oldvalue, newvalue=None):
+  args = ['git', 'update-ref', ref, oldvalue]
+  if newvalue is not None:
+    args.append(newvalue)
+  subprocess2.check_call(args, cwd=repo)
+
+def checkout_git(repo, branch=None):
+  """Checks out (creating, if necessary) the target branch."""
+  if branch is None:
+    branch = 'master'
+  returncode = subprocess2.call(['git', 'show-ref', '-q', branch], cwd=repo)
+  if returncode == 0:
+    subprocess2.check_call(['git', 'checkout', '-q', branch], cwd=repo)
+  else:
+    subprocess2.check_call(['git', 'checkout', '-q', '-B', branch], cwd=repo)
+  return branch
 
 def commit_git(repo):
   """Commits the changes and returns the new hash."""
   subprocess2.check_call(['git', 'add', '-A', '-f'], cwd=repo)
   subprocess2.check_call(['git', 'commit', '-q', '--message', 'foo'], cwd=repo)
   rev = subprocess2.check_output(
       ['git', 'show-ref', '--head', 'HEAD'], cwd=repo).split(' ', 1)[0]
   logging.debug('At revision %s' % rev)
   return rev
 
@@ skipping 300 matching lines @@
     self.svn_revs.append(new_tree)
 
   def _set_svn_commit_date(self, revision, date):
     subprocess2.check_output(
         ['svn', 'propset', 'svn:date', '--revprop', '-r', revision, date,
          self.svn_base,
          '--username', self.USERS[0][0],
          '--password', self.USERS[0][1],
          '--non-interactive'])
 
-  def _commit_git(self, repo, tree):
+  def _update_ref_git(self, repo, ref, oldvalue, newvalue=None):
     repo_root = join(self.git_root, repo)
+    update_ref_git(repo_root, ref, oldvalue, newvalue=newvalue)
+
+  def _commit_git(self, repo, tree, branch=None):
+    repo_root = join(self.git_root, repo)
+    checkout_git(repo_root, branch)
     self._genTree(repo_root, tree)
     commit_hash = commit_git(repo_root)
+    checkout_git(repo_root)
     if self.git_hashes[repo][-1]:
       new_tree = self.git_hashes[repo][-1][1].copy()
       new_tree.update(tree)
     else:
       new_tree = tree.copy()
     self.git_hashes[repo].append((commit_hash, new_tree))
 
   def check_port_is_free(self, port):
     sock = socket.socket()
     try:
       sock.connect((self.host, port))
       # It worked, throw.
       assert False, '%d shouldn\'t be bound' % port
     except (socket.error, EnvironmentError):
       pass
     finally:
       sock.close()
 
   def populateSvn(self):
     raise NotImplementedError()
 
   def populateGit(self):
     raise NotImplementedError()
 
 
 class FakeRepos(FakeReposBase):
   """Implements populateSvn() and populateGit()."""
-  NB_GIT_REPOS = 5
+  NB_GIT_REPOS = 6
 
   def populateSvn(self):
     """Creates a few revisions of changes including DEPS files."""
     # Repos
     subprocess2.check_call(
         ['svn', 'checkout', self.svn_base, self.svn_checkout,
          '-q', '--non-interactive', '--no-auth-cache',
          '--username', self.USERS[0][0], '--password', self.USERS[0][1]])
     assert os.path.isdir(join(self.svn_checkout, '.svn'))
     def file_system(rev, DEPS, DEPS_ALT=None):
@@ skipping 246 matching lines @@
   }
 ]
 """ % {
          'git_base': self.git_base,
          'hash1': self.git_hashes['repo_1'][2][0][:7],
          'hash2': self.git_hashes['repo_2'][1][0][:7],
       },
     'origin': 'git/repo_5@3\n',
     })
 
+    # repo_6: basic repository that exists in a non-default Gerrit-like
+    #         location on remote
+    self._commit_git('repo_6', {'origin': 'git/repo_6@1\n'})
+    self._commit_git('repo_6', {'origin': 'git/repo_6@alternate\n'},
+        branch='alternate')
+    self._update_ref_git('repo_6', 'refs/changes/12/1', 'alternate')
+    self._commit_git('repo_6', {'origin': 'git/repo_6@2\n'})
+
 
 class FakeRepoTransitive(FakeReposBase):
   """Implements populateSvn()"""
 
   def populateSvn(self):
     """Creates a few revisions of changes including a DEPS file."""
     # Repos
     subprocess2.check_call(
         ['svn', 'checkout', self.svn_base, self.svn_checkout,
          '-q', '--non-interactive', '--no-auth-cache',
@@ skipping 210 matching lines @@
     fake.set_up_git()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     trial_dir.TrialDir.SHOULD_LEAK.leak = True
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))