blob: d0d9b1917dae4d654b9fffe6c3e4c04499215ae7 [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env python3
Francois Dorayd42c6812017-05-30 15:10:20 -04002# Copyright 2017 The Chromium Authors. All rights reserved.
3# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Splits a branch into smaller branches and uploads CLs."""
7
Raul Tambre80ee78e2019-05-06 22:41:05 +00008from __future__ import print_function
9
Francois Dorayd42c6812017-05-30 15:10:20 -040010import collections
11import os
12import re
13import subprocess2
14import sys
15import tempfile
16
Edward Lemur1773f372020-02-22 00:27:14 +000017import gclient_utils
Francois Dorayd42c6812017-05-30 15:10:20 -040018import git_footers
Josip Sokcevic7958e302023-03-01 23:02:21 +000019import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040020
21import git_common as git
22
23
Stephen Martinisf53f82c2018-09-07 20:58:05 +000024# If a call to `git cl split` will generate more than this number of CLs, the
25# command will prompt the user to make sure they know what they're doing. Large
26# numbers of CLs generated by `git cl split` have caused infrastructure issues
27# in the past.
28CL_SPLIT_FORCE_LIMIT = 10
29
Anne Redullab5509952023-07-27 01:27:02 +000030# The maximum number of top reviewers to list. `git cl split` may send many CLs
31# to a single reviewer, so the top reviewers with the most CLs sent to them
32# will be listed.
33CL_SPLIT_TOP_REVIEWERS = 5
34
Stephen Martinisf53f82c2018-09-07 20:58:05 +000035
Francois Dorayd42c6812017-05-30 15:10:20 -040036def EnsureInGitRepository():
37 """Throws an exception if the current directory is not a git repository."""
38 git.run('rev-parse')
39
40
Edward Lemurac5c55f2020-02-29 00:17:16 +000041def CreateBranchForDirectory(prefix, directory, upstream):
42 """Creates a branch named |prefix| + "_" + |directory| + "_split".
Francois Dorayd42c6812017-05-30 15:10:20 -040043
44 Return false if the branch already exists. |upstream| is used as upstream for
45 the created branch.
46 """
47 existing_branches = set(git.branches(use_limit = False))
Edward Lemurac5c55f2020-02-29 00:17:16 +000048 branch_name = prefix + '_' + directory + '_split'
Francois Dorayd42c6812017-05-30 15:10:20 -040049 if branch_name in existing_branches:
50 return False
51 git.run('checkout', '-t', upstream, '-b', branch_name)
52 return True
53
54
Edward Lemurac5c55f2020-02-29 00:17:16 +000055def FormatDescriptionOrComment(txt, directory):
56 """Replaces $directory with |directory| in |txt|."""
57 return txt.replace('$directory', '/' + directory)
Francois Dorayd42c6812017-05-30 15:10:20 -040058
59
60def AddUploadedByGitClSplitToDescription(description):
61 """Adds a 'This CL was uploaded by git cl split.' line to |description|.
62
63 The line is added before footers, or at the end of |description| if it has no
64 footers.
65 """
66 split_footers = git_footers.split_footers(description)
67 lines = split_footers[0]
Song Fangzhen534f5052021-06-23 08:51:34 +000068 if lines[-1] and not lines[-1].isspace():
Francois Dorayd42c6812017-05-30 15:10:20 -040069 lines = lines + ['']
70 lines = lines + ['This CL was uploaded by git cl split.']
71 if split_footers[1]:
72 lines += [''] + split_footers[1]
73 return '\n'.join(lines)
74
75
Edward Lemurac5c55f2020-02-29 00:17:16 +000076def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
77 description, comment, reviewers, changelist, cmd_upload,
Rachael Newitt03e49122023-06-28 21:39:21 +000078 cq_dry_run, enable_auto_submit, topic, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -040079 """Uploads a CL with all changes to |files| in |refactor_branch|.
80
81 Args:
82 refactor_branch: Name of the branch that contains the changes to upload.
83 refactor_branch_upstream: Name of the upstream of |refactor_branch|.
84 directory: Path to the directory that contains the OWNERS file for which
85 to upload a CL.
86 files: List of AffectedFile instances to include in the uploaded CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040087 description: Description of the uploaded CL.
88 comment: Comment to post on the uploaded CL.
Edward Lemurac5c55f2020-02-29 00:17:16 +000089 reviewers: A set of reviewers for the CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040090 changelist: The Changelist class.
91 cmd_upload: The function associated with the git cl upload command.
Stephen Martiniscb326682018-08-29 21:06:30 +000092 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +000093 enable_auto_submit: If CL uploads should also enable auto submit.
Rachael Newitt03e49122023-06-28 21:39:21 +000094 topic: Topic to associate with uploaded CLs.
Francois Dorayd42c6812017-05-30 15:10:20 -040095 """
Francois Dorayd42c6812017-05-30 15:10:20 -040096 # Create a branch.
Edward Lemurac5c55f2020-02-29 00:17:16 +000097 if not CreateBranchForDirectory(
98 refactor_branch, directory, refactor_branch_upstream):
99 print('Skipping ' + directory + ' for which a branch already exists.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400100 return
101
102 # Checkout all changes to files in |files|.
Edward Lemur2c62b332020-03-12 22:12:33 +0000103 deleted_files = []
104 modified_files = []
105 for action, f in files:
106 abspath = os.path.abspath(os.path.join(repository_root, f))
107 if action == 'D':
108 deleted_files.append(abspath)
109 else:
110 modified_files.append(abspath)
111
Francois Dorayd42c6812017-05-30 15:10:20 -0400112 if deleted_files:
113 git.run(*['rm'] + deleted_files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400114 if modified_files:
115 git.run(*['checkout', refactor_branch, '--'] + modified_files)
116
117 # Commit changes. The temporary file is created with delete=False so that it
118 # can be deleted manually after git has read it rather than automatically
119 # when it is closed.
Edward Lemur1773f372020-02-22 00:27:14 +0000120 with gclient_utils.temporary_file() as tmp_file:
121 gclient_utils.FileWrite(
Edward Lemurac5c55f2020-02-29 00:17:16 +0000122 tmp_file, FormatDescriptionOrComment(description, directory))
Edward Lemur1773f372020-02-22 00:27:14 +0000123 git.run('commit', '-F', tmp_file)
Francois Dorayd42c6812017-05-30 15:10:20 -0400124
125 # Upload a CL.
Anthony Politoc08c71b2020-08-26 23:45:30 +0000126 upload_args = ['-f']
127 if reviewers:
128 upload_args.extend(['-r', ','.join(reviewers)])
Stephen Martiniscb326682018-08-29 21:06:30 +0000129 if cq_dry_run:
130 upload_args.append('--cq-dry-run')
Francois Dorayd42c6812017-05-30 15:10:20 -0400131 if not comment:
Aaron Gablee5adf612017-07-14 10:43:58 -0700132 upload_args.append('--send-mail')
Takuto Ikuta51eca592019-02-14 19:40:52 +0000133 if enable_auto_submit:
134 upload_args.append('--enable-auto-submit')
Rachael Newitt03e49122023-06-28 21:39:21 +0000135 if topic:
136 upload_args.append('--topic={}'.format(topic))
Olivier Li06145912021-05-12 23:59:24 +0000137 print('Uploading CL for ' + directory + '...')
138
139 ret = cmd_upload(upload_args)
140 if ret != 0:
141 print('Uploading failed for ' + directory + '.')
142 print('Note: git cl split has built-in resume capabilities.')
143 print('Delete ' + git.current_branch() +
144 ' then run git cl split again to resume uploading.')
145
Francois Dorayd42c6812017-05-30 15:10:20 -0400146 if comment:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000147 changelist().AddComment(FormatDescriptionOrComment(comment, directory),
148 publish=True)
Francois Dorayd42c6812017-05-30 15:10:20 -0400149
150
Daniel Cheng403c44e2022-10-05 22:24:58 +0000151def GetFilesSplitByOwners(files, max_depth):
Francois Dorayd42c6812017-05-30 15:10:20 -0400152 """Returns a map of files split by OWNERS file.
153
154 Returns:
155 A map where keys are paths to directories containing an OWNERS file and
156 values are lists of files sharing an OWNERS file.
157 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000158 files_split_by_owners = {}
Edward Lesmes17ffd982020-03-31 17:33:16 +0000159 for action, path in files:
Daniel Cheng403c44e2022-10-05 22:24:58 +0000160 # normpath() is important to normalize separators here, in prepration for
161 # str.split() before. It would be nicer to use something like pathlib here
162 # but alas...
163 dir_with_owners = os.path.normpath(os.path.dirname(path))
164 if max_depth >= 1:
165 dir_with_owners = os.path.join(
166 *dir_with_owners.split(os.path.sep)[:max_depth])
Edward Lesmesb1174d72021-02-02 20:31:34 +0000167 # Find the closest parent directory with an OWNERS file.
168 while (dir_with_owners not in files_split_by_owners
169 and not os.path.isfile(os.path.join(dir_with_owners, 'OWNERS'))):
170 dir_with_owners = os.path.dirname(dir_with_owners)
171 files_split_by_owners.setdefault(dir_with_owners, []).append((action, path))
Edward Lemurac5c55f2020-02-29 00:17:16 +0000172 return files_split_by_owners
Francois Dorayd42c6812017-05-30 15:10:20 -0400173
174
Chris Watkinsba28e462017-12-13 11:22:17 +1100175def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Anne Redulla072d06e2023-07-06 23:12:16 +0000176 reviewers, enable_auto_submit, topic):
Chris Watkinsba28e462017-12-13 11:22:17 +1100177 """Prints info about a CL.
178
179 Args:
180 cl_index: The index of this CL in the list of CLs to upload.
181 num_cls: The total number of CLs that will be uploaded.
182 directory: Path to the directory that contains the OWNERS file for which
183 to upload a CL.
184 file_paths: A list of files in this CL.
185 description: The CL description.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000186 reviewers: A set of reviewers for this CL.
Anne Redulla072d06e2023-07-06 23:12:16 +0000187 enable_auto_submit: If the CL should also have auto submit enabled.
Rachael Newitt03e49122023-06-28 21:39:21 +0000188 topic: Topic to set for this CL.
Chris Watkinsba28e462017-12-13 11:22:17 +1100189 """
Edward Lemurac5c55f2020-02-29 00:17:16 +0000190 description_lines = FormatDescriptionOrComment(description,
191 directory).splitlines()
Chris Watkinsba28e462017-12-13 11:22:17 +1100192 indented_description = '\n'.join([' ' + l for l in description_lines])
193
Raul Tambre80ee78e2019-05-06 22:41:05 +0000194 print('CL {}/{}'.format(cl_index, num_cls))
195 print('Path: {}'.format(directory))
Edward Lemurac5c55f2020-02-29 00:17:16 +0000196 print('Reviewers: {}'.format(', '.join(reviewers)))
Anne Redulla072d06e2023-07-06 23:12:16 +0000197 print('Auto-Submit: {}'.format(enable_auto_submit))
Rachael Newitt03e49122023-06-28 21:39:21 +0000198 print('Topic: {}'.format(topic))
Raul Tambre80ee78e2019-05-06 22:41:05 +0000199 print('\n' + indented_description + '\n')
200 print('\n'.join(file_paths))
201 print()
Chris Watkinsba28e462017-12-13 11:22:17 +1100202
203
Stephen Martiniscb326682018-08-29 21:06:30 +0000204def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
Rachael Newitt03e49122023-06-28 21:39:21 +0000205 cq_dry_run, enable_auto_submit, max_depth, topic, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -0400206 """"Splits a branch into smaller branches and uploads CLs.
207
208 Args:
209 description_file: File containing the description of uploaded CLs.
210 comment_file: File containing the comment of uploaded CLs.
211 changelist: The Changelist class.
212 cmd_upload: The function associated with the git cl upload command.
Chris Watkinsba28e462017-12-13 11:22:17 +1100213 dry_run: Whether this is a dry run (no branches or CLs created).
Stephen Martiniscb326682018-08-29 21:06:30 +0000214 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +0000215 enable_auto_submit: If CL uploads should also enable auto submit.
Daniel Cheng403c44e2022-10-05 22:24:58 +0000216 max_depth: The maximum directory depth to search for OWNERS files. A value
217 less than 1 means no limit.
Rachael Newitt03e49122023-06-28 21:39:21 +0000218 topic: Topic to associate with split CLs.
Francois Dorayd42c6812017-05-30 15:10:20 -0400219
220 Returns:
221 0 in case of success. 1 in case of error.
222 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000223 description = AddUploadedByGitClSplitToDescription(
224 gclient_utils.FileRead(description_file))
225 comment = gclient_utils.FileRead(comment_file) if comment_file else None
Francois Dorayd42c6812017-05-30 15:10:20 -0400226
227 try:
Chris Watkinsba28e462017-12-13 11:22:17 +1100228 EnsureInGitRepository()
Francois Dorayd42c6812017-05-30 15:10:20 -0400229
230 cl = changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +0000231 upstream = cl.GetCommonAncestorWithUpstream()
232 files = [
233 (action.strip(), f)
234 for action, f in scm.GIT.CaptureStatus(repository_root, upstream)
235 ]
Francois Dorayd42c6812017-05-30 15:10:20 -0400236
237 if not files:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000238 print('Cannot split an empty CL.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400239 return 1
240
241 author = git.run('config', 'user.email').strip() or None
242 refactor_branch = git.current_branch()
Gabriel Charette09baacd2017-11-09 13:30:41 -0500243 assert refactor_branch, "Can't run from detached branch."
Francois Dorayd42c6812017-05-30 15:10:20 -0400244 refactor_branch_upstream = git.upstream(refactor_branch)
Gabriel Charette09baacd2017-11-09 13:30:41 -0500245 assert refactor_branch_upstream, \
246 "Branch %s must have an upstream." % refactor_branch
Francois Dorayd42c6812017-05-30 15:10:20 -0400247
Daniel Cheng403c44e2022-10-05 22:24:58 +0000248 files_split_by_owners = GetFilesSplitByOwners(files, max_depth)
Francois Dorayd42c6812017-05-30 15:10:20 -0400249
Edward Lemurac5c55f2020-02-29 00:17:16 +0000250 num_cls = len(files_split_by_owners)
251 print('Will split current branch (' + refactor_branch + ') into ' +
252 str(num_cls) + ' CLs.\n')
Stephen Martinisf53f82c2018-09-07 20:58:05 +0000253 if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000254 print(
Stephen Martiniscb326682018-08-29 21:06:30 +0000255 'This will generate "%r" CLs. This many CLs can potentially generate'
256 ' too much load on the build infrastructure. Please email'
257 ' infra-dev@chromium.org to ensure that this won\'t break anything.'
258 ' The infra team reserves the right to cancel your jobs if they are'
Raul Tambre80ee78e2019-05-06 22:41:05 +0000259 ' overloading the CQ.' % num_cls)
Edward Lesmesae3586b2020-03-23 21:21:14 +0000260 answer = gclient_utils.AskForData('Proceed? (y/n):')
Stephen Martiniscb326682018-08-29 21:06:30 +0000261 if answer.lower() != 'y':
262 return 0
Francois Dorayd42c6812017-05-30 15:10:20 -0400263
Thiago Perrotta223f48d2023-02-23 23:19:57 +0000264 # Verify that the description contains a bug link. Examples:
265 # Bug: 123
266 # Bug: chromium:456
267 bug_pattern = re.compile(r"^Bug:\s*(?:[a-zA-Z]+:)?[0-9]+", re.MULTILINE)
Olivier Li06145912021-05-12 23:59:24 +0000268 matches = re.findall(bug_pattern, description)
269 answer = 'y'
270 if not matches:
271 answer = gclient_utils.AskForData(
272 'Description does not include a bug link. Proceed? (y/n):')
273 if answer.lower() != 'y':
274 return 0
275
Anne Redullab5509952023-07-27 01:27:02 +0000276 cls_per_reviewer = collections.defaultdict(int)
Edward Lemurac5c55f2020-02-29 00:17:16 +0000277 for cl_index, (directory, files) in \
278 enumerate(files_split_by_owners.items(), 1):
Francois Dorayd42c6812017-05-30 15:10:20 -0400279 # Use '/' as a path separator in the branch name and the CL description
280 # and comment.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000281 directory = directory.replace(os.path.sep, '/')
Edward Lemur2c62b332020-03-12 22:12:33 +0000282 file_paths = [f for _, f in files]
Edward Lesmes15234012021-02-17 17:25:03 +0000283 reviewers = cl.owners_client.SuggestOwners(
284 file_paths, exclude=[author, cl.owners_client.EVERYONE])
Chris Watkinsba28e462017-12-13 11:22:17 +1100285 if dry_run:
286 PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Anne Redulla072d06e2023-07-06 23:12:16 +0000287 reviewers, enable_auto_submit, topic)
Chris Watkinsba28e462017-12-13 11:22:17 +1100288 else:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000289 UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
290 description, comment, reviewers, changelist, cmd_upload,
Rachael Newitt03e49122023-06-28 21:39:21 +0000291 cq_dry_run, enable_auto_submit, topic, repository_root)
Francois Dorayd42c6812017-05-30 15:10:20 -0400292
Anne Redullab5509952023-07-27 01:27:02 +0000293 for reviewer in reviewers:
294 cls_per_reviewer[reviewer] += 1
295
296 # List the top reviewers that will be sent the most CLs as a result of the
297 # split.
298 reviewer_rankings = sorted(cls_per_reviewer.items(),
299 key=lambda item: item[1],
300 reverse=True)
301 print('The top reviewers are:')
302 for reviewer, count in reviewer_rankings[:CL_SPLIT_TOP_REVIEWERS]:
303 print(f' {reviewer}: {count} CLs')
304
Francois Dorayd42c6812017-05-30 15:10:20 -0400305 # Go back to the original branch.
306 git.run('checkout', refactor_branch)
307
308 except subprocess2.CalledProcessError as cpe:
309 sys.stderr.write(cpe.stderr)
310 return 1
311 return 0