Revert r50367 "Move DEPS parsing into a single function." yet again...

TBR=nasserg

Review URL: http://codereview.chromium.org/2815017

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@50372 0039d316-1c4b-4281-b951-d872f2087c98

tests/fake_repos.py

@@ -337,8 +337,8 @@ class FakeRepos(object):
     # - deps_os
     # - var
     # - hooks
-    # - From
     # TODO(maruel):
+    # - From
     # - File
     # - $matching_files
     # - use_relative_paths
@@ -360,8 +360,8 @@ deps_os = {
     fs = file_system(2, """
 deps = {
   'src/other': 'svn://%(host)s/svn/trunk/other',
-  #'src/third_party/foo': '/trunk/third_party/foo@1',
-  'src/third_party/foo': From('src/other', 'foo/bar'),
+  'src/third_party/foo': '/trunk/third_party/foo@1',
+  #'src/third_party/foo': From('src/other', 'foo/bar'),
 }
 # I think this is wrong to have the hooks run from the base of the gclient
 # checkout. It's maybe a bit too late to change that behavior.
@@ -405,8 +405,8 @@ deps = {
     # - deps_os
     # - var
     # - hooks
-    # - From
     # TODO(maruel):
+    # - From
     # - File
     # - $matching_files
     # - use_relative_paths
@@ -467,8 +467,8 @@ deps = {
       'DEPS': """
 deps = {
   'src/repo2': 'git://%(host)s/git/repo_2@%(hash)s',
-  #'src/repo2/repo_renamed': '/repo_3',
-  'src/repo2/repo_renamed': From('src/repo2', 'foo/bar'),
+  'src/repo2/repo_renamed': '/repo_3',
+  #'src/repo2/repo_renamed': From('src/repo2', 'foo/bar'),
 }
 # I think this is wrong to have the hooks run from the base of the gclient
 # checkout. It's maybe a bit too late to change that behavior.

tests/gclient_smoketest.py

@@ -283,8 +283,6 @@ class GClientSmokeSVN(GClientSmokeBase):
     # matching.
     results = self.gclient(['revert', '--deps', 'mac'])
     out = self.splitBlock(results[0])
-    # src, src/other is missing, src/other, src/third_party/foo is missing,
-    # src/third_party/foo, 2 svn hooks.
     self.assertEquals(7, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
@@ -377,6 +375,7 @@ class GClientSmokeSVN(GClientSmokeBase):
     self.assertEquals([], out)
 
   def testRevInfo(self):
+    # TODO(maruel): Test multiple solutions.
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
@@ -587,7 +586,6 @@ class GClientSmokeBoth(GClientSmokeBase):
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     results = self.gclient(['sync', '--deps', 'mac'])
-    # 3x svn checkout, 3x run hooks
     self.checkBlock(results[0],
                     ['running', 'running', 'running', 'running', 'running',
                      'running', 'running'])
@@ -635,31 +633,6 @@ class GClientSmokeBoth(GClientSmokeBase):
         ('trunk/third_party/foo@2', 'src/third_party/prout')))
     self.assertTree(tree)
 
-  def testRevInfo(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.gclient(['sync', '--deps', 'mac'])
-    results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(svn_base)s/src/@2;\n'
-           'src-git: %(git_base)srepo_1@%(hash1)s;\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),
-               'hash2': self.githash('repo_2', 1),
-               'hash3': self.githash('repo_3', 2),
-          }
-    self.check((out, '', 0), results)
-
 
 if __name__ == '__main__':
   if '-c' in sys.argv: