Add a --deps-file flag to gclient to allow using a deps file other than DEPS.

tests/fake_repos.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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import datetime
 import errno
@@ skipping 415 matching lines @@
   NB_GIT_REPOS = 4
 
   def populateSvn(self):
     """Creates a few revisions of changes including DEPS files."""
     # Repos
     subprocess2.check_call(
         ['svn', 'checkout', self.svn_base, self.svn_checkout,
          '-q', '--non-interactive', '--no-auth-cache',
          '--username', self.USERS[0][0], '--password', self.USERS[0][1]])
     assert os.path.isdir(join(self.svn_checkout, '.svn'))
-    def file_system(rev, DEPS):
+    def file_system(rev, DEPS, DEPS_ALT=None):
       fs = {
         'origin': 'svn@%(rev)d\n',
         'trunk/origin': 'svn/trunk@%(rev)d\n',
         'trunk/src/origin': 'svn/trunk/src@%(rev)d\n',
         'trunk/src/third_party/origin': 'svn/trunk/src/third_party@%(rev)d\n',
         'trunk/other/origin': 'src/trunk/other@%(rev)d\n',
         'trunk/third_party/origin': 'svn/trunk/third_party@%(rev)d\n',
         'trunk/third_party/foo/origin': 'svn/trunk/third_party/foo@%(rev)d\n',
         'trunk/third_party/prout/origin': 'svn/trunk/third_party/foo@%(rev)d\n',
       }
       for k in fs.iterkeys():
         fs[k] = fs[k] % { 'rev': rev }
       fs['trunk/src/DEPS'] = DEPS
+      if DEPS_ALT:
+        fs['trunk/src/DEPS.alt'] = DEPS_ALT
       return fs
 
     # Testing:
     # - dependency disapear
     # - dependency renamed
     # - versioned and unversioned reference
     # - relative and full reference
     # - deps_os
     # - var
     # - hooks
     # - From
     # - File
     # TODO(maruel):
     # - $matching_files
     # - use_relative_paths
-    fs = file_system(1, """
+    DEPS = """
 vars = {
   'DummyVariable': 'third_party',
 }
 deps = {
   'src/other': '%(svn_base)strunk/other@1',
   'src/third_party/fpp': '/trunk/' + Var('DummyVariable') + '/foo',
 }
 deps_os = {
   'mac': {
     'src/third_party/prout': '/trunk/third_party/prout',
   },
-}""" % { 'svn_base': self.svn_base })
+}""" % { 'svn_base': self.svn_base }
+
+    DEPS_ALT = """
+deps = {
+  'src/other2': '%(svn_base)strunk/other@2'
+}
+""" % { 'svn_base': self.svn_base }
+
+    fs = file_system(1, DEPS, DEPS_ALT)
     self._commit_svn(fs)
 
     fs = file_system(2, """
 deps = {
   'src/other': '%(svn_base)strunk/other',
   # Load another DEPS and load a dependency from it. That's an example of
   # WebKit's chromium checkout flow. Verify it works out of order.
   'src/third_party/foo': From('src/file/other', 'foo/bar'),
   'src/file/other': File('%(svn_base)strunk/other/DEPS'),
 }
@@ skipping 245 matching lines @@
     fake.set_up_git()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     trial_dir.TrialDir.SHOULD_LEAK.leak = True
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))