Add --transitive flag.

gclient.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.
 
 """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
@@ skipping 321 matching lines @@
                 (name, tree[name].hierarchy(), self.hierarchy()))
       self.dependencies.append(Dependency(self, name, url, None, None, None,
           None, should_process))
     logging.debug('Loaded: %s' % str(self))
 
   # Arguments number differs from overridden method
   # pylint: disable=W0221
   def run(self, revision_overrides, command, args, work_queue, options):
     """Runs 'command' before parsing the DEPS in case it's a initial checkout
     or a revert."""
+
+    def maybeGetParentRevision(options):
+      """If we are performing an update and --transitive is set, set the
+      revision to the parent's revision. If we have an explicit revision
+      do nothing."""
+      _, revision = gclient_utils.SplitUrlRevision(self.parsed_url)
+      if (command == 'update' and

[M-A Ruel, 2011/04/26 18:38:49]

style nit: (optional) What about?

if (command == 'update' and options.transitive and not options.revision):
  _, revision = gclient_utils.SplitUrlRevision(self.parsed_url)
  if not revision:
    ...

I think it'd be slightly more readable.

[Florian Loitsch, 2011/04/27 10:58:23]

Done.

+          options.transitive and
+          not revision and
+          not options.revision):
+        options.revision = revision_overrides.get(self.parent.name)
+        if options.verbose and options.revision:
+          print("Using parent's revision date: %s" % options.revision)
+        # If the parent has a revision override, then it must have been
+        # converted to date format.
+        assert (not options.revision or
+                gclient_utils.IsDateRevision(options.revision))
+
+    def maybeConvertToDateRevision(options):
+      """If we are performing an update and --transitive is set, convert the
+      revision to a date-revision (if necessary). Instead of having
+      -r 101 replace the revision with the time stamp of 101 (e.g.
+      "{2011-18-04}").
+      This way dependencies are upgraded to the revision they had at the
+      check-in of revision 101."""
+      if (command == 'update' and
+          options.transitive and
+          options.revision and
+          not gclient_utils.IsDateRevision(options.revision)):
+        revision_date = scm.GetRevisionDate(options.revision)
+        revision = gclient_utils.MakeDateRevision(revision_date)
+        if options.verbose:
+          print("Updating revision override from %s to %s." %
+                (options.revision, revision))
+        revision_overrides[self.name] = revision
+
     assert self._file_list == []
     if not self.should_process:
       return
     # When running runhooks, there's no need to consult the SCM.
     # All known hooks are expected to run unconditionally regardless of working
     # copy state, so skip the SCM status check.
     run_scm = command not in ('runhooks', None)
     self.parsed_url = self.LateOverride(self.url)
     if run_scm and self.parsed_url:
       if isinstance(self.parsed_url, self.FileImpl):
         # Special support for single-file checkout.
         if not command in (None, 'cleanup', 'diff', 'pack', 'status'):
           options.revision = self.parsed_url.GetRevision()
           scm = gclient_scm.SVNWrapper(self.parsed_url.GetPath(),
                                        self.root_dir(),
                                        self.name)
           scm.RunCommand('updatesingle', options,
                          args + [self.parsed_url.GetFilename()],
                          self._file_list)
       else:
         # Create a shallow copy to mutate revision.
         options = copy.copy(options)
         options.revision = revision_overrides.get(self.name)
+        maybeGetParentRevision(options)
         scm = gclient_scm.CreateSCM(self.parsed_url, self.root_dir(), self.name)
         scm.RunCommand(command, options, args, self._file_list)
+        maybeConvertToDateRevision(options)
         self._file_list = [os.path.join(self.name, f.strip())
                            for f in self._file_list]
     self.processed = True
     if self.recursion_limit() > 0:
       # Then we can parse the DEPS file.
       self.ParseDepsFile()
       # Adjust the implicit dependency requirement; e.g. if a DEPS file contains
       # both src/foo and src/foo/bar, src/foo/bar is implicitly dependent of
       # src/foo. Yes, it's O(n^2)... It's important to do that before
       # enqueueing them.
@@ skipping 659 matching lines @@
   parser.add_option('-n', '--nohooks', action='store_true',
                     help='don\'t run hooks after the update is complete')
   parser.add_option('-r', '--revision', action='append',
                     dest='revisions', metavar='REV', default=[],
                     help='Enforces revision/hash for the solutions with the '
                          'format src@rev. The src@ part is optional and can be '
                          'skipped. -r can be used multiple times when .gclient '
                          'has multiple solutions configured and will work even '
                          'if the src@ part is skipped. Note that specifying '
                          '--revision means your safesync_url gets ignored.')
+  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.')

[M-A Ruel, 2011/04/26 18:38:49]

Can you note it's supported only for svn at the moment?

[Florian Loitsch, 2011/04/27 10:58:23]

Done.

   parser.add_option('-H', '--head', action='store_true',
                     help='skips any safesync_urls specified in '
                          'configured solutions and sync to head instead')
   parser.add_option('-D', '--delete_unversioned_trees', action='store_true',
                     help='delete any dependency that have been removed from '
                          'last sync as long as there is no local modification. '
                          'Coupled with --force, it will remove them even with '
                          'local modifications')
   parser.add_option('-R', '--reset', action='store_true',
                     help='resets any local changes before updating (git only)')
@@ skipping 209 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: