Changes gcl upload to not submit a try....

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 690 matching lines @@
   return ListFiles(False)
 
 
 @no_args
 def CMDstatus():
   """Lists modified and unknown files in the current directory down."""
   return ListFiles(True)
 
 
 @need_change_and_args
-@attrs(usage='[--no_try] [--no_presubmit] [--clobber]\n'
-    '                          [--no_watchlists]')
+@attrs(usage='[--no_presubmit] [--clobber] [--no_watchlists]')
 def CMDupload(change_info, args):
   """Uploads the changelist to the server for review.
 
-  (You can create the file '.gcl_upload_no_try' in your home dir to
-  skip the automatic tries.)
+  This does not submit a try job; use gcl try to submit a try job.
   """
   if not change_info.GetFiles():
     print "Nothing to upload, changelist is empty."
     return 0
   if not OptionallyDoPresubmitChecks(change_info, False, args):
     return 1
-  # Might want to support GetInfoDir()/GetRepositoryRoot() like
-  # CheckHomeForFile() so the skip of tries can be per tree basis instead
-  # of user global.
-  no_try = (FilterFlag(args, "--no_try") or
-            FilterFlag(args, "--no-try") or
-            not (CheckHomeForFile(".gcl_upload_no_try") is None))
   no_watchlists = (FilterFlag(args, "--no_watchlists") or
                    FilterFlag(args, "--no-watchlists"))
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
   # Supports --clobber for the try server.
   clobber = FilterFlag(args, "--clobber")
 
-  # Disable try when the server is overridden.
-  server_1 = re.compile(r"^-s\b.*")
-  server_2 = re.compile(r"^--server\b.*")
-  for arg in args:
-    if server_1.match(arg) or server_2.match(arg):
-      no_try = True
-      break
-
   upload_arg = ["upload.py", "-y"]
   upload_arg.append("--server=" + GetCodeReviewSetting("CODE_REVIEW_SERVER"))
   upload_arg.extend(args)
 
   desc_file = ""
   if change_info.issue:  # Uploading a new patchset.
     found_message = False
     for arg in args:
       if arg.startswith("--message") or arg.startswith("-m"):
         found_message = True
@@ skipping 55 matching lines @@
     os.remove(desc_file)
 
   # Do background work on Rietveld to lint the file so that the results are
   # ready when the issue is viewed.
   SendToRietveld("/lint/issue%s_%s" % (issue, patchset), timeout=0.5)
 
   # Move back before considering try, so GetCodeReviewSettings is
   # consistent.
   os.chdir(previous_cwd)
 
-  # Once uploaded to Rietveld, send it to the try server.
-  if not no_try:
-    try_on_upload = GetCodeReviewSetting('TRY_ON_UPLOAD')
-    if try_on_upload and try_on_upload.lower() == 'true':
-      trychange_args = []
-      if clobber:
-        trychange_args.append('--clobber')
-      return TryChange(change_info, trychange_args, swallow_exception=True)
   return 0
 
 
 @need_change
 def CMDpresubmit(change_info):
   """Runs presubmit checks on the change.
 
   The actual presubmit code is implemented in presubmit_support.py and looks
   for PRESUBMIT.py files."""
   if not change_info.GetFiles():
@@ skipping 482 matching lines @@
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except gclient_utils.Error, e:
     print('Got an exception')
     print(str(e))
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))