Stop git cl using CQ_TRYBOTS.

Stop git cl using CQ_TRYBOTS.

This is broken for a few reasons (see bug for details). Also, this works automatically now with the analyze step.

This is a revert of r280039.

BUG=406238
R=iannucci@chromium.org, sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291526

[jam, 2014-08-22 17:30:26]

switching to an owner

[iannucci, 2014-08-22 17:32:26]

+navabi

[iannucci, 2014-08-22 17:32:41]

On 2014/08/22 17:32:26, iannucci wrote:
> +navabi

(for fyi, I have no stake in this)

[jam, 2014-08-22 17:36:19]

On 2014/08/22 17:32:41, iannucci wrote:
> On 2014/08/22 17:32:26, iannucci wrote:
> > +navabi
> 
> (for fyi, I have no stake in this)

I had just added you as a reviewer (iannucci) since dpranke is gone

[iannucci, 2014-08-22 17:38:14]

On 2014/08/22 17:36:19, jam wrote:
> On 2014/08/22 17:32:41, iannucci wrote:
> > On 2014/08/22 17:32:26, iannucci wrote:
> > > +navabi
> > 
> > (for fyi, I have no stake in this)
> 
> I had just added you as a reviewer (iannucci) since dpranke is gone

rslgtm

[sky, 2014-08-22 18:02:48]

LGTM

[jam, 2014-08-22 21:54:50]

The CQ bit was checked by jam@chromium.org

[commit-bot: I haz the power, 2014-08-22 21:55:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jam@chromium.org/501503002/1

[commit-bot: I haz the power, 2014-08-22 21:55:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-22 21:55:37]

Failed to apply patch for git_cl.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: git_cl.py
  |diff --git a/git_cl.py b/git_cl.py
  |index
2ccb61b34b4504263081db820173ba17496b7a98..1f4b01b039abdcf58f04786ccd8c8cd4b1e92e1a
100755
  |--- a/git_cl.py
  |+++ b/git_cl.py
  --------------------------
  No file to patch.  Skipping patch.
  4 out of 4 hunks ignored

Patch:       git_cl.py
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index
2ccb61b34b4504263081db820173ba17496b7a98..1f4b01b039abdcf58f04786ccd8c8cd4b1e92e1a
100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1570,7 +1570,7 @@ def GerritUpload(options, args, cl):
   return 0
 
 
-def RietveldUpload(options, args, cl, change):
+def RietveldUpload(options, args, cl):
   """upload the patch to rietveld."""
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
   upload_args.extend(['--server', cl.GetRietveldServer()])
@@ -1597,22 +1597,6 @@ def RietveldUpload(options, args, cl, change):
     change_desc = ChangeDescription(message)
     if options.reviewers:
       change_desc.update_reviewers(options.reviewers)
-    if options.auto_bots:
-      masters = presubmit_support.DoGetTryMasters(
-          change,
-          change.LocalPaths(),
-          settings.GetRoot(),
-          None,
-          None,
-          options.verbose,
-          sys.stdout)
-
-      if masters:
-        change_description = change_desc.description + '\nCQ_TRYBOTS='
-        lst = []
-        for master, mapping in masters.iteritems():
-          lst.append(master + ':' + ','.join(mapping.keys()))
-        change_desc.set_description(change_description + ';'.join(lst))
     if not options.force:
       change_desc.prompt()
 
@@ -1746,8 +1730,6 @@ def CMDupload(parser, args):
                          'use for CL.  Default: master')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
-  parser.add_option('--auto-bots', default=False, action='store_true',
-                    help='Autogenerate which trybots to use for this CL')
 
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
@@ -1807,7 +1789,7 @@ def CMDupload(parser, args):
   print_stats(options.similarity, options.find_copies, args)
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)
-  ret = RietveldUpload(options, args, cl, change)
+  ret = RietveldUpload(options, args, cl)
   if not ret:
     git_set_branch_value('last-upload-hash',
                          RunGit(['rev-parse', 'HEAD']).strip())

[jam, 2014-08-22 22:09:19]

The CQ bit was checked by jam@chromium.org

[commit-bot: I haz the power, 2014-08-22 22:09:40]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jam@chromium.org/501503002/20001

[commit-bot: I haz the power, 2014-08-22 22:10:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-22 22:10:05]

Failed to apply patch for git_cl.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: git_cl.py
  |diff --git a/git_cl.py b/git_cl.py
  |index
2ccb61b34b4504263081db820173ba17496b7a98..1f4b01b039abdcf58f04786ccd8c8cd4b1e92e1a
100755
  |--- a/git_cl.py
  |+++ b/git_cl.py
  --------------------------
  No file to patch.  Skipping patch.
  4 out of 4 hunks ignored

Patch:       git_cl.py
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index
2ccb61b34b4504263081db820173ba17496b7a98..1f4b01b039abdcf58f04786ccd8c8cd4b1e92e1a
100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1570,7 +1570,7 @@ def GerritUpload(options, args, cl):
   return 0
 
 
-def RietveldUpload(options, args, cl, change):
+def RietveldUpload(options, args, cl):
   """upload the patch to rietveld."""
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
   upload_args.extend(['--server', cl.GetRietveldServer()])
@@ -1597,22 +1597,6 @@ def RietveldUpload(options, args, cl, change):
     change_desc = ChangeDescription(message)
     if options.reviewers:
       change_desc.update_reviewers(options.reviewers)
-    if options.auto_bots:
-      masters = presubmit_support.DoGetTryMasters(
-          change,
-          change.LocalPaths(),
-          settings.GetRoot(),
-          None,
-          None,
-          options.verbose,
-          sys.stdout)
-
-      if masters:
-        change_description = change_desc.description + '\nCQ_TRYBOTS='
-        lst = []
-        for master, mapping in masters.iteritems():
-          lst.append(master + ':' + ','.join(mapping.keys()))
-        change_desc.set_description(change_description + ';'.join(lst))
     if not options.force:
       change_desc.prompt()
 
@@ -1746,8 +1730,6 @@ def CMDupload(parser, args):
                          'use for CL.  Default: master')
   parser.add_option('--email', default=None,
                     help='email address to use to connect to Rietveld')
-  parser.add_option('--auto-bots', default=False, action='store_true',
-                    help='Autogenerate which trybots to use for this CL')
 
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
@@ -1807,7 +1789,7 @@ def CMDupload(parser, args):
   print_stats(options.similarity, options.find_copies, args)
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)
-  ret = RietveldUpload(options, args, cl, change)
+  ret = RietveldUpload(options, args, cl)
   if not ret:
     git_set_branch_value('last-upload-hash',
                          RunGit(['rev-parse', 'HEAD']).strip())

[jam, 2014-08-22 22:13:25]

Committed patchset #2 manually as r291526 (presubmit successful).