Implement git cl upload --dry-run or --use-commit-queue for Gerrit.

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 1400 matching lines @@
               'the most recent patchset on the server is #%d.'
               % (local_patchset, latest_patchset))
         print('Uploading will still work, but if you\'ve uploaded to this '
               'issue from another machine or branch the patch you\'re '
               'uploading now might not include those changes.')
         ask_for_data('About to upload; enter to confirm.')
 
     print_stats(options.similarity, options.find_copies, git_diff_args)
     ret = self.CMDUploadChange(options, git_diff_args, change)
     if not ret:
+      if options.use_commit_queue:
+        self.SetCQState(_CQState.COMMIT)
+      elif options.cq_dry_run:
+        self.SetCQState(_CQState.DRY_RUN)
+
       git_set_branch_value('last-upload-hash',
                            RunGit(['rev-parse', 'HEAD']).strip())
       # Run post upload hooks, if specified.
       if settings.GetRunPostUploadHook():
         presubmit_support.DoPostUploadExecuter(
             change,
             self,
             settings.GetRoot(),
             options.verbose,
             sys.stdout)
@@ skipping 571 matching lines @@
                 'The current branch (%s) is tracking a local branch (%s) with '
                 'an associated CL.\n'
                 'Adding %s/#ps%s as a dependency patchset.\n'
                 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
                         branch_cl_patchset))
 
     project = settings.GetProject()
     if project:
       upload_args.extend(['--project', project])
 
-    if options.cq_dry_run:
-      upload_args.extend(['--cq_dry_run'])
-
     try:
       upload_args = ['upload'] + upload_args + args
       logging.info('upload.RealMain(%s)', upload_args)
       issue, patchset = upload.RealMain(upload_args)
       issue = int(issue)
       patchset = int(patchset)
     except KeyboardInterrupt:
       sys.exit(1)
     except:
       # If we got an exception after the user typed a description for their
       # change, back up the description before re-raising.
       if change_desc:
         backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
         print('\nGot exception while uploading -- saving description to %s\n' %
               backup_path)
         backup_file = open(backup_path, 'w')
         backup_file.write(change_desc.description)
         backup_file.close()
       raise
 
     if not self.GetIssue():
       self.SetIssue(issue)
     self.SetPatchset(patchset)
-
-    if options.use_commit_queue:
-      self.SetCQState(_CQState.COMMIT)
     return 0
 
 
 class _GerritChangelistImpl(_ChangelistCodereviewBase):
   def __init__(self, changelist, auth_config=None):
     # auth_config is Rietveld thing, kept here to preserve interface only.
     super(_GerritChangelistImpl, self).__init__(changelist)
     self._change_id = None
     # Lazily cached values.
     self._gerrit_server = None  # e.g. https://chromium-review.googlesource.com
@@ skipping 1753 matching lines @@
 
   options.reviewers = cleanup_list(options.reviewers)
   options.cc = cleanup_list(options.cc)
 
   if options.message_file:
     if options.message:
       parser.error('only one of --message and --message-file allowed.')
     options.message = gclient_utils.FileRead(options.message_file)
     options.message_file = None
 
+  if options.cq_dry_run and options.use_commit_queue:
+    parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
+
   # For sanity of test expectations, do this otherwise lazy-loading *now*.
   settings.GetIsGerrit()
 
   cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
   return cl.CMDUpload(options, args, orig_args)
 
 
 def IsSubmoduleMergeCommit(ref):
   # When submodules are added to the repo, we expect there to be a single
   # non-git-svn merge commit at remote HEAD with a signature comment.
@@ skipping 916 matching lines @@
 
   cl = Changelist(auth_config=auth_config)
   if options.clear:
     state = _CQState.CLEAR
   elif options.dry_run:
     state = _CQState.DRY_RUN
   else:
     state = _CQState.COMMIT
   if not cl.GetIssue():
     parser.error('Must upload the issue first')
-  cl.SetCQState(state)
+  cl._codereview_impl.SetCQState(state)
   return 0
 
 
 def CMDset_close(parser, args):
   """Closes the issue."""
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
   if args:
     parser.error('Unrecognized args: %s' % ' '.join(args))
@@ skipping 340 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)