Gerrit git cl upload: implement patchset title (message).

R=machenbach@chromium.org,andybons@chromium.org
BUG=579178

Review URL: https://codereview.chromium.org/1886433003

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

git_cl.py

@@ -2235,11 +2235,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
     branch = GetTargetRef(remote, remote_branch, options.target_branch,
                           pending_prefix='')
 
-    if options.title:
-      # TODO(tandrii): it's now supported by Gerrit, implement!
-      print "\nPatch titles (-t) are not supported in Gerrit. Aborting..."
-      return 1
-
     if options.squash:
       if not self.GetIssue():
         # TODO(tandrii): deperecate this after 2016Q2.  Backwards compatibility
@@ -2387,6 +2382,16 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       change_desc.update_reviewers(options.reviewers, options.tbr_owners,
                                    change)
 
+    # Extra options that can be specified at push time. Doc:
+    # https://gerrit-review.googlesource.com/Documentation/user-upload.html
+    refspec_opts = []
+    if options.title:
+      # Per doc, spaces must be converted to underscores, and Gerrit will do the
+      # reverse on its side.
+      if '_' in options.title:
+        print('WARNING: underscores in title will be converted to spaces.')
+      refspec_opts.append('m=' + options.title.replace(' ', '_'))
+
     receive_options = []
     cc = self.GetCCList().split(',')
     if options.cc:
@@ -2398,13 +2403,24 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       receive_options.extend(
           '--reviewer=' + email for email in change_desc.get_reviewers())
 
-    git_command = ['push']
+    git_command = ['git', 'push']
     if receive_options:
+      # TODO(tandrii): clean this up in follow up. This doesn't work, as it gets
+      # totally ignored by Gerrit.
       git_command.append('--receive-pack=git receive-pack %s' %
                          ' '.join(receive_options))
-    git_command += [gerrit_remote, ref_to_push + ':refs/for/' + branch]
+
+    refspec_suffix = ''
+    if refspec_opts:
+      refspec_suffix = '%' + ','.join(refspec_opts)
+      assert ' ' not in refspec_suffix, (
+          'spaces not allowed in refspec: "%s"' % refspec_suffix)
+
+    refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
+    git_command += [gerrit_remote, refspec]
+
     push_stdout = gclient_utils.CheckCallAndFilter(
-        ['git'] + git_command,
+        git_command,
         print_stdout=True,
         # Flush after every line: useful for seeing progress when running as
         # recipe.

tests/git_cl_test.py

@@ -738,6 +738,7 @@ class TestGitCl(TestCase):
   @classmethod
   def _gerrit_upload_calls(cls, description, reviewers, squash,
                            expected_upstream_ref='origin/refs/heads/master',
+                           ref_suffix='',
                            post_amend_description=None, issue=None):
     if post_amend_description is None:
       post_amend_description = description
@@ -810,7 +811,7 @@ class TestGitCl(TestCase):
     calls += [
         ((['git',
            'push', receive_pack, 'origin',
-           ref_to_push + ':refs/for/refs/heads/master'],),
+           ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
          ('remote:\n'
          'remote: Processing changes: (\)\n'
          'remote: Processing changes: (|)\n'
@@ -840,18 +841,21 @@ class TestGitCl(TestCase):
       self,
       upload_args,
       description,
-      reviewers,
+      reviewers=None,
       squash=False,
       expected_upstream_ref='origin/refs/heads/master',
+      ref_suffix='',
       post_amend_description=None,
       issue=None):
     """Generic gerrit upload test framework."""
+    reviewers = reviewers or []
     self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
               CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
     self.calls = self._gerrit_base_calls(issue=issue)
     self.calls += self._gerrit_upload_calls(
         description, reviewers, squash,
         expected_upstream_ref=expected_upstream_ref,
+        ref_suffix=ref_suffix,
         post_amend_description=post_amend_description,
         issue=issue)
     # Uncomment when debugging.
@@ -872,6 +876,12 @@ class TestGitCl(TestCase):
         'desc\n\nBUG=\n\nChange-Id: I123456789\n',
         [])
 
+  def test_gerrit_patch_title(self):
+    self._run_gerrit_upload_test(
+        ['-t', 'Don\'t put under_scores as they become spaces'],
+        'desc\n\nBUG=\n\nChange-Id: I123456789',
+        ref_suffix='%m=Don\'t_put_under_scores_as_they_become_spaces')
+
   def test_gerrit_reviewers_cmd_line(self):
     self._run_gerrit_upload_test(
         ['-r', 'foo@example.com'],