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