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

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 181 matching lines @@
       if os.path.exists(p):
         os.remove(p)
       results = self.gclient(cmd)
       self.check(('', '', 0), results)
       self.checkString(expected, open(p, 'rU').read())
 
     test(['config', self.svn_base + 'trunk/src/'],
          ('solutions = [\n'
           '  { "name"        : "src",\n'
           '    "url"         : "%strunk/src",\n'
+          '    "deps_file"   : "DEPS",\n'
           '    "custom_deps" : {\n'
           '    },\n'
           '    "safesync_url": "",\n'
           '  },\n'
           ']\n') % self.svn_base)
 
     test(['config', self.git_base + 'repo_1', '--name', 'src'],
          ('solutions = [\n'
           '  { "name"        : "src",\n'
           '    "url"         : "%srepo_1",\n'
+          '    "deps_file"   : "DEPS",\n'
           '    "custom_deps" : {\n'
           '    },\n'
           '    "safesync_url": "",\n'
           '  },\n'
           ']\n') % self.git_base)
 
     test(['config', 'foo', 'faa'],
          'solutions = [\n'
          '  { "name"        : "foo",\n'
          '    "url"         : "foo",\n'
+         '    "deps_file"   : "DEPS",\n'
          '    "custom_deps" : {\n'
          '    },\n'
          '    "safesync_url": "faa",\n'
          '  },\n'
          ']\n')
 
+    test(['config', 'foo', '--deps', 'blah'],
+         'solutions = [\n'
+         '  { "name"        : "foo",\n'
+         '    "url"         : "foo",\n'
+         '    "deps_file"   : "blah",\n'
+         '    "custom_deps" : {\n'
+         '    },\n'
+          '    "safesync_url": "",\n'
+         '  },\n'
+         ']\n')
+
     test(['config', '--spec', '["blah blah"]'], '["blah blah"]')
 
     os.remove(p)
     results = self.gclient(['config', 'foo', 'faa', 'fuu'])
     err = ('Usage: gclient.py config [options] [url] [safesync url]\n\n'
            'gclient.py: error: Inconsistent arguments. Use either --spec or one'
            ' or 2 args\n')
     self.check(('', err, 2), results)
     self.assertFalse(os.path.exists(join(self.root_dir, '.gclient')))
 
@@ skipping 427 matching lines @@
            'src/file/other: %(base)s/other/DEPS@2\n'
            'src/other: %(base)s/other@2\n'
            'src/third_party/foo: %(base)s/third_party/foo@1\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
     results = self.gclient(['revinfo', '--deps', 'mac', '--snapshot'])
     out = ('# Snapshot generated with gclient revinfo --snapshot\n'
            'solutions = [\n'
            '  { "name"        : "src",\n'
            '    "url"         : "%(base)s/src",\n'
+           '    "deps_file"   : "DEPS",\n'
            '    "custom_deps" : {\n'
            '      "foo/bar": None,\n'
            '      "invalid": None,\n'
            '      "src/file/other": \'%(base)s/other/DEPS@2\',\n'
            '      "src/other": \'%(base)s/other@2\',\n'
            '      "src/third_party/foo": '
                '\'%(base)s/third_party/foo@1\',\n'
            '    },\n'
            '    "safesync_url": "",\n'
            '  },\n'
            ']\n\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
 
+  def testRevInfoAltDeps(self):
+    if not self.enabled:
+      return
+    self.gclient(['config', self.svn_base + 'trunk/src/', '--deps-file',
+                  'DEPS.alt'])
+    self.gclient(['sync'])
+    results = self.gclient(['revinfo', '--snapshot'])
+    out = ('# Snapshot generated with gclient revinfo --snapshot\n'
+           'solutions = [\n'
+           '  { "name"        : "src",\n'
+           '    "url"         : "%(base)s/src",\n'
+           '    "deps_file"   : "DEPS.alt",\n'
+           '    "custom_deps" : {\n'
+           '      "src/other2": \'%(base)s/other@2\',\n'
+           '    },\n'
+           '    "safesync_url": "",\n'
+           '  },\n'
+           ']\n\n' %
+          { 'base': self.svn_base + 'trunk' })
+    self.check((out, '', 0), results)
+
+
   def testWrongDirectory(self):
     # Check that we're not using a .gclient configuration which only talks
     # about a subdirectory src when we're in a different subdirectory src-other.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync'])
     other_src = join(self.root_dir, 'src-other')
     os.mkdir(other_src)
     res = ('', 'Error: client not configured; see \'gclient config\'\n', 1)
@@ skipping 518 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()