Revert changes 15823 and 15824 because they broke gclient revert.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 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.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 
 import datetime
 import getpass
 import logging
 import optparse
 import os
 import shutil
 import sys
 import tempfile
 import traceback
 import urllib
 
 import gcl
-import gclient
 
 __version__ = '1.1'
 
 
 # Constants
 HELP_STRING = "Sorry, Tryserver is not available."
 SCRIPT_PATH = os.path.join('tools', 'tryserver', 'tryserver.py')
 USAGE = r"""%prog [options]
 
 Client-side script to send a try job to the try server. It communicates to
@@ skipping 92 matching lines @@
     previous_cwd = os.getcwd()
     if root is None:
       os.chdir(gcl.GetRepositoryRoot())
     else:
       os.chdir(root)
 
     diff = []
     for file in files:
       # Use svn info output instead of os.path.isdir because the latter fails
       # when the file is deleted.
-      if gclient.CaptureSVNInfo(file).get("Node Kind") in ("dir", "directory"):
+      if gcl.GetSVNFileInfo(file).get("Node Kind") == "directory":
         continue
       # If the user specified a custom diff command in their svn config file,
       # then it'll be used when we do svn diff, which we don't want to happen
       # since we want the unified diff.  Using --diff-cmd=diff doesn't always
       # work, since they can have another diff executable in their path that
       # gives different line endings.  So we use a bogus temp directory as the
       # config directory, which gets around these problems.
       if sys.platform.startswith("win"):
         parent_dir = tempfile.gettempdir()
       else:
@@ skipping 350 matching lines @@
     if patch_name == 'Unnamed':
       print "Note: use --name NAME to change the try's name."
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return
     print e
 
 
 if __name__ == "__main__":
   TryChange(None, None, False)