Added remote 'git' branch awareness to 'gclient'

tests/gclient_smoketest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 10 matching lines @@
 sys.path.insert(0, ROOT_DIR)
 
 from testing_support.fake_repos import join, write
 from testing_support.fake_repos import FakeReposTestBase, FakeRepoTransitive
 
 import subprocess2
 
 GCLIENT_PATH = os.path.join(ROOT_DIR, 'gclient')
 COVERAGE = False
 
-
 class GClientSmokeBase(FakeReposTestBase):
   def setUp(self):
     super(GClientSmokeBase, self).setUp()
     # Make sure it doesn't try to auto update when testing!
     self.env = os.environ.copy()
     self.env['DEPOT_TOOLS_UPDATE'] = '0'
 
   def gclient(self, cmd, cwd=None):
     if not cwd:
       cwd = self.root_dir
@@ skipping 1024 matching lines @@
            'src/repo2: %(base)srepo_2@%(hash2)s\n'
            'src/repo2/repo_renamed: %(base)srepo_3@%(hash3)s\n' %
           {
             'base': self.git_base,
             'hash1': self.githash('repo_1', 2),
             'hash2': self.githash('repo_2', 1),
             'hash3': self.githash('repo_3', 2),
           })
     self.check((out, '', 0), results)
 
+  def testNonstandardRemoteRef(self):
+    if not self.enabled:
+      return
+    # Very Gerrit-y
+    self.gclient(['config', self.git_base + 'repo_6@refs/changes/12/1',
+                  '--name', 'src'])
+    self.gclient(['sync', '--deps', 'mac'])
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    out = ('src: %(base)srepo_6@refs/changes/12/1\n' %
+          {
+            'base': self.git_base,
+          })
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(base)srepo_6@%(hash6)s\n' %
+          {
+            'base': self.git_base,
+            'hash6': self.githash('repo_6', 2),
+          })
+    self.check((out, '', 0), results)
 
 class GClientSmokeGITMutates(GClientSmokeBase):
   """testRevertAndStatus mutates the git repo so move it to its own suite."""
   def setUp(self):
     super(GClientSmokeGITMutates, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_git()
 
   def testRevertAndStatus(self):
     if not self.enabled:
       return
@@ skipping 337 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()