git cl upload for Gerrit: use push options instead of refspec.
This removes limitation of no special chars in patchset titles.
BUG=chromium:663787,chromium:707963,gerrit:5184
R=sergiyb@chromium.org,agable@chromium.org
TEST=uploaded this CL using depot_tools with this patch :)
Change-Id: I5d684d0a0aa286a45ff99cca6d57aefa8436cd0f
Reviewed-on: https://chromium-review.googlesource.com/468926
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@google.com>
diff --git a/git_cl.py b/git_cl.py
index f8c536a..e273253 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2815,7 +2815,6 @@
# This may be None; default fallback value is determined in logic below.
title = options.title
- automatic_title = False
if options.squash:
self._GerritCommitMsgHookCheck(offer_removal=not options.force)
@@ -2830,8 +2829,6 @@
default_title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
title = ask_for_data(
'Title for patchset [%s]: ' % default_title) or default_title
- if title == default_title:
- automatic_title = True
change_id = self._GetChangeDetail()['change_id']
while True:
footer_change_ids = git_footers.get_footer_change_id(message)
@@ -2880,7 +2877,6 @@
# On first upload, patchset title is always this string, while
# --title flag gets converted to first line of message.
title = 'Initial upload'
- automatic_title = True
if not change_desc.description:
DieWithError("Description is empty. Aborting...")
message = change_desc.description
@@ -2932,29 +2928,22 @@
# Extra options that can be specified at push time. Doc:
# https://gerrit-review.googlesource.com/Documentation/user-upload.html
- refspec_opts = []
+ # This can be done either through use of refspec OR by using --push-option
+ # as documented here: https://git-scm.com/docs/git-push#git-push--o .
+ push_opts = []
if change_desc.get_reviewers(tbr_only=True):
print('Adding self-LGTM (Code-Review +1) because of TBRs')
- refspec_opts.append('l=Code-Review+1')
+ push_opts.append('l=Code-Review+1')
if title:
- if not re.match(r'^[\w ]+$', title):
- title = re.sub(r'[^\w ]', '', title)
- if not automatic_title:
- print('WARNING: Patchset title may only contain alphanumeric chars '
- 'and spaces. You can edit it in the UI. '
- 'See https://crbug.com/663787.\n'
- 'Cleaned up title: %s' % title)
- # Per doc, spaces must be converted to underscores, and Gerrit will do the
- # reverse on its side.
- refspec_opts.append('m=' + title.replace(' ', '_'))
+ push_opts.append('m=' + title)
if options.send_mail:
if not change_desc.get_reviewers():
DieWithError('Must specify reviewers to send email.', change_desc)
- refspec_opts.append('notify=ALL')
+ push_opts.append('notify=ALL')
else:
- refspec_opts.append('notify=NONE')
+ push_opts.append('notify=NONE')
reviewers = change_desc.get_reviewers()
if reviewers:
@@ -2962,28 +2951,24 @@
# side for real (b/34702620).
def clean_invisible_chars(email):
return email.decode('unicode_escape').encode('ascii', 'ignore')
- refspec_opts.extend('r=' + clean_invisible_chars(email).strip()
- for email in reviewers)
+ push_opts.extend('r=' + clean_invisible_chars(email).strip()
+ for email in reviewers)
if options.private:
- refspec_opts.append('draft')
+ push_opts.append('draft')
if options.topic:
# Documentation on Gerrit topics is here:
# https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
- refspec_opts.append('topic=%s' % options.topic)
+ push_opts.append('topic=%s' % options.topic)
- 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)
-
+ push_cmd = ['git', 'push']
+ for opt in sorted(push_opts): # Sort to make tests deterministic.
+ push_cmd += ['-o', opt]
+ push_cmd += [self.GetRemoteUrl(), '%s:refs/for/%s' % (ref_to_push, branch)]
try:
push_stdout = gclient_utils.CheckCallAndFilter(
- ['git', 'push', self.GetRemoteUrl(), refspec],
- print_stdout=True,
+ push_cmd, print_stdout=True,
# Flush after every line: useful for seeing progress when running as
# recipe.
filter_fn=lambda _: sys.stdout.flush())