Add --transitive flag.

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 309 matching lines @@
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
+  def testSyncTransitive(self):
+    # TODO(maruel): safesync.
+    if not self.enabled:
+      return
+    self.gclient(['config', self.svn_base + 'trunk/src/'])
+    # Test unversioned checkout.

[M-A Ruel, 2011/04/20 15:43:28]

This whole part is unneeded since is already tested. Just do

self.gclient(['sync', '--deps', 'mac', '--jobs', '1'])

and skip up to 349.

Maybe it's time to put that code into an utility function.

[Florian Loitsch, 2011/04/20 18:32:01]

Done.

+    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
+        ['running', 'running',
+          # This is due to the way svn update is called for a
+          # single file when File() is used in a DEPS file.
+          ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
+          'running', 'running', 'running', 'running'])
+    tree = self.mangle_svn_tree(
+        ('trunk/src@2', 'src'),
+        ('trunk/third_party/foo@1', 'src/third_party/foo'),
+        ('trunk/other@2', 'src/other'))
+    tree['src/file/other/DEPS'] = (
+        self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
+    tree['src/svn_hooked1'] = 'svn_hooked1'
+    self.assertTree(tree)
+
+    # Manually remove svn_hooked1 before synching to make sure it's not
+    # recreated.
+    os.remove(join(self.root_dir, 'src', 'svn_hooked1'))
+
+    # Test incremental versioned sync: sync transitively backward.
+    self.parseGclient(
+        ['sync', '--transitive', '--revision', 'src@1', '--deps', 'mac',
+          '--delete_unversioned_trees', '--jobs', '1'],
+        ['running', 'running', 'running', 'running', 'deleting'])
+    tree = self.mangle_svn_tree(
+        ('trunk/src@1', 'src'),
+        ('trunk/third_party/foo@1', 'src/third_party/fpp'),
+        ('trunk/other@1', 'src/other'),
+        ('trunk/third_party/foo@1', 'src/third_party/prout'))
+    tree['src/file/other/DEPS'] = (
+        self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
+    self.assertTree(tree)
+    # Test incremental sync: delete-unversioned_trees isn't there.

[M-A Ruel, 2011/04/20 15:43:28]

I don't think the remaining of the test adds any value to the test so you can
probably remove that too.

[Florian Loitsch, 2011/04/20 18:32:01]

Done.

+    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
+                      ['running', 'running', 'running', 'running', 'running'])
+    tree = self.mangle_svn_tree(
+        ('trunk/src@2', 'src'),
+        ('trunk/third_party/foo@1', 'src/third_party/fpp'),
+        ('trunk/third_party/foo@1', 'src/third_party/foo'),
+        ('trunk/other@2', 'src/other'),
+        ('trunk/third_party/foo@1', 'src/third_party/prout'))
+    tree['src/file/other/DEPS'] = (
+        self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
+    tree['src/svn_hooked1'] = 'svn_hooked1'
+    self.assertTree(tree)
+
   def testSyncIgnoredSolutionName(self):
     """TODO(maruel): This will become an error soon."""
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     results = self.gclient(
         ['sync', '--deps', 'mac', '-r', 'invalid@1', '--jobs', '1'])
     self.checkBlock(results[0], [
         'running', 'running',
         # This is due to the way svn update is called for a single file when
@@ skipping 371 matching lines @@
   def testSync(self):
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Test unversioned checkout.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
                       ['running', 'running', 'running', 'running', 'running'])
     # TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
     # add sync parsing to get the list of updated files.
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     # Manually remove git_hooked1 before synching to make sure it's not
     # recreated.
     os.remove(join(self.root_dir, 'src', 'git_hooked1'))
 
     # Test incremental versioned sync: sync backward.
     self.parseGclient(['sync', '--jobs', '1', '--revision',
                        'src@' + self.githash('repo_1', 1),
                        '--deps', 'mac', '--delete_unversioned_trees'],
                        ['running', 'running', 'deleting'])
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
         ['running', 'running', 'running'])
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
+  #def testSyncTransitive(self):
+    #if not self.enabled:
+      #return
+    ## TODO(maruel): safesync.
+    #self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
+    ## Test unversioned checkout.
+    #self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
+                      #['running', 'running', 'running', 'running', 'running'])
+    ## TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
+    ## add sync parsing to get the list of updated files.
+    #tree = self.mangle_git_tree(('repo_1@3', 'src'),
+                                #('repo_2@1', 'src/repo2'),
+                                #('repo_3@2', 'src/repo2/repo_renamed'))
+    #tree['src/git_hooked1'] = 'git_hooked1'
+    #tree['src/git_hooked2'] = 'git_hooked2'
+    #self.assertTree(tree)
+
+    ## Manually remove git_hooked1 before synching to make sure it's not
+    ## recreated.
+    #os.remove(join(self.root_dir, 'src', 'git_hooked1'))
+
+    ## Test incremental versioned sync: sync backward.
+    #self.parseGclient(['sync', '--transitive', '--jobs', '1', '--revision',
+                       #'src@' + self.githash('repo_1', 2),
+                       #'--deps', 'mac', '--delete_unversioned_trees'],
+                       #['running', 'running', 'deleting'])
+    #tree = self.mangle_git_tree(('repo_1@2', 'src'),
+                                #('repo_2@2', 'src/repo2'),
+                                #('repo_3@1', 'src/repo2/repo3'),
+                                #('repo_4@1', 'src/repo4'))
+    #tree['src/git_hooked2'] = 'git_hooked2'
+    #self.assertTree(tree)
+    ## Test incremental sync: delete-unversioned_trees isn't there.
+    #self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
+        #['running', 'running', 'running'])
+    #tree = self.mangle_git_tree(('repo_1@3', 'src'),
+                                #('repo_2@1', 'src/repo2'),
+                                #('repo_3@1', 'src/repo2/repo3'),
+                                #('repo_3@2', 'src/repo2/repo_renamed'),
+                                #('repo_4@1', 'src/repo4'))
+    #tree['src/git_hooked1'] = 'git_hooked1'
+    #tree['src/git_hooked2'] = 'git_hooked2'
+    #self.assertTree(tree)
+
   def testSyncIgnoredSolutionName(self):
     """TODO(maruel): This will become an error soon."""
     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.parseGclient(
         ['sync', '--deps', 'mac', '--jobs', '1',
          '--revision', 'invalid@' + self.githash('repo_1', 1)],
         ['running', 'running', 'running', 'running', 'running'],
         'Please fix your script, having invalid --revision flags '
             'will soon considered an error.\n')
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testSyncNoSolutionName(self):
     if not self.enabled:
       return
     # When no solution name is provided, gclient uses the first solution listed.
@@ skipping 11 matching lines @@
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Test unversioned checkout.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
                       ['running', 'running', 'running', 'running', 'running'],
                       untangle=True)
     # TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
     # add sync parsing to get the list of updated files.
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     # Manually remove git_hooked1 before synching to make sure it's not
     # recreated.
     os.remove(join(self.root_dir, 'src', 'git_hooked1'))
 
     # Test incremental versioned sync: sync backward.
     self.parseGclient(
         ['sync', '--revision', 'src@' + self.githash('repo_1', 1),
           '--deps', 'mac', '--delete_unversioned_trees', '--jobs', '8'],
         ['running', 'running', 'deleting'],
         untangle=True)
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
         ['running', 'running', 'running'], untangle=True)
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testRevertAndStatus(self):
     """TODO(maruel): Remove this line once this test is fixed."""
