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