Revert changes 15823 and 15824 because they broke gclient revert.

tests/gclient_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 1127 matching lines @@
                              relpath=self.relpath)
     scm.revert(options, self.args, files_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testRevertNone(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir = self.mox.CreateMockAnything()
     gclient.os.path.isdir(base_path).AndReturn(True)
-    gclient.CaptureSVNStatus(base_path).AndReturn([])
+    gclient.CaptureSVNStatus(options, base_path).AndReturn([])
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testRevert2Files(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir = self.mox.CreateMockAnything()
     gclient.os.path.isdir(base_path).AndReturn(True)
     items = [
       gclient.FileStatus('a', 'M', ' ', ' ', ' '), 
       gclient.FileStatus('b', 'A', ' ', ' ', ' '),
     ]
-    gclient.CaptureSVNStatus(base_path).AndReturn(items)
+    gclient.CaptureSVNStatus(options, base_path).AndReturn(items)
 
     print >>options.stdout, os.path.join(base_path, 'a')
     print >>options.stdout, os.path.join(base_path, 'b')
-    gclient.RunSVN(['revert', 'a', 'b'], base_path)
+    gclient.RunSVN(options, ['revert', 'a', 'b'], base_path)
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testStatus(self):
@@ skipping 40 matching lines @@
     options.force = True
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
     options.path_exists(os.path.join(base_path, '.git')).AndReturn(False)
     # Checkout or update.
     options.path_exists(base_path).AndReturn(True)
-    gclient.CaptureSVNInfo(os.path.join(base_path, "."), '.'
+    gclient.CaptureSVNInfo(options, os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     # Cheat a bit here.
-    gclient.CaptureSVNInfo(file_info['URL'], '.').AndReturn(file_info)
+    gclient.CaptureSVNInfo(options, file_info['URL'], '.').AndReturn(file_info)
     additional_args = []
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
     files_list = []
     gclient.RunSVNAndGetFileList(options, ['update', base_path] + additional_args,
                                  self.root_dir, files_list)
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
@@ skipping 23 matching lines @@
 <wc-info>
 <schedule>add</schedule>
 <depth>infinity</depth>
 <copy-from-url>http://src.chromium.org/svn/trunk/src/chrome/app/DEPS</copy-from-url>
 <copy-from-rev>14628</copy-from-rev>
 <checksum>369f59057ba0e6d9017e28f8bdfb1f43</checksum>
 </wc-info>
 </entry>
 </info>
 """ % self.url
-    gclient.CaptureSVN(['info', '--xml', self.url],
-                       '.', True).AndReturn(xml_text)
+    options = self.Options(verbose=True)
+    gclient.CaptureSVN(options, ['info', '--xml', self.url],
+                       '.').AndReturn(xml_text)
     expected = {
       'URL': 'http://src.chromium.org/svn/trunk/src/chrome/app/d',
       'UUID': None,
       'Repository Root': 'http://src.chromium.org/svn',
       'Schedule': 'add',
       'Copied From URL': 'http://src.chromium.org/svn/trunk/src/chrome/app/DEPS',
       'Copied From Rev': '14628',
       'Path': self.url,
       'Revision': 14628,
       'Node Kind': 'file',
     }
     self.mox.ReplayAll()
-    file_info = self._CaptureSVNInfo(self.url, '.', True)
+    file_info = self._CaptureSVNInfo(options, self.url, '.')
     self.assertEquals(sorted(file_info.items()), sorted(expected.items()))
     self.mox.VerifyAll()
 
   def testCaptureSvnInfo(self):
     xml_text = """<?xml version="1.0"?>
 <info>
 <entry
    kind="dir"
    path="."
    revision="35">
 <url>%s</url>
 <repository>
 <root>%s</root>
 <uuid>7b9385f5-0452-0410-af26-ad4892b7a1fb</uuid>
 </repository>
 <wc-info>
 <schedule>normal</schedule>
 <depth>infinity</depth>
 </wc-info>
 <commit
    revision="35">
 <author>maruel</author>
 <date>2008-12-04T20:12:19.685120Z</date>
 </commit>
 </entry>
 </info>
 """ % (self.url, self.root_dir)
-    gclient.CaptureSVN(['info', '--xml', self.url],
-                       '.', True).AndReturn(xml_text)
+    options = self.Options(verbose=True)
+    gclient.CaptureSVN(options, ['info', '--xml', self.url],
+                       '.').AndReturn(xml_text)
     self.mox.ReplayAll()
-    file_info = self._CaptureSVNInfo(self.url, '.', True)
+    file_info = self._CaptureSVNInfo(options, self.url, '.')
     expected = {
       'URL': self.url,
       'UUID': '7b9385f5-0452-0410-af26-ad4892b7a1fb',
       'Revision': 35,
       'Repository Root': self.root_dir,
       'Schedule': 'normal',
       'Copied From URL': None,
       'Copied From Rev': None,
       'Path': '.',
       'Node Kind': 'dir',
     }
     self.assertEqual(file_info, expected)
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: