Enable --revision flag for all deps.

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 295 matching lines @@
     self._deps_parsed = False
     # This dependency has been processed, i.e. checked out
     self._processed = False
     # This dependency had its pre-DEPS hooks run
     self._pre_deps_hooks_ran = False
     # This dependency had its hook run
     self._hooks_ran = False
     # This is the scm used to checkout self.url. It may be used by dependencies
     # to get the datetime of the revision we checked out.
     self._used_scm = None
+    self._used_revision = None
     # The actual revision we ended up getting, or None if that information is
     # unavailable
     self._got_revision = None
 
     if not self.name and self.parent:
       raise gclient_utils.Error('Dependency without name')
 
   @property
   def requirements(self):
     """Calculate the list of requirements."""
@@ skipping 269 matching lines @@
     logging.info('ParseDepsFile(%s) done' % self.name)
 
   def add_dependencies_and_close(self, deps_to_add, hooks):
     """Adds the dependencies, hooks and mark the parsing as done."""
     for dep in deps_to_add:
       if dep.verify_validity():
         self.add_dependency(dep)
     self._mark_as_parsed(hooks)
 
   def maybeGetParentRevision(
-      self, command, options, parsed_url, parent_name, revision_overrides):
+      self, command, options, parsed_url, parent):

[Ryan Tseng, 2014/05/19 22:04:09]

nit: This fits on the line above, right?

[szager1, 2014/05/20 04:41:33]

Done.

     """Uses revision/timestamp of parent if no explicit revision was specified.
 
     If we are performing an update and --transitive is set, use
     - the parent's revision if 'self.url' is in the same repository
     - the parent's timestamp otherwise
     to update 'self.url'. The used revision/timestamp will be set in
     'options.revision'.
     If we have an explicit revision do nothing.
     """
     if command == 'update' and options.transitive and not options.revision:
       _, revision = gclient_utils.SplitUrlRevision(parsed_url)
       if not revision:
-        options.revision = revision_overrides.get(parent_name)
+        options.revision = getattr(parent, '_used_revision', None)
         if (options.revision and
             not gclient_utils.IsDateRevision(options.revision)):
           assert self.parent and self.parent.used_scm
           # If this dependency is in the same repository as parent it's url will
           # start with a slash. If so we take the parent revision instead of
           # it's timestamp.
           # (The timestamps of commits in google code are broken -- which can
           # result in dependencies to be checked out at the wrong revision)
           if self.url.startswith('/'):
             if options.verbose:
               print('Using parent\'s revision %s since we are in the same '
                     'repository.' % options.revision)
           else:
             parent_revision_date = self.parent.used_scm.GetRevisionDate(
                 options.revision)
             options.revision = gclient_utils.MakeDateRevision(
                 parent_revision_date)
             if options.verbose:
               print('Using parent\'s revision date %s since we are in a '
                     'different repository.' % options.revision)
-          revision_overrides[self.name] = options.revision
 
   # Arguments number differs from overridden method
   # pylint: disable=W0221
   def run(self, revision_overrides, command, args, work_queue, options):
     """Runs |command| then parse the DEPS file."""
     logging.info('Dependency(%s).run()' % self.name)
     assert self._file_list == []
     if not self.should_process:
       return
     # When running runhooks, there's no need to consult the SCM.
@@ skipping 12 matching lines @@
           self._used_scm = gclient_scm.SVNWrapper(
               parsed_url.GetPath(), self.root.root_dir, self.name,
               out_cb=work_queue.out_cb)
           self._used_scm.RunCommand('updatesingle',
               options, args + [parsed_url.GetFilename()], file_list)
       else:
         # Create a shallow copy to mutate revision.
         options = copy.copy(options)
         options.revision = revision_overrides.get(self.name)
         self.maybeGetParentRevision(
-            command, options, parsed_url, self.parent.name, revision_overrides)
+            command, options, parsed_url, self.parent)
+        revision_overrides.pop(self.name, None)

[Ryan Tseng, 2014/05/19 22:04:09]

nit: Move this to line 670, replace revision_overrides.get()?

[szager1, 2014/05/20 04:41:33]

Done.

+        self._used_revision = options.revision
         self._used_scm = gclient_scm.CreateSCM(
             parsed_url, self.root.root_dir, self.name, self.outbuf,
             out_cb=work_queue.out_cb)
         self._got_revision = self._used_scm.RunCommand(command, options, args,
                                                        file_list)
         if file_list:
           file_list = [os.path.join(self.name, f.strip()) for f in file_list]
 
       # TODO(phajdan.jr): We should know exactly when the paths are absolute.
       # Convert all absolute paths to relative.
@@ skipping 528 matching lines @@
         elif s.safesync_url:
           self._ApplySafeSyncRev(dep=s)
     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:
       if not '@' in revision:
         # Support for --revision 123
         revision = '%s@%s' % (solutions_names[index], revision)
       sol, rev = revision.split('@', 1)

[Ryan Tseng, 2014/05/19 22:04:09]

nit: rename this to (name, rev) to make it make it more clear its not just for
solutions.

[szager1, 2014/05/20 04:41:33]

Done.

-      if not sol in solutions_names:
-        #raise gclient_utils.Error('%s is not a valid solution.' % sol)
-        print >> sys.stderr, ('Please fix your script, having invalid '
-                              '--revision flags will soon considered an error.')
-      else:
-        revision_overrides[sol] = rev
+      revision_overrides[sol] = rev
       index += 1
     return revision_overrides
 
   def _ApplySafeSyncRev(self, dep):
     """Finds a valid revision from the content of the safesync_url and apply it
     by appending revisions to the revision list. Throws if revision appears to
     be invalid for the given |dep|."""
     assert len(dep.safesync_url) > 0
     handle = urllib.urlopen(dep.safesync_url)
     rev = handle.read().strip()
@@ skipping 33 matching lines @@
       if command in ('update', 'revert'):
         pm = Progress('Syncing projects', 1)
       elif command == 'recurse':
         pm = Progress(' '.join(args), 1)
     work_queue = gclient_utils.ExecutionQueue(
         self._options.jobs, pm, ignore_requirements=ignore_requirements,
         verbose=self._options.verbose)
     for s in self.dependencies:
       work_queue.enqueue(s)
     work_queue.flush(revision_overrides, command, args, options=self._options)
+    if revision_overrides:
+      print >> sys.stderr, ('Please fix your script, having invalid '
+                            '--revision flags will soon considered an error.')
 
     # Once all the dependencies have been processed, it's now safe to run the
     # hooks.
     if not self._options.nohooks:
       self.RunHooksRecursively(self._options)
 
     if command == 'update':
       # Notify the user if there is an orphaned entry in their working copy.
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
@@ skipping 694 matching lines @@
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
   finally:
     gclient_utils.PrintWarnings()
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: