Changes gcl upload to not submit a try.

This is the same as the last cl, but hopefully with the right svn
server.

Review URL: http://codereview.chromium.org/3023008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@53043 0039d316-1c4b-4281-b951-d872f2087c98

gcl.py

@@ -708,25 +708,17 @@ def CMDstatus():
 
 
 @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"))
 
@@ -737,14 +729,6 @@ def CMDupload(change_info, args):
   # 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)
@@ -820,14 +804,6 @@ def CMDupload(change_info, args):
   # 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
 
 

tests/gcl_unittest.py

@@ -196,7 +196,6 @@ class CMDuploadUnittest(GclTestsBase):
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
     files = [item[1] for item in change_info.files]
-    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
@@ -211,8 +210,6 @@ class CMDuploadUnittest(GclTestsBase):
                          change_info.patch).AndReturn(("1",
                                                                     "2"))
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
-    gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
-    gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     change_info.Save()
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
@@ -228,7 +225,6 @@ class CMDuploadUnittest(GclTestsBase):
                                 self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     change_info.Save()
-    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
@@ -252,42 +248,12 @@ class CMDuploadUnittest(GclTestsBase):
 
     gcl.CMDupload(['naame', '--server=a', '--no_watchlists'])
 
-  def testNoTry(self):
-    change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
-                                 [('A', 'aa'), ('M', 'bb')],
-                                 self.fake_root_dir)
-    change_info.Save = self.mox.CreateMockAnything()
-    change_info.Save()
-    gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
-    gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
-    gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
-    gcl.os.write(42, change_info.description)
-    gcl.os.close(42)
-    gcl.GetCodeReviewSetting('CC_LIST')
-    gcl.GetCodeReviewSetting('PRIVATE')
-    gcl.os.getcwd().AndReturn('somewhere')
-    gcl.os.chdir(change_info.GetLocalRoot())
-    gcl.GenerateDiff(change_info.GetFileNames())
-    gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
-        "--description_file=descfile",
-        "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
-    gcl.os.remove('descfile')
-    gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
-    gcl.os.chdir('somewhere')
-    gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
-    gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
-        ).AndReturn(change_info)
-    self.mox.ReplayAll()
-
-    gcl.CMDupload(['naame', '--no-try', '--no_watchlists'])
-
   def testNormal(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                  self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     change_info.Save()
-    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
@@ -303,8 +269,6 @@ class CMDuploadUnittest(GclTestsBase):
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
-    gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
-    gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True