Changes to support One-Click Revert in Commit Queue

commit_queue.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.
 """Commit queue executable.
 
 Reuse Rietveld and the Chromium Try Server to process and automatically commit
 patches.
 """
 
@@ skipping 17 matching lines @@
 import errors
 import projects
 import sig_handler
 
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class OnlyIssueRietveld(rietveld.Rietveld):
   """Returns a single issue for end-to-end in prod testing."""
-  def __init__(self, url, email, password, extra_headers, only_issue):
+  def __init__(self, url, email, password, extra_headers, only_issue,
+               only_revert_issue):
     super(OnlyIssueRietveld, self).__init__(url, email, password, extra_headers)
     self._only_issue = only_issue
+    self._only_revert_issue = only_revert_issue
 
   def get_pending_issues(self):
     """If it's set to return a single issue, only return this one."""
     if self._only_issue:
       return [self._only_issue]
     return []
 
+  def get_revert_issues(self):
+    """If it's set to return a single revert issue, only return this one."""
+    if self._only_revert_issue:
+      return [self._only_revert_issue]
+    return []
+
   def get_issue_properties(self, issue, messages):
     """Hacks the result to fake that the issue has the commit bit set."""
     data = super(OnlyIssueRietveld, self).get_issue_properties(issue, messages)
     if issue == self._only_issue:
       data['commit'] = True
+    elif issue == self._only_revert_issue:
+      data['revert'] = True
     return data
 
   def set_flag(self, issue, patchset, flag, value):
     if issue == self._only_issue and flag == 'commit' and value == 'False':
       self._only_issue = None
     return super(OnlyIssueRietveld, self).set_flag(issue, patchset, flag, value)
 
 
 class ReadOnlyRietveld(rietveld.Rietveld):
-  def __init__(self, url, email, password, extra_headers, only_issue):
+  def __init__(self, url, email, password, extra_headers, only_issue,
+               only_revert_issue):
     super(ReadOnlyRietveld, self).__init__(url, email, password, extra_headers)
     self._only_issue = only_issue
-    self._restricted = bool(only_issue)
+    self._only_revert_issue = only_revert_issue
+    self._restricted = bool(only_issue) or bool(only_revert_issue)
 
   def _send(self, request_path, **kwargs):
     """Ignore all post requests."""
     if kwargs.get('payload'):
       logging.warn('Ignoring POST to %s', request_path)
       return
     return super(ReadOnlyRietveld, self)._send(request_path, **kwargs)
 
   def get_pending_issues(self):
     """If it's set to return a single issue, only return this one."""
     if self._restricted:
       if self._only_issue:
         return [self._only_issue]
       return []
     return super(ReadOnlyRietveld, self).get_pending_issues()
 
+  def get_revert_issues(self):
+    """If it's set to return a single issue, only return this one."""
+    if self._restricted:
+      if self._only_revert_issue:
+        return [self._only_revert_issue]
+      return []
+    return super(ReadOnlyRietveld, self).get_revert_issues()
+
   def get_issue_properties(self, issue, messages):
     """Hacks the result to fake that the issue has the commit bit set."""
     data = super(ReadOnlyRietveld, self).get_issue_properties(issue, messages)
     if issue == self._only_issue:
       data['commit'] = True
+    elif issue == self._only_revert_issue:
+      data['revert'] = True
     return data
 
   def set_flag(self, issue, patchset, flag, value):
     if issue == self._only_issue and flag == 'commit' and value == 'False':
       self._only_issue = None
     return super(ReadOnlyRietveld, self).set_flag(issue, patchset, flag, value)
 
 
 class FakeCheckout(object):
   def __init__(self):
