Add back automatic fallback to svn access when http access fails.

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
@@ skipping 243 matching lines @@
 
   url = 'http://%s:%s/send_try_patch' % (options.host, options.port)
   proxies = None
   if options.proxy:
     if options.proxy.lower() == 'none':
       # Effectively disable HTTP_PROXY or Internet settings proxy setup.
       proxies = {}
     else:
       proxies = {'http': options.proxy, 'https': options.proxy}
 
+  logging.warning('Sending by HTTP')
   logging.info(description)
   logging.info(url)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   try:
     connection = urllib.urlopen(url, urllib.urlencode(values), proxies=proxies)
   except IOError, e:
     logging.warning(str(e))
@@ skipping 12 matching lines @@
 
 def _SendChangeSVN(options):
   """Send a change to the try server by committing a diff file on a subversion
   server."""
   if not options.svn_repo:
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
                             ' try server svn repository to connect to.')
 
   values = _ParseSendChangeOptions(options)
   description = ''.join("%s=%s\n" % (k,v) for (k,v) in values.iteritems())
+  logging.warning('Sending by SVN')
   logging.info(description)
   logging.info(options.svn_repo)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   # Do an empty checkout.
   temp_dir = tempfile.mkdtemp()
   temp_file = tempfile.NamedTemporaryFile()
   try:
@@ skipping 32 matching lines @@
       gclient_utils.CheckCall(["svn", "commit", full_path, '--file',
                                temp_file.name], print_error=False)
     except gclient_utils.CheckCallError, e:
       raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' +
                               e.stdout)
   finally:
     temp_file.close()
     shutil.rmtree(temp_dir, True)
 
 
+def PrintSuccess(options):
+  if not options.dry_run:
+    text = 'Patch \'%s\' sent to try server' % options.name
+    if options.bot:
+      text += ': %s' % ', '.join(options.bot)
+    print(text)
+
+
 def GuessVCS(options, cwd):
   """Helper to guess the version control system.
 
   NOTE: Very similar to upload.GuessVCS. Doesn't look for hg since we don't
   support it yet.
 
   This examines the current directory, guesses which SCM we're using, and
   returns an instance of the appropriate class.  Exit with an error if we can't
   figure it out.
 
@@ skipping 146 matching lines @@
     checkouts = []
     checkouts.append(GuessVCS(options, os.getcwd()))
     checkouts[0].AutomagicalSettings()
     for item in options.sub_rep:
       checkout = GuessVCS(options, item)
       if checkout.GetLocalRoot() in [c.GetLocalRoot() for c in checkouts]:
         parser.error('Specified the root %s two times.' %
                      checkout.GetLocalRoot())
       checkouts.append(checkout)
 
+    can_http = options.port and options.host
+    can_svn = options.svn_repo
     # If there was no transport selected yet, now we must have enough data to
     # select one.
-    if not options.send_patch:
-      if options.port and options.host:
-        options.send_patch = _SendChangeHTTP
-      elif options.svn_repo:
-        options.send_patch = _SendChangeSVN
-      else:
-        parser.error('Please specify an access method.')
+    if not options.send_patch and not (can_http or can_svn):
+      parser.error('Please specify an access method.')
 
     # Convert options.diff into the content of the diff.
     if options.url:
       if options.files:
         parser.error('You cannot specify files and --url at the same time.')
       options.diff = urllib.urlopen(options.url).read()
     elif options.diff:
       if options.files:
         parser.error('You cannot specify files and --diff at the same time.')
       options.diff = gclient_utils.FileRead(options.diff, 'rb')
@@ skipping 35 matching lines @@
       else:
         options.name = 'Unnamed'
         print('Note: use --name NAME to change the try job name.')
     if not options.email:
       parser.error('Using an anonymous checkout. Please use --email or set '
                    'the TRYBOT_RESULTS_EMAIL_ADDRESS environment variable.')
     else:
       print('Results will be emailed to: ' + options.email)
 
     # Send the patch.
-    options.send_patch(options)
-    if not options.dry_run:
-      text = 'Patch \'%s\' sent to try server' % options.name
-      if options.bot:
-        text += ': %s' % ', '.join(options.bot)
-      print(text)
+    if options.send_patch:
+      # If forced.
+      options.send_patch(options)
+      PrintSuccess(options)
+      return 0
+    try:
+      if can_http:
+        _SendChangeHTTP(options)
+        PrintSuccess(options)
+        return 0
+    except NoTryServerAccess:
+      if not can_svn:
+        raise
+    _SendChangeSVN(options)
+    PrintSuccess(options)
+    return 0
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))