@@ skipping 10 matching lines @@
     self.assertEquals(0, len(out))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     results = self.gclient(['revert', '--deps', 'mac'])
     out = results[0].splitlines(False)
     # TODO(maruel): http://crosbug.com/3583 It just runs the hooks right now.
     self.assertEquals(13, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     # TODO(maruel): http://crosbug.com/3583 This file should have been removed.
     tree[join('src', 'repo2', 'hi')] = 'Hey!'
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     results = self.gclient(['status', '--deps', 'mac'])
     out = results[0].splitlines(False)
     # TODO(maruel): http://crosbug.com/3584 It should output the unversioned
     # files.
     self.assertEquals(0, len(out))
 
   def testRunHooks(self):
     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     os.remove(join(self.root_dir, 'src', 'git_hooked1'))
     os.remove(join(self.root_dir, 'src', 'git_hooked2'))
     # runhooks runs all hooks even if not matching by design.
     out = self.parseGclient(['runhooks', '--deps', 'mac'],
                             ['running', 'running'])
     self.assertEquals(1, len(out[0]))
     self.assertEquals(1, len(out[1]))
-    tree = self.mangle_git_tree(('repo_1@2', 'src'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testRevInfo(self):
     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
     out = ('src: %(base)srepo_1\n'
            'src/repo2: %(base)srepo_2@%(hash2)s\n'
            'src/repo2/repo_renamed: %(base)srepo_3\n' %
           {
             'base': self.git_base,
             'hash2': self.githash('repo_2', 1)[:7],
           })
     self.check((out, '', 0), results)
     results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
     out = ('src: %(base)srepo_1@%(hash1)s\n'
            '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),
+            'hash1': self.githash('repo_1', 3),
             'hash2': self.githash('repo_2', 1),
             'hash3': self.githash('repo_3', 2),
           })
     self.check((out, '', 0), results)
 
 
 class GClientSmokeBoth(GClientSmokeBase):
   def setUp(self):
     super(GClientSmokeBoth, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn() and self.FAKE_REPOS.set_up_git()
 
   def testMultiSolutions(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
         ['running', 'running', 'running',
          # This is due to the way svn update is called for a single
          # file when File() is used in a DEPS file.
          ('running', self.root_dir + '/src/file/other'),
          'running', 'running', 'running', 'running', 'running', 'running',
          'running', 'running'])
-    tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src-git'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree.update(self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other')))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testMultiSolutionsJobs(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
-        ['running', 'running', 'running',
+        ['running', 'running', 'running', 'running', 'running',
          # This is due to the way svn update is called for a single
          # file when File() is used in a DEPS file.
          ('running', self.root_dir + '/src/file/other'),
-         'running', 'running', 'running', 'running', 'running', 'running',
+         'running', 'running', 'running', 'running',
          'running', 'running'],
         untangle=True)
-    tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
+    tree = self.mangle_git_tree(('repo_1@3', 'src-git'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree.update(self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other')))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
@@ skipping 51 matching lines @@
     results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
     out = ('src: %(svn_base)s/src/@2\n'
            'src-git: %(git_base)srepo_1@%(hash1)s\n'
            'src/file/other: %(svn_base)s/other/DEPS@2\n'
            'src/other: %(svn_base)s/other@2\n'
            'src/repo2: %(git_base)srepo_2@%(hash2)s\n'
            'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s\n'
            'src/third_party/foo: %(svn_base)s/third_party/foo@1\n') % {
                'svn_base': self.svn_base + 'trunk',
                'git_base': self.git_base,
-               'hash1': self.githash('repo_1', 2),
+               'hash1': self.githash('repo_1', 3),
                'hash2': self.githash('repo_2', 1),
                'hash3': self.githash('repo_3', 2),
           }
     self.check((out, '', 0), results)
 
   def testRecurse(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
@@ skipping 124 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()