@@ skipping 61 matching lines @@
       description=sys.modules['__main__'].__doc__)
   project_choices = projects.supported_projects()
   parser.add_option('-v', '--verbose', action='store_true')
   parser.add_option(
       '--no-dry-run',
       action='store_false',
       dest='dry_run',
       default=True,
       help='Run for real instead of dry-run mode which is the default. '
       'WARNING: while the CQ won\'t touch rietveld in dry-run mode, the '
-      'Try Server will. So it is recommended to use --only-issue')
+      'Try Server will. So it is recommended to use --only-issue or '
+      '--only-revert-issue')
   parser.add_option(
       '--only-issue',
       type='int',
       help='Limits to a single issue. Useful for live testing; WARNING: it '
       'will fake that the issue has the CQ bit set, so only try with an '
       'issue you don\'t mind about.')
   parser.add_option(
+      '--only-revert-issue',
+      type='int',
+      help='Limits to a single issue to revert. Useful for live testing; '
+      'WARNING: it will fake that the issue has the revert bit set, so only '
+      'try with an issue you don\'t mind about.')
+  parser.add_option(
       '--fake',
       action='store_true',
       help='Run with a fake checkout to speed up testing')
   parser.add_option(
       '--no-try',
       action='store_true',
       help='Don\'t send try jobs.')
   parser.add_option(
       '-p',
       '--poll-interval',
@@ skipping 29 matching lines @@
         os.path.join(ROOT_DIR, 'subversion_config'))
 
     url = 'https://chromiumcodereview.appspot.com'
     gaia_creds = creds.Credentials(os.path.join(work_dir, '.gaia_pwd'))
     if options.dry_run:
       logging.debug('Dry run - skipping SCM check.')
       if options.only_issue:
         print(
             'Using read-only Rietveld; using only issue %d' %
             options.only_issue)
+      elif options.only_revert_issue:
+        print(
+            'Using read-only Rietveld; using only issue %d to revert' %
+            options.only_revert_issue)
       else:
         print('Using read-only Rietveld')
       # Make sure rietveld is not modified.
       rietveld_obj = ReadOnlyRietveld(
           url,
           options.user,
           gaia_creds.get(options.user),
           None,
-          options.only_issue)
+          options.only_issue,
+          options.only_revert_issue)
     else:
       AlertOnUncleanCheckout()
       print('WARNING: The Commit Queue is going to commit stuff')
-      if options.only_issue:
-        print('Using only issue %d' % options.only_issue)
+      if options.only_issue or options.only_revert_issue:
+        if options.only_issue:
+          print('Using only issue %d' % options.only_issue)
+        else:
+          print('Using only issue %d to revert' % options.only_revert_issue)
         rietveld_obj = OnlyIssueRietveld(
             url,
             options.user,
             gaia_creds.get(options.user),
             None,
-            options.only_issue)
+            options.only_issue,
+            options.only_revert_issue)
       else:
         rietveld_obj = rietveld.Rietveld(
             url,
             options.user,
             gaia_creds.get(options.user),
             None)
 
     pc = projects.load_project(
         options.project,
         options.user,
@@ skipping 45 matching lines @@
         pc.process_new_pending_commit()
         pc.update_status()
         pc.scan_results()
         if sig_handler.getTriggeredSignals():
           raise KeyboardInterrupt()
         # Save the db at each loop. The db can easily be in the 1mb range so
         # it's slowing down the CQ a tad but it in the 100ms range even for that
         # size.
         pc.save(db_path)
 
-        # More than a second to wait and due to sync.
+        # More than a 2 seconds to wait and due to sync.
         now = time.time()
-        if (next_loop - now) >= 1 and (next_sync - now) <= 0:
+        if (next_loop - now) >= 2 and (next_sync - now) <= 0:
           if sys.stdout.isatty():
             sys.stdout.write('Syncing while waiting                \r')
             sys.stdout.flush()
           try:
             pc.context.checkout.prepare(None)
           except subprocess2.CalledProcessError as e:
             # Don't crash, most of the time it's the svn server that is dead.
             # How fun. Send a stack trace to annoy the maintainer.
             errors.send_stack(e)
           next_sync = time.time() + SYNC_DELAY
@@ skipping 30 matching lines @@
     return 23
   except errors.ConfigurationError as e:
     parser.error(str(e))
     return 1
   return 0
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())