From e5adf6126612b31178d01e43a1dc20ef05bdda89 Mon Sep 17 00:00:00 2001 From: Aaron Gable Date: Fri, 14 Jul 2017 10:43:58 -0700 Subject: [PATCH] Fix typo with --send-email [sic] flags The actual flag is --send-mail. Also includes a fix to publish these changes if a comment is included. Bug: 740950 Change-Id: I38ca0a35c1364c8364eb0ef301137c04daede40b Reviewed-on: https://chromium-review.googlesource.com/572033 Reviewed-by: Andrii Shyshkalov Commit-Queue: Aaron Gable --- git_cl.py | 2 +- split_cl.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index d23968056..2933b0054 100755 --- a/git_cl.py +++ b/git_cl.py @@ -3040,7 +3040,7 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase): refspec_opts.append('notify=NONE') # TODO(tandrii): options.message should be posted as a comment - # if --send-email is set on non-initial upload as Rietveld used to do it. + # if --send-mail is set on non-initial upload as Rietveld used to do it. if title: if not re.match(r'^[\w ]+$', title): diff --git a/split_cl.py b/split_cl.py index 7785cb8de..161437212 100644 --- a/split_cl.py +++ b/split_cl.py @@ -114,11 +114,12 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files, [f.LocalPath() for f in files], author) upload_args = ['-f', '--cq-dry-run', '-r', ','.join(reviewers)] if not comment: - upload_args.append('--send-email') + upload_args.append('--send-mail') print 'Uploading CL for ' + directory + '.' cmd_upload(upload_args) if comment: - changelist().AddComment(FormatDescriptionOrComment(comment, directory)) + changelist().AddComment(FormatDescriptionOrComment(comment, directory), + publish=True) def GetFilesSplitByOwners(owners_database, files):