blob: 633ddc81a080974f2f00156f5e4dfdccb9d52c0b [file] [log] [blame]
Mike Frysingerf6013762019-06-13 02:30:51 -04001# -*- coding:utf-8 -*-
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002#
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 Owenscecd1d82012-11-01 22:59:27 -070017from __future__ import print_function
Ben Komalo08a3f682010-07-15 16:03:02 -070018import copy
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070019import re
20import sys
21
22from command import InteractiveCommand
23from editor import Editor
Doug Anderson37282b42011-03-04 11:54:18 -080024from error import HookError, UploadError
Conley Owens3bfd7212013-09-30 15:54:38 -070025from git_command import GitCommand
Doug Anderson37282b42011-03-04 11:54:18 -080026from project import RepoHook
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070027
David Pursehouse59bbb582013-05-17 10:49:33 +090028from pyversion import is_python3
29if not is_python3():
David Pursehousea46bf7d2020-02-15 12:45:53 +090030 input = raw_input # noqa: F821
Anthony Kingd792f792014-05-05 22:01:07 +010031else:
32 unicode = str
Chirayu Desai217ea7d2013-03-01 19:14:38 +053033
Dan Morrillf0a9a1a2010-05-05 08:18:35 -070034UNUSUAL_COMMIT_THRESHOLD = 5
Dan Morrill879a9a52010-05-04 16:56:07 -070035
David Pursehouse819827a2020-02-12 15:20:19 +090036
Dan Morrill879a9a52010-05-04 16:56:07 -070037def _ConfirmManyUploads(multiple_branches=False):
38 if multiple_branches:
David Pursehouse2f9e7e42013-03-05 17:26:46 +090039 print('ATTENTION: One or more branches has an unusually high number '
Sarah Owenscecd1d82012-11-01 22:59:27 -070040 'of commits.')
Dan Morrill879a9a52010-05-04 16:56:07 -070041 else:
Sarah Owenscecd1d82012-11-01 22:59:27 -070042 print('ATTENTION: You are uploading an unusually high number of commits.')
David Pursehouse2f9e7e42013-03-05 17:26:46 +090043 print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across '
Sarah Owenscecd1d82012-11-01 22:59:27 -070044 'branches?)')
Chirayu Desai217ea7d2013-03-01 19:14:38 +053045 answer = input("If you are sure you intend to do this, type 'yes': ").strip()
Dan Morrill879a9a52010-05-04 16:56:07 -070046 return answer == "yes"
47
David Pursehouse819827a2020-02-12 15:20:19 +090048
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070049def _die(fmt, *args):
50 msg = fmt % args
Sarah Owenscecd1d82012-11-01 22:59:27 -070051 print('error: %s' % msg, file=sys.stderr)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070052 sys.exit(1)
53
David Pursehouse819827a2020-02-12 15:20:19 +090054
Joe Onorato2896a792008-11-17 16:56:36 -050055def _SplitEmails(values):
56 result = []
David Pursehouse8a68ff92012-09-24 12:15:13 +090057 for value in values:
58 result.extend([s.strip() for s in value.split(',')])
Joe Onorato2896a792008-11-17 16:56:36 -050059 return result
60
David Pursehouse819827a2020-02-12 15:20:19 +090061
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070062class Upload(InteractiveCommand):
63 common = True
64 helpSummary = "Upload changes for code review"
David Pursehouse8f62fb72012-11-14 12:09:38 +090065 helpUsage = """
Ficus Kirkpatricka0de6e82010-10-22 13:06:47 -070066%prog [--re --cc] [<project>]...
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070067"""
68 helpDescription = """
Shawn O. Pearce337fb9c2009-04-18 10:59:33 -070069The '%prog' command is used to send changes to the Gerrit Code
70Review system. It searches for topic branches in local projects
71that have not yet been published for review. If multiple topic
72branches are found, '%prog' opens an editor to allow the user to
73select which branches to upload.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070074
Shawn O. Pearce337fb9c2009-04-18 10:59:33 -070075'%prog' searches for uploadable changes in all projects listed at
76the command line. Projects can be specified either by name, or by
77a relative or absolute path to the project's local directory. If no
78projects are specified, '%prog' will search for uploadable changes
79in all projects listed in the manifest.
Joe Onorato2896a792008-11-17 16:56:36 -050080
81If the --reviewers or --cc options are passed, those emails are
82added to the respective list of users, and emails are sent to any
Shawn O. Pearce337fb9c2009-04-18 10:59:33 -070083new users. Users passed as --reviewers must already be registered
Joe Onorato2896a792008-11-17 16:56:36 -050084with the code review system, or the upload will fail.
Shawn O. Pearcea6df7d22008-12-12 08:04:07 -080085
Mike Frysingerb8f7bb02018-10-10 01:05:11 -040086# Configuration
Shawn O. Pearcea608fb02009-04-17 12:11:24 -070087
88review.URL.autoupload:
89
Mike Frysingere9311272011-08-11 15:46:43 -040090To disable the "Upload ... (y/N)?" prompt, you can set a per-project
Shawn O. Pearcea608fb02009-04-17 12:11:24 -070091or global Git configuration option. If review.URL.autoupload is set
92to "true" then repo will assume you always answer "y" at the prompt,
93and will not prompt you further. If it is set to "false" then repo
94will assume you always answer "n", and will abort.
95
bijia093fdb62013-11-28 09:19:22 +080096review.URL.autoreviewer:
97
98To automatically append a user or mailing list to reviews, you can set
99a per-project or global Git option to do so.
100
Ben Komalo08a3f682010-07-15 16:03:02 -0700101review.URL.autocopy:
102
103To automatically copy a user or mailing list to all uploaded reviews,
104you can set a per-project or global Git option to do so. Specifically,
105review.URL.autocopy can be set to a comma separated list of reviewers
106who you always want copied on all uploads with a non-empty --re
107argument.
108
Shawn O. Pearce3575b8f2010-07-15 17:00:14 -0700109review.URL.username:
110
111Override the username used to connect to Gerrit Code Review.
112By default the local part of the email address is used.
113
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700114The URL must match the review URL listed in the manifest XML file,
115or in the .git/config within the project. For example:
116
117 [remote "origin"]
118 url = git://git.example.com/project.git
119 review = http://review.example.com/
120
121 [review "http://review.example.com/"]
122 autoupload = true
Ben Komalo08a3f682010-07-15 16:03:02 -0700123 autocopy = johndoe@company.com,my-team-alias@company.com
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700124
Anthony Russellod666e932012-06-01 00:48:22 -0400125review.URL.uploadtopic:
126
127To add a topic branch whenever uploading a commit, you can set a
128per-project or global Git option to do so. If review.URL.uploadtopic
129is set to "true" then repo will assume you always want the equivalent
130of the -t option to the repo command. If unset or set to "false" then
131repo will make use of only the command line option.
132
Mike Frysinger84685ba2020-02-19 02:22:22 -0500133review.URL.uploadhashtags:
134
135To add hashtags whenever uploading a commit, you can set a per-project
136or global Git option to do so. The value of review.URL.uploadhashtags
137will be used as comma delimited hashtags like the --hashtags option.
138
Mike Frysingerb8f7bb02018-10-10 01:05:11 -0400139# References
Shawn O. Pearce337fb9c2009-04-18 10:59:33 -0700140
Mike Frysinger3b24e7b2018-10-10 00:57:44 -0400141Gerrit Code Review: https://www.gerritcodereview.com/
Shawn O. Pearce337fb9c2009-04-18 10:59:33 -0700142
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700143"""
144
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800145 def _Options(self, p):
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700146 p.add_option('-t',
147 dest='auto_topic', action='store_true',
148 help='Send local branch name to Gerrit Code Review')
Mike Frysinger84685ba2020-02-19 02:22:22 -0500149 p.add_option('--hashtag', '--ht',
150 dest='hashtags', action='append', default=[],
151 help='Add hashtags (comma delimited) to the review.')
Joe Onorato2896a792008-11-17 16:56:36 -0500152 p.add_option('--re', '--reviewers',
David Pursehouse08671042020-02-12 13:52:31 +0900153 type='string', action='append', dest='reviewers',
Joe Onorato2896a792008-11-17 16:56:36 -0500154 help='Request reviews from these people.')
155 p.add_option('--cc',
David Pursehouse08671042020-02-12 13:52:31 +0900156 type='string', action='append', dest='cc',
Joe Onorato2896a792008-11-17 16:56:36 -0500157 help='Also send email to these email addresses.')
Mandeep Singh Bainesd6c93a22011-05-26 10:34:11 -0700158 p.add_option('--br',
David Pursehouse08671042020-02-12 13:52:31 +0900159 type='string', action='store', dest='branch',
Mandeep Singh Bainesd6c93a22011-05-26 10:34:11 -0700160 help='Branch to upload.')
Daniel Sandlere9d6b612012-04-06 10:39:32 -0400161 p.add_option('--cbr', '--current-branch',
162 dest='current_branch', action='store_true',
163 help='Upload current git branch.')
Brian Harring435370c2012-07-28 15:37:04 -0700164 p.add_option('-d', '--draft',
Jonathan Niederc94d6eb2017-08-08 18:34:53 +0000165 action='store_true', dest='draft', default=False,
166 help='If specified, upload as a draft.')
Vadim Bendeburybd8f6582018-10-31 13:48:01 -0700167 p.add_option('--ne', '--no-emails',
168 action='store_false', dest='notify', default=True,
169 help='If specified, do not send emails on upload.')
Changcheng Xiao87984c62017-08-02 16:55:03 +0200170 p.add_option('-p', '--private',
171 action='store_true', dest='private', default=False,
172 help='If specified, upload as a private change.')
173 p.add_option('-w', '--wip',
174 action='store_true', dest='wip', default=False,
175 help='If specified, upload as a work-in-progress change.')
Masaya Suzuki305a2d02017-11-13 10:48:34 -0800176 p.add_option('-o', '--push-option',
177 type='string', action='append', dest='push_options',
178 default=[],
179 help='Additional push options to transmit')
Bryan Jacobsf609f912013-05-06 13:36:24 -0400180 p.add_option('-D', '--destination', '--dest',
181 type='string', action='store', dest='dest_branch',
182 metavar='BRANCH',
183 help='Submit for review on this target branch.')
Mike Frysinger21c15752020-02-11 05:17:16 -0500184 p.add_option('--no-cert-checks',
185 dest='validate_certs', action='store_false', default=True,
186 help='Disable verifying ssl certs (unsafe).')
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800187
Doug Anderson37282b42011-03-04 11:54:18 -0800188 # Options relating to upload hook. Note that verify and no-verify are NOT
189 # opposites of each other, which is why they store to different locations.
190 # We are using them to match 'git commit' syntax.
191 #
192 # Combinations:
193 # - no-verify=False, verify=False (DEFAULT):
194 # If stdout is a tty, can prompt about running upload hooks if needed.
195 # If user denies running hooks, the upload is cancelled. If stdout is
196 # not a tty and we would need to prompt about upload hooks, upload is
197 # cancelled.
198 # - no-verify=False, verify=True:
199 # Always run upload hooks with no prompt.
200 # - no-verify=True, verify=False:
201 # Never run upload hooks, but upload anyway (AKA bypass hooks).
202 # - no-verify=True, verify=True:
203 # Invalid
Mike Frysinger21c15752020-02-11 05:17:16 -0500204 g = p.add_option_group('Upload hooks')
205 g.add_option('--no-verify',
Doug Anderson37282b42011-03-04 11:54:18 -0800206 dest='bypass_hooks', action='store_true',
207 help='Do not run the upload hook.')
Mike Frysinger21c15752020-02-11 05:17:16 -0500208 g.add_option('--verify',
Doug Anderson37282b42011-03-04 11:54:18 -0800209 dest='allow_all_hooks', action='store_true',
210 help='Run the upload hook without prompting.')
Mike Frysinger21c15752020-02-11 05:17:16 -0500211 g.add_option('--ignore-hooks',
212 dest='ignore_hooks', action='store_true',
213 help='Do not abort uploading if upload hooks fail.')
Doug Anderson37282b42011-03-04 11:54:18 -0800214
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700215 def _SingleBranch(self, opt, branch, people):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700216 project = branch.project
217 name = branch.name
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700218 remote = project.GetBranch(name).remote
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700219
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700220 key = 'review.%s.autoupload' % remote.review
221 answer = project.config.GetBoolean(key)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700222
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700223 if answer is False:
224 _die("upload blocked by %s = false" % key)
225
226 if answer is None:
Shawn O. Pearce66bdd462009-04-17 18:47:22 -0700227 date = branch.date
David Pursehouse8a68ff92012-09-24 12:15:13 +0900228 commit_list = branch.commits
Shawn O. Pearce66bdd462009-04-17 18:47:22 -0700229
Chirayu Desai610d3c42013-06-24 14:02:12 +0530230 destination = opt.dest_branch or project.dest_branch or project.revisionExpr
Nicolas Cornub54343d2017-07-10 10:31:24 +0200231 print('Upload project %s/ to remote branch %s%s:' %
Jonathan Niederc94d6eb2017-08-08 18:34:53 +0000232 (project.relpath, destination, ' (draft)' if opt.draft else ''))
Sarah Owenscecd1d82012-11-01 22:59:27 -0700233 print(' branch %s (%2d commit%s, %s):' % (
David Pursehouseabdf7502020-02-12 14:58:39 +0900234 name,
235 len(commit_list),
236 len(commit_list) != 1 and 's' or '',
237 date))
David Pursehouse8a68ff92012-09-24 12:15:13 +0900238 for commit in commit_list:
Sarah Owenscecd1d82012-11-01 22:59:27 -0700239 print(' %s' % commit)
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700240
Mike Frysingerab85fe72019-07-04 17:35:11 -0400241 print('to %s (y/N)? ' % remote.review, end='')
242 # TODO: When we require Python 3, use flush=True w/print above.
243 sys.stdout.flush()
David Pursehousefc241242012-11-14 09:19:39 +0900244 answer = sys.stdin.readline().strip().lower()
245 answer = answer in ('y', 'yes', '1', 'true', 't')
Shawn O. Pearcea608fb02009-04-17 12:11:24 -0700246
247 if answer:
Dan Morrill879a9a52010-05-04 16:56:07 -0700248 if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
249 answer = _ConfirmManyUploads()
250
251 if answer:
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700252 self._UploadAndReport(opt, [branch], people)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700253 else:
254 _die("upload aborted by user")
255
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700256 def _MultipleBranches(self, opt, pending, people):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700257 projects = {}
258 branches = {}
259
260 script = []
261 script.append('# Uncomment the branches to upload:')
262 for project, avail in pending:
263 script.append('#')
264 script.append('# project %s/:' % project.relpath)
265
266 b = {}
267 for branch in avail:
Bryan Jacobs710d4b02013-05-31 15:28:05 -0400268 if branch is None:
269 continue
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700270 name = branch.name
271 date = branch.date
David Pursehouse8a68ff92012-09-24 12:15:13 +0900272 commit_list = branch.commits
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700273
274 if b:
275 script.append('#')
Bryan Jacobs691a7592013-05-31 15:45:28 -0400276 destination = opt.dest_branch or project.dest_branch or project.revisionExpr
Christer Fletcher6a1f7372011-04-28 14:13:14 +0200277 script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % (
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700278 name,
David Pursehouse8a68ff92012-09-24 12:15:13 +0900279 len(commit_list),
280 len(commit_list) != 1 and 's' or '',
Christer Fletcher6a1f7372011-04-28 14:13:14 +0200281 date,
Bryan Jacobs691a7592013-05-31 15:45:28 -0400282 destination))
David Pursehouse8a68ff92012-09-24 12:15:13 +0900283 for commit in commit_list:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700284 script.append('# %s' % commit)
285 b[name] = branch
286
287 projects[project.relpath] = project
288 branches[project.name] = b
289 script.append('')
290
291 script = Editor.EditString("\n".join(script)).split("\n")
292
293 project_re = re.compile(r'^#?\s*project\s*([^\s]+)/:$')
294 branch_re = re.compile(r'^\s*branch\s*([^\s(]+)\s*\(.*')
295
296 project = None
297 todo = []
298
299 for line in script:
300 m = project_re.match(line)
301 if m:
302 name = m.group(1)
303 project = projects.get(name)
304 if not project:
305 _die('project %s not available for upload', name)
306 continue
307
308 m = branch_re.match(line)
309 if m:
310 name = m.group(1)
311 if not project:
312 _die('project for branch %s not in script', name)
313 branch = branches[project.name].get(name)
314 if not branch:
315 _die('branch %s not in %s', name, project.relpath)
316 todo.append(branch)
317 if not todo:
318 _die("nothing uncommented for upload")
Dan Morrill879a9a52010-05-04 16:56:07 -0700319
320 many_commits = False
321 for branch in todo:
322 if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
323 many_commits = True
324 break
325 if many_commits:
326 if not _ConfirmManyUploads(multiple_branches=True):
327 _die("upload aborted by user")
328
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700329 self._UploadAndReport(opt, todo, people)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700330
bijia093fdb62013-11-28 09:19:22 +0800331 def _AppendAutoList(self, branch, people):
Ben Komalo08a3f682010-07-15 16:03:02 -0700332 """
bijia093fdb62013-11-28 09:19:22 +0800333 Appends the list of reviewers in the git project's config.
Ben Komalo08a3f682010-07-15 16:03:02 -0700334 Appends the list of users in the CC list in the git project's config if a
335 non-empty reviewer list was found.
336 """
Ben Komalo08a3f682010-07-15 16:03:02 -0700337 name = branch.name
338 project = branch.project
bijia093fdb62013-11-28 09:19:22 +0800339
340 key = 'review.%s.autoreviewer' % project.GetBranch(name).remote.review
341 raw_list = project.config.GetString(key)
David Pursehouse8f78a832020-02-12 11:20:36 +0900342 if raw_list is not None:
bijia093fdb62013-11-28 09:19:22 +0800343 people[0].extend([entry.strip() for entry in raw_list.split(',')])
344
Ben Komalo08a3f682010-07-15 16:03:02 -0700345 key = 'review.%s.autocopy' % project.GetBranch(name).remote.review
346 raw_list = project.config.GetString(key)
David Pursehouse8f78a832020-02-12 11:20:36 +0900347 if raw_list is not None and len(people[0]) > 0:
Ben Komalo08a3f682010-07-15 16:03:02 -0700348 people[1].extend([entry.strip() for entry in raw_list.split(',')])
349
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700350 def _FindGerritChange(self, branch):
351 last_pub = branch.project.WasPublished(branch.name)
352 if last_pub is None:
353 return ""
354
355 refs = branch.GetPublishedRefs()
356 try:
357 # refs/changes/XYZ/N --> XYZ
358 return refs.get(last_pub).split('/')[-2]
David Pursehouse1d947b32012-10-25 12:23:11 +0900359 except (AttributeError, IndexError):
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700360 return ""
361
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700362 def _UploadAndReport(self, opt, todo, original_people):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700363 have_errors = False
364 for branch in todo:
365 try:
Ben Komalo08a3f682010-07-15 16:03:02 -0700366 people = copy.deepcopy(original_people)
bijia093fdb62013-11-28 09:19:22 +0800367 self._AppendAutoList(branch, people)
Ben Komalo08a3f682010-07-15 16:03:02 -0700368
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500369 # Check if there are local changes that may have been forgotten
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700370 changes = branch.project.UncommitedFiles()
371 if changes:
David Pursehousec1b86a22012-11-14 11:36:51 +0900372 key = 'review.%s.autoupload' % branch.project.remote.review
373 answer = branch.project.config.GetBoolean(key)
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500374
David Pursehousec1b86a22012-11-14 11:36:51 +0900375 # if they want to auto upload, let's not ask because it could be automated
376 if answer is None:
Mike Frysingerab85fe72019-07-04 17:35:11 -0400377 print()
378 print('Uncommitted changes in %s (did you forget to amend?):'
379 % branch.project.name)
380 print('\n'.join(changes))
381 print('Continue uploading? (y/N) ', end='')
382 # TODO: When we require Python 3, use flush=True w/print above.
383 sys.stdout.flush()
David Pursehousec1b86a22012-11-14 11:36:51 +0900384 a = sys.stdin.readline().strip().lower()
385 if a not in ('y', 'yes', 't', 'true', 'on'):
386 print("skipping upload", file=sys.stderr)
387 branch.uploaded = False
388 branch.error = 'User aborted'
389 continue
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500390
Anthony Russellod666e932012-06-01 00:48:22 -0400391 # Check if topic branches should be sent to the server during upload
392 if opt.auto_topic is not True:
David Pursehousec1b86a22012-11-14 11:36:51 +0900393 key = 'review.%s.uploadtopic' % branch.project.remote.review
394 opt.auto_topic = branch.project.config.GetBoolean(key)
Anthony Russellod666e932012-06-01 00:48:22 -0400395
Mike Frysinger84685ba2020-02-19 02:22:22 -0500396 # Check if hashtags should be included.
397 def _ExpandHashtag(value):
398 """Split |value| up into comma delimited tags."""
399 if not value:
400 return
401 for tag in value.split(','):
402 tag = tag.strip()
403 if tag:
404 yield tag
405 key = 'review.%s.uploadhashtags' % branch.project.remote.review
406 hashtags = set(_ExpandHashtag(branch.project.config.GetString(key)))
407 for tag in opt.hashtags:
408 hashtags.update(_ExpandHashtag(tag))
409
Colin Cross59b31cb2013-10-08 23:10:52 -0700410 destination = opt.dest_branch or branch.project.dest_branch
Conley Owens3bfd7212013-09-30 15:54:38 -0700411
412 # Make sure our local branch is not setup to track a different remote branch
413 merge_branch = self._GetMergeBranch(branch.project)
Conley Owensfbd3f2a2013-10-15 12:59:00 -0700414 if destination:
415 full_dest = 'refs/heads/%s' % destination
416 if not opt.dest_branch and merge_branch and merge_branch != full_dest:
417 print('merge branch %s does not match destination branch %s'
418 % (merge_branch, full_dest))
419 print('skipping upload.')
420 print('Please use `--destination %s` if this is intentional'
421 % destination)
422 branch.uploaded = False
423 continue
Conley Owens3bfd7212013-09-30 15:54:38 -0700424
Changcheng Xiao87984c62017-08-02 16:55:03 +0200425 branch.UploadForReview(people,
426 auto_topic=opt.auto_topic,
Mike Frysinger84685ba2020-02-19 02:22:22 -0500427 hashtags=hashtags,
Jonathan Niederc94d6eb2017-08-08 18:34:53 +0000428 draft=opt.draft,
Changcheng Xiao87984c62017-08-02 16:55:03 +0200429 private=opt.private,
Vadim Bendeburybd8f6582018-10-31 13:48:01 -0700430 notify=None if opt.notify else 'NONE',
Changcheng Xiao87984c62017-08-02 16:55:03 +0200431 wip=opt.wip,
Łukasz Gardońbed59ce2017-08-08 10:18:11 +0200432 dest_branch=destination,
Masaya Suzuki305a2d02017-11-13 10:48:34 -0800433 validate_certs=opt.validate_certs,
434 push_options=opt.push_options)
Łukasz Gardońbed59ce2017-08-08 10:18:11 +0200435
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700436 branch.uploaded = True
Sarah Owensa5be53f2012-09-09 15:37:57 -0700437 except UploadError as e:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700438 branch.error = e
439 branch.uploaded = False
440 have_errors = True
441
Sarah Owenscecd1d82012-11-01 22:59:27 -0700442 print(file=sys.stderr)
443 print('----------------------------------------------------------------------', file=sys.stderr)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700444
445 if have_errors:
446 for branch in todo:
447 if not branch.uploaded:
Shawn O. Pearcef00e0ce2009-08-22 18:39:49 -0700448 if len(str(branch.error)) <= 30:
449 fmt = ' (%s)'
450 else:
451 fmt = '\n (%s)'
Sarah Owenscecd1d82012-11-01 22:59:27 -0700452 print(('[FAILED] %-15s %-15s' + fmt) % (
David Pursehouseabdf7502020-02-12 14:58:39 +0900453 branch.project.relpath + '/',
454 branch.name,
455 str(branch.error)),
456 file=sys.stderr)
Sarah Owenscecd1d82012-11-01 22:59:27 -0700457 print()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700458
459 for branch in todo:
David Pursehousec1b86a22012-11-14 11:36:51 +0900460 if branch.uploaded:
461 print('[OK ] %-15s %s' % (
David Pursehouseabdf7502020-02-12 14:58:39 +0900462 branch.project.relpath + '/',
463 branch.name),
464 file=sys.stderr)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700465
466 if have_errors:
467 sys.exit(1)
468
Conley Owens3bfd7212013-09-30 15:54:38 -0700469 def _GetMergeBranch(self, project):
470 p = GitCommand(project,
471 ['rev-parse', '--abbrev-ref', 'HEAD'],
David Pursehousee5913ae2020-02-12 13:56:59 +0900472 capture_stdout=True,
473 capture_stderr=True)
Conley Owens3bfd7212013-09-30 15:54:38 -0700474 p.Wait()
475 local_branch = p.stdout.strip()
476 p = GitCommand(project,
477 ['config', '--get', 'branch.%s.merge' % local_branch],
David Pursehousee5913ae2020-02-12 13:56:59 +0900478 capture_stdout=True,
479 capture_stderr=True)
Conley Owens3bfd7212013-09-30 15:54:38 -0700480 p.Wait()
481 merge_branch = p.stdout.strip()
482 return merge_branch
483
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700484 def Execute(self, opt, args):
485 project_list = self.GetProjects(args)
486 pending = []
Joe Onorato2896a792008-11-17 16:56:36 -0500487 reviewers = []
488 cc = []
Mandeep Singh Bainesd6c93a22011-05-26 10:34:11 -0700489 branch = None
490
491 if opt.branch:
492 branch = opt.branch
Joe Onorato2896a792008-11-17 16:56:36 -0500493
Doug Anderson37282b42011-03-04 11:54:18 -0800494 for project in project_list:
Daniel Sandlere9d6b612012-04-06 10:39:32 -0400495 if opt.current_branch:
496 cbr = project.CurrentBranch
Warren Turkal011d4f42013-11-27 16:20:57 -0800497 up_branch = project.GetUploadableBranch(cbr)
498 if up_branch:
499 avail = [up_branch]
500 else:
501 avail = None
502 print('ERROR: Current branch (%s) not uploadable. '
503 'You may be able to type '
504 '"git branch --set-upstream-to m/master" to fix '
505 'your branch.' % str(cbr),
506 file=sys.stderr)
Daniel Sandlere9d6b612012-04-06 10:39:32 -0400507 else:
508 avail = project.GetUploadableBranches(branch)
Doug Anderson37282b42011-03-04 11:54:18 -0800509 if avail:
510 pending.append((project, avail))
511
Mike Frysinger163a3be2016-04-04 17:31:32 -0400512 if not pending:
Mike Frysinger7a753b82020-02-19 00:14:32 -0500513 if branch is None:
514 print('repo: error: no branches ready for upload', file=sys.stderr)
515 else:
516 print('repo: error: no branches named "%s" ready for upload' %
517 (branch,), file=sys.stderr)
518 return 1
Mike Frysinger163a3be2016-04-04 17:31:32 -0400519
520 if not opt.bypass_hooks:
Doug Anderson37282b42011-03-04 11:54:18 -0800521 hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,
Mike Frysinger40252c22016-08-15 21:23:44 -0400522 self.manifest.topdir,
523 self.manifest.manifestProject.GetRemote('origin').url,
524 abort_if_user_denies=True)
David Pursehouse3bcd3052017-07-10 22:42:22 +0900525 pending_proj_names = [project.name for (project, available) in pending]
526 pending_worktrees = [project.worktree for (project, available) in pending]
Mike Frysinger21c15752020-02-11 05:17:16 -0500527 passed = True
Doug Anderson37282b42011-03-04 11:54:18 -0800528 try:
David James8d201162013-10-11 17:03:19 -0700529 hook.Run(opt.allow_all_hooks, project_list=pending_proj_names,
530 worktree_list=pending_worktrees)
Mike Frysinger21c15752020-02-11 05:17:16 -0500531 except SystemExit:
532 passed = False
533 if not opt.ignore_hooks:
534 raise
Sarah Owensa5be53f2012-09-09 15:37:57 -0700535 except HookError as e:
Mike Frysinger21c15752020-02-11 05:17:16 -0500536 passed = False
Sarah Owenscecd1d82012-11-01 22:59:27 -0700537 print("ERROR: %s" % str(e), file=sys.stderr)
Mike Frysinger21c15752020-02-11 05:17:16 -0500538
539 if not passed:
540 if opt.ignore_hooks:
541 print('\nWARNING: pre-upload hooks failed, but uploading anyways.',
542 file=sys.stderr)
543 else:
544 return
Doug Anderson37282b42011-03-04 11:54:18 -0800545
Joe Onorato2896a792008-11-17 16:56:36 -0500546 if opt.reviewers:
547 reviewers = _SplitEmails(opt.reviewers)
548 if opt.cc:
549 cc = _SplitEmails(opt.cc)
David Pursehouse8f62fb72012-11-14 12:09:38 +0900550 people = (reviewers, cc)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700551
Mike Frysinger163a3be2016-04-04 17:31:32 -0400552 if len(pending) == 1 and len(pending[0][1]) == 1:
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700553 self._SingleBranch(opt, pending[0][1][0], people)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700554 else:
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700555 self._MultipleBranches(opt, pending, people)