Handle branch or commit refs in the url for unmanaged git solutions

gclient_scm.py

 # 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.
 
 """Gclient-specific SCM-specific operations."""
 
 from __future__ import print_function
 
 import errno
 import logging
@@ skipping 313 matching lines @@
     # If a dependency is not pinned, track the default remote branch.
     default_rev = 'refs/remotes/%s/master' % self.remote
     url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
     rev_str = ""
     revision = deps_revision
     managed = True
     if options.revision:
       # Override the revision number.
       revision = str(options.revision)
     if revision == 'unmanaged':
-      revision = None
+      # Check again for a revision in case an initial ref was specified in the url,

[iannucci, 2014/05/23 18:06:58]

80 cols?

[Romain Pokrzywka, 2014/05/23 21:15:45]

indeed, will fix

+      # for example bla.git@refs/heads/custombranch
+      url, revision = gclient_utils.SplitUrlRevision(self.url)

[iannucci, 2014/05/23 18:06:58]

isn't this this same as

revision = deps_revision

?

[Romain Pokrzywka, 2014/05/23 21:15:45]

Correct, thanks for catching that. The second call to SplitUrlRevision is
unneeded then, will replace.

       managed = False
     if not revision:
       revision = default_rev
 
     if gclient_utils.IsDateRevision(revision):
       # Date-revisions only work on git-repositories if the reflog hasn't
       # expired yet. Use rev-list to get the corresponding revision.
       #  git rev-list -n 1 --before='time-stamp' branchname
       if options.transitive:
         self.Print('Warning: --transitive only works for SVN repositories.')
@@ skipping 467 matching lines @@
       gclient_utils.safe_makedirs(self.checkout_path)
       gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
                                 os.path.join(self.checkout_path, '.git'))
     except:
       traceback.print_exc(file=self.out_fh)
       raise
     finally:
       if os.listdir(tmp_dir):
         self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
       gclient_utils.rmtree(tmp_dir)
-    if revision.startswith('refs/heads/'):
-      self._Run(
-          ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
-    else:
+    self._Run(['checkout', '--quiet', revision.replace('refs/heads/', '')],

[iannucci, 2014/05/23 18:06:58]

tbh, this '--quiet' option can be problematic, especially on windows (which can
take a very long time to checkout and has no output). I would rather remove it
and get rid of the if statement below.

[Romain Pokrzywka, 2014/05/23 21:15:45]

Fine with me. That said I feel this isn't directly related to this CL, so if
that's ok with you I'll make the change you suggest but in a separate CL to keep
things clear.

[iannucci, 2014/05/23 21:17:49]

Yep that's fine, I was just musing :)

+              options)
+    if self._GetCurrentBranch() is None:
       # Squelch git's very verbose detached HEAD warning and use our own
-      self._Run(['checkout', '--quiet', revision], options)
       self.Print(
         ('Checked out %s to a detached HEAD. Before making any commits\n'
          'in this repo, you should use \'git checkout <branch>\' to switch to\n'
          'an existing branch or use \'git checkout %s -b <branch>\' to\n'
          'create a new branch for your work.') % (revision, self.remote))
 
   def _AskForData(self, prompt, options):
     if options.jobs > 1:
       self.Print(prompt)
       raise gclient_utils.Error("Background task requires input. Rerun "
@@ skipping 645 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command