Use "svn cat" in tools/submit_try

tools/submit_try

 #!/usr/bin/python
 
 # Copyright (c) 2013 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.
 
 
 """
 submit_try: Submit a try request.
 
 This is a thin wrapper around the try request utilities in depot_tools which
 adds some validation and supports both git and svn.
 """
 
 
-from contextlib import closing
-
 import httplib
 import json
 import os
 import subprocess
+import svn
 import sys
-import urllib2
 
 
-def GetGlobalVariables():
-  """ Retrieve a global variable from the global_variables.json file. """
-  global_variables_file = ('http://skia.googlecode.com/svn/buildbot/'
-                           'site_config/global_variables.json')
-  with closing(urllib2.urlopen(global_variables_file)) as f:
-    return json.load(f)
-
-
-GLOBAL_VARIABLES = GetGlobalVariables()
+GLOBAL_VARIABLES = json.loads(svn.Svn.Cat('http://skia.googlecode.com/svn/'
+                                          'buildbot/site_config/'
+                                          'global_variables.json'))
 
 
 def GetGlobalVariable(var_name):
   return GLOBAL_VARIABLES[var_name]['value']
 
 
 # Alias which can be used to run a try on every builder.
 ALL_BUILDERS = 'all'
 
 # Contact information for the build master.
@@ skipping 27 matching lines @@
   return depot_tools_dir
 
 
 def GetCheckoutRoot(is_svn=True):
   """ Determine where the local checkout is rooted.
 
   is_svn: boolean; whether we're in an SVN checkout. If False, assume we're in
       a git checkout.
   """
   if is_svn:
-    svn_cmd = 'svn.bat' if os.name == 'nt' else 'svn'
-    cmd = [svn_cmd, 'info']
+    cmd = [svn.SVN, 'info']

[epoger, 2013/03/14 17:48:32]

Given that the "info" command, unlike "svn cat", is dependent on the directory
within which it is run, I think you'd be better off using the svn.Svn object in
this case...

repo = svn.Svn('.')
output = repo.GetInfo()

You will have to add GetInfo() to svn.py, but that will be easy:

def GetInfo(self):
    return self._RunCommand([SVN, 'info'])

[borenet, 2013/03/14 18:25:18]

Done.

     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     if proc.wait() != 0:
       raise Exception('Couldn\'t find checkout root!')
     output = proc.communicate()[0].split('\n')
     url = None
     repo_root = None
     for line in output:
       if line.startswith(REPO_ROOT_STR):
         repo_root = line[len(REPO_ROOT_STR):].rstrip()
@@ skipping 179 matching lines @@
 
   # Parse and validate the command-line arguments.
   args = ValidateArgs(sys.argv[1:], trybots=trybots, is_svn=is_svn)
 
   # Submit the try request.
   SubmitTryRequest(args, is_svn=is_svn)
 
 
 if __name__ == '__main__':
   sys.exit(main())