Move all revision parsing code to _EnforceRevisions.

tests/gclient_smoketest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 159 matching lines @@
         )
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     results = self.gclient(['sync', '--deps', 'mac'])
     logging.debug(results[0])
     out = results[0].splitlines(False)
     self.assertEquals(21, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = mangle_svn_tree(
-        (join('trunk', 'src'), 'src', self.FAKE_REPOS.svn_revs[-1]),
+        (join('trunk', 'src'), 'src', self.FAKE_REPOS.svn_revs[2]),
         (join('trunk', 'third_party', 'foo'), join('src', 'third_party', 'fpp'),
             self.FAKE_REPOS.svn_revs[2]),
         (join('trunk', 'third_party', 'foo'), join('src', 'third_party', 'foo'),
             self.FAKE_REPOS.svn_revs[1]),
         (join('trunk', 'other'), join('src', 'other'),
             self.FAKE_REPOS.svn_revs[2]),
         (join('trunk', 'third_party', 'foo'),
             join('src', 'third_party', 'prout'),
             self.FAKE_REPOS.svn_revs[2]),
         )
     tree[join('src', 'svn_hooked1')] = 'svn_hooked1'
     self.assertTree(tree)
 
-  def SyncAtRev1(self, arg):
+  def testSyncIgnoredSolutionName(self):
+    """TODO(maruel): This will become an error soon."""
     self.gclient(['config', self.svn_base + 'trunk/src/'])
-    results = self.gclient(['sync', '--deps', 'mac', '-r', arg])
+    results = self.gclient(['sync', '--deps', 'mac', '-r', 'invalid@1'])
+    out = results[0].splitlines(False)
+    self.assertEquals(17, len(out))
+    self.checkString('Please fix your script, having invalid --revision flags '
+        'will soon considered an error.\n', results[1])
+    self.assertEquals(0, results[2])
+    tree = mangle_svn_tree(
+        (join('trunk', 'src'), 'src', self.FAKE_REPOS.svn_revs[2]),
+        (join('trunk', 'third_party', 'foo'), join('src', 'third_party', 'foo'),
+            self.FAKE_REPOS.svn_revs[1]),
+        (join('trunk', 'other'), join('src', 'other'),
+            self.FAKE_REPOS.svn_revs[2]),
+        )
+    tree[join('src', 'svn_hooked1')] = 'svn_hooked1'
+    self.assertTree(tree)
+
+  def testSyncNoSolutionName(self):
+    # When no solution name is provided, gclient uses the first solution listed.
+    self.gclient(['config', self.svn_base + 'trunk/src/'])
+    results = self.gclient(['sync', '--deps', 'mac', '-r', '1'])
     out = results[0].splitlines(False)
     self.assertEquals(19, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = mangle_svn_tree(
         (join('trunk', 'src'), 'src', self.FAKE_REPOS.svn_revs[1]),
         (join('trunk', 'third_party', 'foo'), join('src', 'third_party', 'fpp'),
             self.FAKE_REPOS.svn_revs[2]),
         (join('trunk', 'other'), join('src', 'other'),
             self.FAKE_REPOS.svn_revs[2]),
         (join('trunk', 'third_party', 'foo'),
             join('src', 'third_party', 'prout'),
             self.FAKE_REPOS.svn_revs[2]),
         )
     self.assertTree(tree)
 
-  def testSyncIgnoredSolutionName(self):
-    self.SyncAtRev1('ignored@1')
-
-  def testSyncNoSolutionName(self):
-    self.SyncAtRev1('1')
-
   def testRevertAndStatus(self):
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
     write(join(self.root_dir, 'src', 'other', 'hi'), 'Hey!')
 
     results = self.gclient(['status'])
     out = results[0].splitlines(False)
     self.assertEquals(out[0], '')
     self.assertTrue(out[1].startswith('________ running \'svn status\' in \''))
@@ skipping 184 matching lines @@
         (join('src', 'repo2', 'repo3'),
             self.FAKE_REPOS.git_hashes['repo_3'][1][1]),
         (join('src', 'repo2', 'repo_renamed'),
               self.FAKE_REPOS.git_hashes['repo_3'][1][1]),
         (join('src', 'repo4'), self.FAKE_REPOS.git_hashes['repo_4'][1][1]),
         )
     tree[join('src', 'git_hooked1')] = 'git_hooked1'
     tree[join('src', 'git_hooked2')] = 'git_hooked2'
     self.assertTree(tree)
 
+  def testSyncIgnoredSolutionName(self):
+    """TODO(maruel): This will become an error soon."""
+    self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
+    results = self.gclient([
+        'sync', '--deps', 'mac', '--revision',
+        'invalid@' + self.FAKE_REPOS.git_hashes['repo_1'][0][0],
+      ])
+    out = results[0].splitlines(False)
+
+    self.assertEquals(13, len(out))
+    # TODO(maruel): git shouldn't output to stderr...
+    self.checkString('Please fix your script, having invalid --revision flags '
+        'will soon considered an error.\nSwitched to a new branch \'%s\'\n' %
+            self.FAKE_REPOS.git_hashes['repo_2'][0][0][:7],
+        results[1])
+    self.assertEquals(0, results[2])
+    tree = mangle_git_tree(
+        ('src', self.FAKE_REPOS.git_hashes['repo_1'][1][1]),
+        (join('src', 'repo2'), self.FAKE_REPOS.git_hashes['repo_2'][0][1]),
+        (join('src', 'repo2', 'repo_renamed'),
+              self.FAKE_REPOS.git_hashes['repo_3'][1][1]),
+        )
+    tree[join('src', 'git_hooked1')] = 'git_hooked1'
+    tree[join('src', 'git_hooked2')] = 'git_hooked2'
+    self.assertTree(tree)
+
+  def testSyncNoSolutionName(self):
+    # When no solution name is provided, gclient uses the first solution listed.
+    self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
+    results = self.gclient([
+        'sync', '--deps', 'mac', '--revision',
+        self.FAKE_REPOS.git_hashes['repo_1'][0][0],
+      ])
+    out = results[0].splitlines(False)
+    self.assertEquals(12, len(out))
+    # TODO(maruel): git shouldn't output to stderr...
+    self.checkString('Switched to a new branch \'%s\'\n'
+        % self.FAKE_REPOS.git_hashes['repo_1'][0][0], results[1])
+    self.assertEquals(0, results[2])
+    tree = mangle_git_tree(
+        ('src', self.FAKE_REPOS.git_hashes['repo_1'][0][1]),
+        (join('src', 'repo2'), self.FAKE_REPOS.git_hashes['repo_2'][1][1]),
+        (join('src', 'repo2', 'repo3'),
+            self.FAKE_REPOS.git_hashes['repo_3'][1][1]),
+        (join('src', 'repo4'), self.FAKE_REPOS.git_hashes['repo_4'][1][1]),
+        )
+    self.assertTree(tree)
+
   def testRevertAndStatus(self):
     """TODO(maruel): Remove this line once this test is fixed."""
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
     write(join(self.root_dir, 'src', 'repo2', 'hi'), 'Hey!')
 
     results = self.gclient(['status'])
     out = results[0].splitlines(False)
     # TODO(maruel): http://crosbug.com/3584 It should output the unversioned
@@ skipping 140 matching lines @@
 if __name__ == '__main__':
   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()