Change "tryjob" -> "try job" in git_cl.py and trychange.py.

trychange.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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/git repository or by directly
 connecting to the server by HTTP.
 """
 
@@ skipping 380 matching lines @@
     masters = presubmit_support.DoGetTryMasters(
         change,
         checkouts[0].GetFileNames(),
         checkouts[0].checkout_root,
         root_presubmit,
         options.project,
         options.verbose,
         sys.stdout)
 
     # Compatibility for old checkouts and bots that were on tryserver.chromium.
-    trybots = masters.get('tryserver.chromium', [])
+    try_bots = masters.get('tryserver.chromium', [])
 
     # Compatibility for checkouts that are not using tryserver.chromium
     # but are stuck with git-try or gcl-try.
-    if not trybots and len(masters) == 1:
-      trybots = masters.values()[0]
+    if not try_bots and len(masters) == 1:
+      try_bots = masters.values()[0]
 
-    if trybots:
-      old_style = filter(lambda x: isinstance(x, basestring), trybots)
-      new_style = filter(lambda x: isinstance(x, tuple), trybots)
+    if try_bots:
+      old_style = filter(lambda x: isinstance(x, basestring), try_bots)
+      new_style = filter(lambda x: isinstance(x, tuple), try_bots)
 
       # _ParseBotList's testfilter is set to None otherwise it will complain.
       bot_spec = _ApplyTestFilter(options.testfilter,
                                   _ParseBotList(old_style, None))
 
       bot_spec.extend(_ApplyTestFilter(options.testfilter, new_style))
 
   except ImportError:
     pass
 
@@ skipping 294 matching lines @@
 
   PrintSuccess(bot_spec, options)
 
 def _SendChangeGerrit(bot_spec, options):
   """Posts a try job to a Gerrit change.
 
   Reads Change-Id from the HEAD commit, resolves the current revision, checks
   that local revision matches the uploaded one, posts a try job in form of a
   message, sets Tryjob-Request label to 1.
 
-  Gerrit message format: starts with !tryjob, optionally followed by a tryjob
+  Gerrit message format: starts with !tryjob, optionally followed by a try job
   definition in JSON format:
       buildNames: list of strings specifying build names.
       build_properties: a dict of build properties.
   """
 
   logging.info('Sending by Gerrit')
   if not options.gerrit_url:
     raise NoTryServerAccess('Please use --gerrit_url option to specify the '
                             'Gerrit instance url to connect to')
   gerrit_host = urlparse.urlparse(options.gerrit_url).hostname
@@ skipping 59 matching lines @@
                 change_id)
   logging.debug('Found Gerrit change: %s' % changes[0])
   if changes[0]['current_revision'] != head_sha:
     raise Error('Please upload your latest local changes to Gerrit.')
 
   # Post a try job.
   message = FormatMessage()
   PostTryjob(message)
   change_url = urlparse.urljoin(options.gerrit_url,
                                 '/#/c/%s' % changes[0]['_number'])
-  print('A tryjob was posted on change %s' % change_url)
+  print('A try job was posted on change %s' % change_url)
 
 def PrintSuccess(bot_spec, options):
   if not options.dry_run:
     text = 'Patch \'%s\' sent to try server' % options.name
     if bot_spec:
       text += ': %s' % ', '.join(
           '%s:%s' % (b[0], ','.join(b[1])) for b in bot_spec)
     print(text)
 
 
@@ skipping 203 matching lines @@
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server with Gerrit")
   group.add_option("--use_gerrit",
                    action="store_const",
                    const=_SendChangeGerrit,
                    dest="send_patch",
                    help="Use Gerrit to talk to the try server")
   group.add_option("--gerrit_url",
                    metavar="GERRIT_URL",
-                   help="Gerrit url to post a tryjob to; --use_gerrit is "
+                   help="Gerrit url to post a try job to; --use_gerrit is "
                         "implied when using --gerrit_url")
   parser.add_option_group(group)
 
   return parser
 
 
 def TryChange(argv,
               change,
               swallow_exception,
               prog=None,
@@ skipping 216 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))