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

tests/fake_repos.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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import errno
 import logging
@@ skipping 319 matching lines @@
       return fs
 
     # Testing:
     # - dependency disapear
     # - dependency renamed
     # - versioned and unversioned reference
     # - relative and full reference
     # - deps_os
     # - var
     # - hooks
+    # TODO(maruel):
     # - From
-    # TODO(maruel):
     # - File
     # - $matching_files
     # - use_relative_paths
     fs = file_system(1, """
 vars = {
   'DummyVariable': 'third_party',
 }
 deps = {
   'src/other': 'svn://%(host)s/svn/trunk/other@1',
   'src/third_party/fpp': '/trunk/' + Var('DummyVariable') + '/foo',
 }
 deps_os = {
   'mac': {
     'src/third_party/prout': '/trunk/third_party/prout',
   },
 }""" % { 'host': self.HOST })
     self._commit_svn(fs)
 
     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.
 hooks = [
   {
     'pattern': '.',
     'action': ['python', '-c',
                'open(\\'src/svn_hooked1\\', \\'w\\').write(\\'svn_hooked1\\')'],
   },
   {
@@ skipping 23 matching lines @@
       self.git_hashes[repo] = [None]
 
     # Testing:
     # - dependency disapear
     # - dependency renamed
     # - versioned and unversioned reference
     # - relative and full reference
     # - deps_os
     # - var
     # - hooks
+    # TODO(maruel):
     # - From
-    # TODO(maruel):
     # - File
     # - $matching_files
     # - use_relative_paths
     self._commit_git('repo_3', {
       'origin': 'git/repo_3@1\n',
     })
 
     self._commit_git('repo_3', {
       'origin': 'git/repo_3@2\n',
     })
@@ skipping 40 matching lines @@
     })
 
     self._commit_git('repo_4', {
       'origin': 'git/repo_4@2\n',
     })
 
     self._commit_git('repo_1', {
       '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.
 hooks = [
   {
     'pattern': '.',
     'action': ['python', '-c',
                'open(\\'src/git_hooked1\\', \\'w\\').write(\\'git_hooked1\\')'],
   },
   {
@@ skipping 150 matching lines @@
 
 
 # Kind of hack.
 if '-l' in sys.argv:
   FakeRepos.SHOULD_LEAK = True
   sys.argv.remove('-l')
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))