The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1 | # Copyright (C) 2008 The Android Open Source Project |
| 2 | # |
| 3 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | # you may not use this file except in compliance with the License. |
| 5 | # You may obtain a copy of the License at |
| 6 | # |
| 7 | # http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | # |
| 9 | # Unless required by applicable law or agreed to in writing, software |
| 10 | # distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | # See the License for the specific language governing permissions and |
| 13 | # limitations under the License. |
| 14 | |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 15 | import copy |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 16 | import re |
| 17 | import sys |
| 18 | |
| 19 | from command import InteractiveCommand |
| 20 | from editor import Editor |
Remy Bohmer | 7f7acfe | 2020-08-01 18:36:44 +0200 | [diff] [blame] | 21 | from error import UploadError |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 22 | from git_command import GitCommand |
Sean McAllister | 682f0b6 | 2020-05-18 09:15:51 -0600 | [diff] [blame] | 23 | from git_refs import R_HEADS |
Remy Bohmer | 16c1328 | 2020-09-10 10:38:04 +0200 | [diff] [blame] | 24 | from hooks import RepoHook |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 25 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 26 | |
Dan Morrill | f0a9a1a | 2010-05-05 08:18:35 -0700 | [diff] [blame] | 27 | UNUSUAL_COMMIT_THRESHOLD = 5 |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 28 | |
David Pursehouse | 819827a | 2020-02-12 15:20:19 +0900 | [diff] [blame] | 29 | |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 30 | def _ConfirmManyUploads(multiple_branches=False): |
| 31 | if multiple_branches: |
David Pursehouse | 2f9e7e4 | 2013-03-05 17:26:46 +0900 | [diff] [blame] | 32 | print('ATTENTION: One or more branches has an unusually high number ' |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 33 | 'of commits.') |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 34 | else: |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 35 | print('ATTENTION: You are uploading an unusually high number of commits.') |
David Pursehouse | 2f9e7e4 | 2013-03-05 17:26:46 +0900 | [diff] [blame] | 36 | print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across ' |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 37 | 'branches?)') |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 38 | answer = input("If you are sure you intend to do this, type 'yes': ").strip() |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 39 | return answer == "yes" |
| 40 | |
David Pursehouse | 819827a | 2020-02-12 15:20:19 +0900 | [diff] [blame] | 41 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 42 | def _die(fmt, *args): |
| 43 | msg = fmt % args |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 44 | print('error: %s' % msg, file=sys.stderr) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 45 | sys.exit(1) |
| 46 | |
David Pursehouse | 819827a | 2020-02-12 15:20:19 +0900 | [diff] [blame] | 47 | |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 48 | def _SplitEmails(values): |
| 49 | result = [] |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 50 | for value in values: |
| 51 | result.extend([s.strip() for s in value.split(',')]) |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 52 | return result |
| 53 | |
David Pursehouse | 819827a | 2020-02-12 15:20:19 +0900 | [diff] [blame] | 54 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 55 | class Upload(InteractiveCommand): |
| 56 | common = True |
| 57 | helpSummary = "Upload changes for code review" |
David Pursehouse | 8f62fb7 | 2012-11-14 12:09:38 +0900 | [diff] [blame] | 58 | helpUsage = """ |
Ficus Kirkpatrick | a0de6e8 | 2010-10-22 13:06:47 -0700 | [diff] [blame] | 59 | %prog [--re --cc] [<project>]... |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 60 | """ |
| 61 | helpDescription = """ |
Shawn O. Pearce | 337fb9c | 2009-04-18 10:59:33 -0700 | [diff] [blame] | 62 | The '%prog' command is used to send changes to the Gerrit Code |
| 63 | Review system. It searches for topic branches in local projects |
| 64 | that have not yet been published for review. If multiple topic |
| 65 | branches are found, '%prog' opens an editor to allow the user to |
| 66 | select which branches to upload. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 67 | |
Shawn O. Pearce | 337fb9c | 2009-04-18 10:59:33 -0700 | [diff] [blame] | 68 | '%prog' searches for uploadable changes in all projects listed at |
| 69 | the command line. Projects can be specified either by name, or by |
| 70 | a relative or absolute path to the project's local directory. If no |
| 71 | projects are specified, '%prog' will search for uploadable changes |
| 72 | in all projects listed in the manifest. |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 73 | |
| 74 | If the --reviewers or --cc options are passed, those emails are |
| 75 | added to the respective list of users, and emails are sent to any |
Shawn O. Pearce | 337fb9c | 2009-04-18 10:59:33 -0700 | [diff] [blame] | 76 | new users. Users passed as --reviewers must already be registered |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 77 | with the code review system, or the upload will fail. |
Shawn O. Pearce | a6df7d2 | 2008-12-12 08:04:07 -0800 | [diff] [blame] | 78 | |
Mike Frysinger | b8f7bb0 | 2018-10-10 01:05:11 -0400 | [diff] [blame] | 79 | # Configuration |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 80 | |
| 81 | review.URL.autoupload: |
| 82 | |
Mike Frysinger | e931127 | 2011-08-11 15:46:43 -0400 | [diff] [blame] | 83 | To disable the "Upload ... (y/N)?" prompt, you can set a per-project |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 84 | or global Git configuration option. If review.URL.autoupload is set |
| 85 | to "true" then repo will assume you always answer "y" at the prompt, |
| 86 | and will not prompt you further. If it is set to "false" then repo |
| 87 | will assume you always answer "n", and will abort. |
| 88 | |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 89 | review.URL.autoreviewer: |
| 90 | |
| 91 | To automatically append a user or mailing list to reviews, you can set |
| 92 | a per-project or global Git option to do so. |
| 93 | |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 94 | review.URL.autocopy: |
| 95 | |
| 96 | To automatically copy a user or mailing list to all uploaded reviews, |
| 97 | you can set a per-project or global Git option to do so. Specifically, |
| 98 | review.URL.autocopy can be set to a comma separated list of reviewers |
| 99 | who you always want copied on all uploads with a non-empty --re |
| 100 | argument. |
| 101 | |
Shawn O. Pearce | 3575b8f | 2010-07-15 17:00:14 -0700 | [diff] [blame] | 102 | review.URL.username: |
| 103 | |
| 104 | Override the username used to connect to Gerrit Code Review. |
| 105 | By default the local part of the email address is used. |
| 106 | |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 107 | The URL must match the review URL listed in the manifest XML file, |
| 108 | or in the .git/config within the project. For example: |
| 109 | |
| 110 | [remote "origin"] |
| 111 | url = git://git.example.com/project.git |
| 112 | review = http://review.example.com/ |
| 113 | |
| 114 | [review "http://review.example.com/"] |
| 115 | autoupload = true |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 116 | autocopy = johndoe@company.com,my-team-alias@company.com |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 117 | |
Anthony Russello | d666e93 | 2012-06-01 00:48:22 -0400 | [diff] [blame] | 118 | review.URL.uploadtopic: |
| 119 | |
| 120 | To add a topic branch whenever uploading a commit, you can set a |
| 121 | per-project or global Git option to do so. If review.URL.uploadtopic |
| 122 | is set to "true" then repo will assume you always want the equivalent |
| 123 | of the -t option to the repo command. If unset or set to "false" then |
| 124 | repo will make use of only the command line option. |
| 125 | |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 126 | review.URL.uploadhashtags: |
| 127 | |
| 128 | To add hashtags whenever uploading a commit, you can set a per-project |
| 129 | or global Git option to do so. The value of review.URL.uploadhashtags |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 130 | will be used as comma delimited hashtags like the --hashtag option. |
| 131 | |
| 132 | review.URL.uploadlabels: |
| 133 | |
| 134 | To add labels whenever uploading a commit, you can set a per-project |
| 135 | or global Git option to do so. The value of review.URL.uploadlabels |
| 136 | will be used as comma delimited labels like the --label option. |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 137 | |
Mike Frysinger | f725e54 | 2020-03-14 17:39:03 -0400 | [diff] [blame] | 138 | review.URL.uploadnotify: |
| 139 | |
| 140 | Control e-mail notifications when uploading. |
| 141 | https://gerrit-review.googlesource.com/Documentation/user-upload.html#notify |
| 142 | |
Mike Frysinger | b8f7bb0 | 2018-10-10 01:05:11 -0400 | [diff] [blame] | 143 | # References |
Shawn O. Pearce | 337fb9c | 2009-04-18 10:59:33 -0700 | [diff] [blame] | 144 | |
Mike Frysinger | 3b24e7b | 2018-10-10 00:57:44 -0400 | [diff] [blame] | 145 | Gerrit Code Review: https://www.gerritcodereview.com/ |
Shawn O. Pearce | 337fb9c | 2009-04-18 10:59:33 -0700 | [diff] [blame] | 146 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 147 | """ |
| 148 | |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 149 | def _Options(self, p): |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 150 | p.add_option('-t', |
| 151 | dest='auto_topic', action='store_true', |
| 152 | help='Send local branch name to Gerrit Code Review') |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 153 | p.add_option('--hashtag', '--ht', |
| 154 | dest='hashtags', action='append', default=[], |
| 155 | help='Add hashtags (comma delimited) to the review.') |
Mike Frysinger | 7ff80af | 2020-02-19 03:00:26 -0500 | [diff] [blame] | 156 | p.add_option('--hashtag-branch', '--htb', |
| 157 | action='store_true', |
| 158 | help='Add local branch name as a hashtag.') |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 159 | p.add_option('-l', '--label', |
| 160 | dest='labels', action='append', default=[], |
| 161 | help='Add a label when uploading.') |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 162 | p.add_option('--re', '--reviewers', |
David Pursehouse | 0867104 | 2020-02-12 13:52:31 +0900 | [diff] [blame] | 163 | type='string', action='append', dest='reviewers', |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 164 | help='Request reviews from these people.') |
| 165 | p.add_option('--cc', |
David Pursehouse | 0867104 | 2020-02-12 13:52:31 +0900 | [diff] [blame] | 166 | type='string', action='append', dest='cc', |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 167 | help='Also send email to these email addresses.') |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 168 | p.add_option('--br', |
David Pursehouse | 0867104 | 2020-02-12 13:52:31 +0900 | [diff] [blame] | 169 | type='string', action='store', dest='branch', |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 170 | help='Branch to upload.') |
Daniel Sandler | e9d6b61 | 2012-04-06 10:39:32 -0400 | [diff] [blame] | 171 | p.add_option('--cbr', '--current-branch', |
| 172 | dest='current_branch', action='store_true', |
| 173 | help='Upload current git branch.') |
Vadim Bendebury | bd8f658 | 2018-10-31 13:48:01 -0700 | [diff] [blame] | 174 | p.add_option('--ne', '--no-emails', |
| 175 | action='store_false', dest='notify', default=True, |
| 176 | help='If specified, do not send emails on upload.') |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 177 | p.add_option('-p', '--private', |
| 178 | action='store_true', dest='private', default=False, |
| 179 | help='If specified, upload as a private change.') |
| 180 | p.add_option('-w', '--wip', |
| 181 | action='store_true', dest='wip', default=False, |
| 182 | help='If specified, upload as a work-in-progress change.') |
Masaya Suzuki | 305a2d0 | 2017-11-13 10:48:34 -0800 | [diff] [blame] | 183 | p.add_option('-o', '--push-option', |
| 184 | type='string', action='append', dest='push_options', |
| 185 | default=[], |
| 186 | help='Additional push options to transmit') |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 187 | p.add_option('-D', '--destination', '--dest', |
| 188 | type='string', action='store', dest='dest_branch', |
| 189 | metavar='BRANCH', |
| 190 | help='Submit for review on this target branch.') |
Mike Frysinger | 819cc81 | 2020-02-19 02:27:22 -0500 | [diff] [blame] | 191 | p.add_option('-n', '--dry-run', |
| 192 | dest='dryrun', default=False, action='store_true', |
| 193 | help='Do everything except actually upload the CL.') |
Mike Frysinger | 02aa889 | 2020-02-19 02:32:52 -0500 | [diff] [blame] | 194 | p.add_option('-y', '--yes', |
| 195 | default=False, action='store_true', |
| 196 | help='Answer yes to all safe prompts.') |
Mike Frysinger | 21c1575 | 2020-02-11 05:17:16 -0500 | [diff] [blame] | 197 | p.add_option('--no-cert-checks', |
| 198 | dest='validate_certs', action='store_false', default=True, |
| 199 | help='Disable verifying ssl certs (unsafe).') |
Remy Bohmer | 7f7acfe | 2020-08-01 18:36:44 +0200 | [diff] [blame] | 200 | RepoHook.AddOptionGroup(p, 'pre-upload') |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 201 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 202 | def _SingleBranch(self, opt, branch, people): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 203 | project = branch.project |
| 204 | name = branch.name |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 205 | remote = project.GetBranch(name).remote |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 206 | |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 207 | key = 'review.%s.autoupload' % remote.review |
| 208 | answer = project.config.GetBoolean(key) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 209 | |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 210 | if answer is False: |
| 211 | _die("upload blocked by %s = false" % key) |
| 212 | |
| 213 | if answer is None: |
Shawn O. Pearce | 66bdd46 | 2009-04-17 18:47:22 -0700 | [diff] [blame] | 214 | date = branch.date |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 215 | commit_list = branch.commits |
Shawn O. Pearce | 66bdd46 | 2009-04-17 18:47:22 -0700 | [diff] [blame] | 216 | |
Chirayu Desai | 610d3c4 | 2013-06-24 14:02:12 +0530 | [diff] [blame] | 217 | destination = opt.dest_branch or project.dest_branch or project.revisionExpr |
Nicolas Cornu | b54343d | 2017-07-10 10:31:24 +0200 | [diff] [blame] | 218 | print('Upload project %s/ to remote branch %s%s:' % |
Mike Frysinger | b0fbc7f | 2020-02-25 02:58:04 -0500 | [diff] [blame] | 219 | (project.relpath, destination, ' (private)' if opt.private else '')) |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 220 | print(' branch %s (%2d commit%s, %s):' % ( |
David Pursehouse | abdf750 | 2020-02-12 14:58:39 +0900 | [diff] [blame] | 221 | name, |
| 222 | len(commit_list), |
| 223 | len(commit_list) != 1 and 's' or '', |
| 224 | date)) |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 225 | for commit in commit_list: |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 226 | print(' %s' % commit) |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 227 | |
Mike Frysinger | ab85fe7 | 2019-07-04 17:35:11 -0400 | [diff] [blame] | 228 | print('to %s (y/N)? ' % remote.review, end='') |
| 229 | # TODO: When we require Python 3, use flush=True w/print above. |
| 230 | sys.stdout.flush() |
Mike Frysinger | 02aa889 | 2020-02-19 02:32:52 -0500 | [diff] [blame] | 231 | if opt.yes: |
| 232 | print('<--yes>') |
| 233 | answer = True |
| 234 | else: |
| 235 | answer = sys.stdin.readline().strip().lower() |
| 236 | answer = answer in ('y', 'yes', '1', 'true', 't') |
Shawn O. Pearce | a608fb0 | 2009-04-17 12:11:24 -0700 | [diff] [blame] | 237 | |
| 238 | if answer: |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 239 | if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD: |
| 240 | answer = _ConfirmManyUploads() |
| 241 | |
| 242 | if answer: |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 243 | self._UploadAndReport(opt, [branch], people) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 244 | else: |
| 245 | _die("upload aborted by user") |
| 246 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 247 | def _MultipleBranches(self, opt, pending, people): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 248 | projects = {} |
| 249 | branches = {} |
| 250 | |
| 251 | script = [] |
| 252 | script.append('# Uncomment the branches to upload:') |
| 253 | for project, avail in pending: |
| 254 | script.append('#') |
| 255 | script.append('# project %s/:' % project.relpath) |
| 256 | |
| 257 | b = {} |
| 258 | for branch in avail: |
Bryan Jacobs | 710d4b0 | 2013-05-31 15:28:05 -0400 | [diff] [blame] | 259 | if branch is None: |
| 260 | continue |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 261 | name = branch.name |
| 262 | date = branch.date |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 263 | commit_list = branch.commits |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 264 | |
| 265 | if b: |
| 266 | script.append('#') |
Bryan Jacobs | 691a759 | 2013-05-31 15:45:28 -0400 | [diff] [blame] | 267 | destination = opt.dest_branch or project.dest_branch or project.revisionExpr |
Christer Fletcher | 6a1f737 | 2011-04-28 14:13:14 +0200 | [diff] [blame] | 268 | script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % ( |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 269 | name, |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 270 | len(commit_list), |
| 271 | len(commit_list) != 1 and 's' or '', |
Christer Fletcher | 6a1f737 | 2011-04-28 14:13:14 +0200 | [diff] [blame] | 272 | date, |
Bryan Jacobs | 691a759 | 2013-05-31 15:45:28 -0400 | [diff] [blame] | 273 | destination)) |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 274 | for commit in commit_list: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 275 | script.append('# %s' % commit) |
| 276 | b[name] = branch |
| 277 | |
| 278 | projects[project.relpath] = project |
| 279 | branches[project.name] = b |
| 280 | script.append('') |
| 281 | |
| 282 | script = Editor.EditString("\n".join(script)).split("\n") |
| 283 | |
| 284 | project_re = re.compile(r'^#?\s*project\s*([^\s]+)/:$') |
| 285 | branch_re = re.compile(r'^\s*branch\s*([^\s(]+)\s*\(.*') |
| 286 | |
| 287 | project = None |
| 288 | todo = [] |
| 289 | |
| 290 | for line in script: |
| 291 | m = project_re.match(line) |
| 292 | if m: |
| 293 | name = m.group(1) |
| 294 | project = projects.get(name) |
| 295 | if not project: |
| 296 | _die('project %s not available for upload', name) |
| 297 | continue |
| 298 | |
| 299 | m = branch_re.match(line) |
| 300 | if m: |
| 301 | name = m.group(1) |
| 302 | if not project: |
| 303 | _die('project for branch %s not in script', name) |
| 304 | branch = branches[project.name].get(name) |
| 305 | if not branch: |
| 306 | _die('branch %s not in %s', name, project.relpath) |
| 307 | todo.append(branch) |
| 308 | if not todo: |
| 309 | _die("nothing uncommented for upload") |
Dan Morrill | 879a9a5 | 2010-05-04 16:56:07 -0700 | [diff] [blame] | 310 | |
| 311 | many_commits = False |
| 312 | for branch in todo: |
| 313 | if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD: |
| 314 | many_commits = True |
| 315 | break |
| 316 | if many_commits: |
| 317 | if not _ConfirmManyUploads(multiple_branches=True): |
| 318 | _die("upload aborted by user") |
| 319 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 320 | self._UploadAndReport(opt, todo, people) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 321 | |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 322 | def _AppendAutoList(self, branch, people): |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 323 | """ |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 324 | Appends the list of reviewers in the git project's config. |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 325 | Appends the list of users in the CC list in the git project's config if a |
| 326 | non-empty reviewer list was found. |
| 327 | """ |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 328 | name = branch.name |
| 329 | project = branch.project |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 330 | |
| 331 | key = 'review.%s.autoreviewer' % project.GetBranch(name).remote.review |
| 332 | raw_list = project.config.GetString(key) |
David Pursehouse | 8f78a83 | 2020-02-12 11:20:36 +0900 | [diff] [blame] | 333 | if raw_list is not None: |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 334 | people[0].extend([entry.strip() for entry in raw_list.split(',')]) |
| 335 | |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 336 | key = 'review.%s.autocopy' % project.GetBranch(name).remote.review |
| 337 | raw_list = project.config.GetString(key) |
David Pursehouse | 8f78a83 | 2020-02-12 11:20:36 +0900 | [diff] [blame] | 338 | if raw_list is not None and len(people[0]) > 0: |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 339 | people[1].extend([entry.strip() for entry in raw_list.split(',')]) |
| 340 | |
Ficus Kirkpatrick | bc7ef67 | 2009-05-04 12:45:11 -0700 | [diff] [blame] | 341 | def _FindGerritChange(self, branch): |
| 342 | last_pub = branch.project.WasPublished(branch.name) |
| 343 | if last_pub is None: |
| 344 | return "" |
| 345 | |
| 346 | refs = branch.GetPublishedRefs() |
| 347 | try: |
| 348 | # refs/changes/XYZ/N --> XYZ |
| 349 | return refs.get(last_pub).split('/')[-2] |
David Pursehouse | 1d947b3 | 2012-10-25 12:23:11 +0900 | [diff] [blame] | 350 | except (AttributeError, IndexError): |
Ficus Kirkpatrick | bc7ef67 | 2009-05-04 12:45:11 -0700 | [diff] [blame] | 351 | return "" |
| 352 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 353 | def _UploadAndReport(self, opt, todo, original_people): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 354 | have_errors = False |
| 355 | for branch in todo: |
| 356 | try: |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 357 | people = copy.deepcopy(original_people) |
bijia | 093fdb6 | 2013-11-28 09:19:22 +0800 | [diff] [blame] | 358 | self._AppendAutoList(branch, people) |
Ben Komalo | 08a3f68 | 2010-07-15 16:03:02 -0700 | [diff] [blame] | 359 | |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 360 | # Check if there are local changes that may have been forgotten |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 361 | changes = branch.project.UncommitedFiles() |
| 362 | if changes: |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 363 | key = 'review.%s.autoupload' % branch.project.remote.review |
| 364 | answer = branch.project.config.GetBoolean(key) |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 365 | |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 366 | # if they want to auto upload, let's not ask because it could be automated |
| 367 | if answer is None: |
Mike Frysinger | ab85fe7 | 2019-07-04 17:35:11 -0400 | [diff] [blame] | 368 | print() |
| 369 | print('Uncommitted changes in %s (did you forget to amend?):' |
| 370 | % branch.project.name) |
| 371 | print('\n'.join(changes)) |
| 372 | print('Continue uploading? (y/N) ', end='') |
| 373 | # TODO: When we require Python 3, use flush=True w/print above. |
| 374 | sys.stdout.flush() |
Mike Frysinger | 02aa889 | 2020-02-19 02:32:52 -0500 | [diff] [blame] | 375 | if opt.yes: |
| 376 | print('<--yes>') |
| 377 | a = 'yes' |
| 378 | else: |
| 379 | a = sys.stdin.readline().strip().lower() |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 380 | if a not in ('y', 'yes', 't', 'true', 'on'): |
| 381 | print("skipping upload", file=sys.stderr) |
| 382 | branch.uploaded = False |
| 383 | branch.error = 'User aborted' |
| 384 | continue |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 385 | |
Anthony Russello | d666e93 | 2012-06-01 00:48:22 -0400 | [diff] [blame] | 386 | # Check if topic branches should be sent to the server during upload |
| 387 | if opt.auto_topic is not True: |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 388 | key = 'review.%s.uploadtopic' % branch.project.remote.review |
| 389 | opt.auto_topic = branch.project.config.GetBoolean(key) |
Anthony Russello | d666e93 | 2012-06-01 00:48:22 -0400 | [diff] [blame] | 390 | |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 391 | def _ExpandCommaList(value): |
| 392 | """Split |value| up into comma delimited entries.""" |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 393 | if not value: |
| 394 | return |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 395 | for ret in value.split(','): |
| 396 | ret = ret.strip() |
| 397 | if ret: |
| 398 | yield ret |
| 399 | |
| 400 | # Check if hashtags should be included. |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 401 | key = 'review.%s.uploadhashtags' % branch.project.remote.review |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 402 | hashtags = set(_ExpandCommaList(branch.project.config.GetString(key))) |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 403 | for tag in opt.hashtags: |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 404 | hashtags.update(_ExpandCommaList(tag)) |
Mike Frysinger | 7ff80af | 2020-02-19 03:00:26 -0500 | [diff] [blame] | 405 | if opt.hashtag_branch: |
| 406 | hashtags.add(branch.name) |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 407 | |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 408 | # Check if labels should be included. |
| 409 | key = 'review.%s.uploadlabels' % branch.project.remote.review |
| 410 | labels = set(_ExpandCommaList(branch.project.config.GetString(key))) |
| 411 | for label in opt.labels: |
| 412 | labels.update(_ExpandCommaList(label)) |
| 413 | # Basic sanity check on label syntax. |
| 414 | for label in labels: |
| 415 | if not re.match(r'^.+[+-][0-9]+$', label): |
| 416 | print('repo: error: invalid label syntax "%s": labels use forms ' |
| 417 | 'like CodeReview+1 or Verified-1' % (label,), file=sys.stderr) |
| 418 | sys.exit(1) |
| 419 | |
Mike Frysinger | f725e54 | 2020-03-14 17:39:03 -0400 | [diff] [blame] | 420 | # Handle e-mail notifications. |
| 421 | if opt.notify is False: |
| 422 | notify = 'NONE' |
| 423 | else: |
| 424 | key = 'review.%s.uploadnotify' % branch.project.remote.review |
| 425 | notify = branch.project.config.GetString(key) |
| 426 | |
Colin Cross | 59b31cb | 2013-10-08 23:10:52 -0700 | [diff] [blame] | 427 | destination = opt.dest_branch or branch.project.dest_branch |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 428 | |
| 429 | # Make sure our local branch is not setup to track a different remote branch |
| 430 | merge_branch = self._GetMergeBranch(branch.project) |
Conley Owens | fbd3f2a | 2013-10-15 12:59:00 -0700 | [diff] [blame] | 431 | if destination: |
Sean McAllister | 682f0b6 | 2020-05-18 09:15:51 -0600 | [diff] [blame] | 432 | full_dest = destination |
| 433 | if not full_dest.startswith(R_HEADS): |
| 434 | full_dest = R_HEADS + full_dest |
| 435 | |
Conley Owens | fbd3f2a | 2013-10-15 12:59:00 -0700 | [diff] [blame] | 436 | if not opt.dest_branch and merge_branch and merge_branch != full_dest: |
| 437 | print('merge branch %s does not match destination branch %s' |
| 438 | % (merge_branch, full_dest)) |
| 439 | print('skipping upload.') |
| 440 | print('Please use `--destination %s` if this is intentional' |
| 441 | % destination) |
| 442 | branch.uploaded = False |
| 443 | continue |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 444 | |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 445 | branch.UploadForReview(people, |
Mike Frysinger | 819cc81 | 2020-02-19 02:27:22 -0500 | [diff] [blame] | 446 | dryrun=opt.dryrun, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 447 | auto_topic=opt.auto_topic, |
Mike Frysinger | 84685ba | 2020-02-19 02:22:22 -0500 | [diff] [blame] | 448 | hashtags=hashtags, |
Mike Frysinger | fc1b18a | 2020-02-24 15:38:07 -0500 | [diff] [blame] | 449 | labels=labels, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 450 | private=opt.private, |
Mike Frysinger | f725e54 | 2020-03-14 17:39:03 -0400 | [diff] [blame] | 451 | notify=notify, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 452 | wip=opt.wip, |
Łukasz Gardoń | bed59ce | 2017-08-08 10:18:11 +0200 | [diff] [blame] | 453 | dest_branch=destination, |
Masaya Suzuki | 305a2d0 | 2017-11-13 10:48:34 -0800 | [diff] [blame] | 454 | validate_certs=opt.validate_certs, |
| 455 | push_options=opt.push_options) |
Łukasz Gardoń | bed59ce | 2017-08-08 10:18:11 +0200 | [diff] [blame] | 456 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 457 | branch.uploaded = True |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 458 | except UploadError as e: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 459 | branch.error = e |
| 460 | branch.uploaded = False |
| 461 | have_errors = True |
| 462 | |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 463 | print(file=sys.stderr) |
| 464 | print('----------------------------------------------------------------------', file=sys.stderr) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 465 | |
| 466 | if have_errors: |
| 467 | for branch in todo: |
| 468 | if not branch.uploaded: |
Shawn O. Pearce | f00e0ce | 2009-08-22 18:39:49 -0700 | [diff] [blame] | 469 | if len(str(branch.error)) <= 30: |
| 470 | fmt = ' (%s)' |
| 471 | else: |
| 472 | fmt = '\n (%s)' |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 473 | print(('[FAILED] %-15s %-15s' + fmt) % ( |
David Pursehouse | abdf750 | 2020-02-12 14:58:39 +0900 | [diff] [blame] | 474 | branch.project.relpath + '/', |
| 475 | branch.name, |
| 476 | str(branch.error)), |
| 477 | file=sys.stderr) |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 478 | print() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 479 | |
| 480 | for branch in todo: |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 481 | if branch.uploaded: |
| 482 | print('[OK ] %-15s %s' % ( |
David Pursehouse | abdf750 | 2020-02-12 14:58:39 +0900 | [diff] [blame] | 483 | branch.project.relpath + '/', |
| 484 | branch.name), |
| 485 | file=sys.stderr) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 486 | |
| 487 | if have_errors: |
| 488 | sys.exit(1) |
| 489 | |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 490 | def _GetMergeBranch(self, project): |
| 491 | p = GitCommand(project, |
| 492 | ['rev-parse', '--abbrev-ref', 'HEAD'], |
David Pursehouse | e5913ae | 2020-02-12 13:56:59 +0900 | [diff] [blame] | 493 | capture_stdout=True, |
| 494 | capture_stderr=True) |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 495 | p.Wait() |
| 496 | local_branch = p.stdout.strip() |
| 497 | p = GitCommand(project, |
| 498 | ['config', '--get', 'branch.%s.merge' % local_branch], |
David Pursehouse | e5913ae | 2020-02-12 13:56:59 +0900 | [diff] [blame] | 499 | capture_stdout=True, |
| 500 | capture_stderr=True) |
Conley Owens | 3bfd721 | 2013-09-30 15:54:38 -0700 | [diff] [blame] | 501 | p.Wait() |
| 502 | merge_branch = p.stdout.strip() |
| 503 | return merge_branch |
| 504 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 505 | def Execute(self, opt, args): |
| 506 | project_list = self.GetProjects(args) |
| 507 | pending = [] |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 508 | reviewers = [] |
| 509 | cc = [] |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 510 | branch = None |
| 511 | |
| 512 | if opt.branch: |
| 513 | branch = opt.branch |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 514 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 515 | for project in project_list: |
Daniel Sandler | e9d6b61 | 2012-04-06 10:39:32 -0400 | [diff] [blame] | 516 | if opt.current_branch: |
| 517 | cbr = project.CurrentBranch |
Warren Turkal | 011d4f4 | 2013-11-27 16:20:57 -0800 | [diff] [blame] | 518 | up_branch = project.GetUploadableBranch(cbr) |
| 519 | if up_branch: |
| 520 | avail = [up_branch] |
| 521 | else: |
| 522 | avail = None |
Mike Frysinger | 160748f | 2020-11-10 01:09:51 -0500 | [diff] [blame] | 523 | print('repo: error: Unable to upload branch "%s". ' |
| 524 | 'You might be able to fix the branch by running:\n' |
| 525 | ' git branch --set-upstream-to m/%s' % |
| 526 | (str(cbr), self.manifest.branch), |
Warren Turkal | 011d4f4 | 2013-11-27 16:20:57 -0800 | [diff] [blame] | 527 | file=sys.stderr) |
Daniel Sandler | e9d6b61 | 2012-04-06 10:39:32 -0400 | [diff] [blame] | 528 | else: |
| 529 | avail = project.GetUploadableBranches(branch) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 530 | if avail: |
| 531 | pending.append((project, avail)) |
| 532 | |
Mike Frysinger | 163a3be | 2016-04-04 17:31:32 -0400 | [diff] [blame] | 533 | if not pending: |
Mike Frysinger | 7a753b8 | 2020-02-19 00:14:32 -0500 | [diff] [blame] | 534 | if branch is None: |
| 535 | print('repo: error: no branches ready for upload', file=sys.stderr) |
| 536 | else: |
| 537 | print('repo: error: no branches named "%s" ready for upload' % |
| 538 | (branch,), file=sys.stderr) |
| 539 | return 1 |
Mike Frysinger | 163a3be | 2016-04-04 17:31:32 -0400 | [diff] [blame] | 540 | |
Remy Bohmer | 7f7acfe | 2020-08-01 18:36:44 +0200 | [diff] [blame] | 541 | pending_proj_names = [project.name for (project, available) in pending] |
| 542 | pending_worktrees = [project.worktree for (project, available) in pending] |
| 543 | hook = RepoHook.FromSubcmd( |
| 544 | hook_type='pre-upload', manifest=self.manifest, |
| 545 | opt=opt, abort_if_user_denies=True) |
| 546 | if not hook.Run( |
| 547 | project_list=pending_proj_names, |
| 548 | worktree_list=pending_worktrees): |
| 549 | return 1 |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 550 | |
Joe Onorato | 2896a79 | 2008-11-17 16:56:36 -0500 | [diff] [blame] | 551 | if opt.reviewers: |
| 552 | reviewers = _SplitEmails(opt.reviewers) |
| 553 | if opt.cc: |
| 554 | cc = _SplitEmails(opt.cc) |
David Pursehouse | 8f62fb7 | 2012-11-14 12:09:38 +0900 | [diff] [blame] | 555 | people = (reviewers, cc) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 556 | |
Mike Frysinger | 163a3be | 2016-04-04 17:31:32 -0400 | [diff] [blame] | 557 | if len(pending) == 1 and len(pending[0][1]) == 1: |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 558 | self._SingleBranch(opt, pending[0][1][0], people) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 559 | else: |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 560 | self._MultipleBranches(opt, pending, people) |