Restore --head/-H to gclient

gclient.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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 1457 matching lines @@
       exec(gclient_utils.FileRead(filename), scope)
     except SyntaxError as e:
       gclient_utils.SyntaxErrorToError(filename, e)
     return scope['entries']
 
   def _EnforceRevisions(self):
     """Checks for revision overrides."""
     revision_overrides = {}
     if not self._options.revisions:
       for s in self.dependencies:
-        if not s.managed:
+        if not s.managed and not self._options.head:
           self._options.revisions.append('%s@unmanaged' % s.name)
     if not self._options.revisions:
       return revision_overrides
     solutions_names = [s.name for s in self.dependencies]
-    index = 0
-    for revision in self._options.revisions:
+    for i, revision in enumerate(self._options.revisions):
       if not '@' in revision:
         # Support for --revision 123
-        revision = '%s@%s' % (solutions_names[index], revision)
-      name, rev = revision.split('@', 1)
+        name, rev = solutions_names[i], revision
+      else:
+        name, rev = revision.split('@', 1)
       revision_overrides[name] = rev
-      index += 1
     return revision_overrides
 
   def RunOnDeps(self, command, args, ignore_requirements=False, progress=True):
     """Runs a command on each dependency in a client and its dependencies.
 
     Args:
       command: The command to use (e.g., 'status' or 'diff')
       args: list of str - extra arguments to add to the command line.
     """
     if not self.dependencies:
@@ skipping 491 matching lines @@
                     help='Clone git "branch_heads" refspecs in addition to '
                          'the default refspecs. This adds about 1/2GB to a '
                          'full checkout. (git only)')
   parser.add_option('--with_tags', action='store_true',
                     help='Clone git tags in addition to the default refspecs.')
   parser.add_option('-t', '--transitive', action='store_true',
                     help='When a revision is specified (in the DEPS file or '
                           'with the command-line flag), transitively update '
                           'the dependencies to the date of the given revision. '
                           'Only supported for SVN repositories.')
+  parser.add_option('-H', '--head', action='store_true',
+                    help='Begin by automatically syncing the root gclient '
+                         'solutions to HEAD of the remote repository. Similar '
+                         'to making the solution temporarily "managed".')
   parser.add_option('-D', '--delete_unversioned_trees', action='store_true',
                     help='Deletes from the working copy any dependencies that '
                          'have been removed since the last sync, as long as '
                          'there are no local modifications. When used with '
                          '--force, such dependencies are removed even if they '
                          'have local modifications. When used with --reset, '
                          'all untracked directories are removed from the '
                          'working copy, excluding those which are explicitly '
                          'ignored in the repository.')
   parser.add_option('-R', '--reset', action='store_true',
@@ skipping 300 matching lines @@
 
 
 if '__main__' == __name__:
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)
 
 # vim: ts=2:sw=2:tw=80:et: