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 1398 matching lines @@
           local_patchset != latest_patchset):
         print('The last upload made from this repository was patchset #%d but '
               '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)

[Michael Achenbach, 2016/07/06 07:30:39]

Dumb question: How is 'self' referring to the 'impl' class? Got confused and
couldn't find again how it's wired together.

[tandrii(chromium), 2016/07/06 10:38:25]

__getattr__

     if not ret:
+      if options.use_commit_queue:

[Michael Achenbach, 2016/07/06 07:30:39]

nit: Maybe give dry-run precedence over commit? If somebody used both options
it's likely a mistake, but I'd interpret the appearance of the dry-run option as
the user not wanting to commit.

Or is there another place that makes sure not both options are used?

[tandrii(chromium), 2016/07/06 10:38:25]

added a check early on.

+        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 33 matching lines @@
   def GetApprovingReviewers(self):
     return self._codereview_impl.GetApprovingReviewers()
 
   def GetMostRecentPatchset(self):
     return self._codereview_impl.GetMostRecentPatchset()
 
   def __getattr__(self, attr):
     # This is because lots of untested code accesses Rietveld-specific stuff
     # directly, and it's hard to fix for sure. So, just let it work, and fix
     # on a case by case basis.
     return getattr(self._codereview_impl, attr)

[tandrii(chromium), 2016/07/06 10:38:25]

this is the magic

 
 
 class _ChangelistCodereviewBase(object):
   """Abstract base class encapsulating codereview specifics of a changelist."""
   def __init__(self, changelist):
     self._changelist = changelist  # instance of Changelist
 
   def __getattr__(self, attr):
     # Forward methods to changelist.
     # TODO(tandrii): maybe clean up _GerritChangelistImpl and
@@ skipping 517 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 3050 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)