blob: 377df69c9158f9de1e2beed3f81e7fe50bbea19c [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
30
Francois Dorayd42c6812017-05-30 15:10:20 -040031def EnsureInGitRepository():
32 """Throws an exception if the current directory is not a git repository."""
33 git.run('rev-parse')
34
35
Edward Lemurac5c55f2020-02-29 00:17:16 +000036def CreateBranchForDirectory(prefix, directory, upstream):
37 """Creates a branch named |prefix| + "_" + |directory| + "_split".
Francois Dorayd42c6812017-05-30 15:10:20 -040038
39 Return false if the branch already exists. |upstream| is used as upstream for
40 the created branch.
41 """
42 existing_branches = set(git.branches(use_limit = False))
Edward Lemurac5c55f2020-02-29 00:17:16 +000043 branch_name = prefix + '_' + directory + '_split'
Francois Dorayd42c6812017-05-30 15:10:20 -040044 if branch_name in existing_branches:
45 return False
46 git.run('checkout', '-t', upstream, '-b', branch_name)
47 return True
48
49
Edward Lemurac5c55f2020-02-29 00:17:16 +000050def FormatDescriptionOrComment(txt, directory):
51 """Replaces $directory with |directory| in |txt|."""
52 return txt.replace('$directory', '/' + directory)
Francois Dorayd42c6812017-05-30 15:10:20 -040053
54
55def AddUploadedByGitClSplitToDescription(description):
56 """Adds a 'This CL was uploaded by git cl split.' line to |description|.
57
58 The line is added before footers, or at the end of |description| if it has no
59 footers.
60 """
61 split_footers = git_footers.split_footers(description)
62 lines = split_footers[0]
Song Fangzhen534f5052021-06-23 08:51:34 +000063 if lines[-1] and not lines[-1].isspace():
Francois Dorayd42c6812017-05-30 15:10:20 -040064 lines = lines + ['']
65 lines = lines + ['This CL was uploaded by git cl split.']
66 if split_footers[1]:
67 lines += [''] + split_footers[1]
68 return '\n'.join(lines)
69
70
Edward Lemurac5c55f2020-02-29 00:17:16 +000071def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
72 description, comment, reviewers, changelist, cmd_upload,
Rachael Newitt03e49122023-06-28 21:39:21 +000073 cq_dry_run, enable_auto_submit, topic, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -040074 """Uploads a CL with all changes to |files| in |refactor_branch|.
75
76 Args:
77 refactor_branch: Name of the branch that contains the changes to upload.
78 refactor_branch_upstream: Name of the upstream of |refactor_branch|.
79 directory: Path to the directory that contains the OWNERS file for which
80 to upload a CL.
81 files: List of AffectedFile instances to include in the uploaded CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040082 description: Description of the uploaded CL.
83 comment: Comment to post on the uploaded CL.
Edward Lemurac5c55f2020-02-29 00:17:16 +000084 reviewers: A set of reviewers for the CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040085 changelist: The Changelist class.
86 cmd_upload: The function associated with the git cl upload command.
Stephen Martiniscb326682018-08-29 21:06:30 +000087 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +000088 enable_auto_submit: If CL uploads should also enable auto submit.
Rachael Newitt03e49122023-06-28 21:39:21 +000089 topic: Topic to associate with uploaded CLs.
Francois Dorayd42c6812017-05-30 15:10:20 -040090 """
Francois Dorayd42c6812017-05-30 15:10:20 -040091 # Create a branch.
Edward Lemurac5c55f2020-02-29 00:17:16 +000092 if not CreateBranchForDirectory(
93 refactor_branch, directory, refactor_branch_upstream):
94 print('Skipping ' + directory + ' for which a branch already exists.')
Francois Dorayd42c6812017-05-30 15:10:20 -040095 return
96
97 # Checkout all changes to files in |files|.
Edward Lemur2c62b332020-03-12 22:12:33 +000098 deleted_files = []
99 modified_files = []
100 for action, f in files:
101 abspath = os.path.abspath(os.path.join(repository_root, f))
102 if action == 'D':
103 deleted_files.append(abspath)
104 else:
105 modified_files.append(abspath)
106
Francois Dorayd42c6812017-05-30 15:10:20 -0400107 if deleted_files:
108 git.run(*['rm'] + deleted_files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400109 if modified_files:
110 git.run(*['checkout', refactor_branch, '--'] + modified_files)
111
112 # Commit changes. The temporary file is created with delete=False so that it
113 # can be deleted manually after git has read it rather than automatically
114 # when it is closed.
Edward Lemur1773f372020-02-22 00:27:14 +0000115 with gclient_utils.temporary_file() as tmp_file:
116 gclient_utils.FileWrite(
Edward Lemurac5c55f2020-02-29 00:17:16 +0000117 tmp_file, FormatDescriptionOrComment(description, directory))
Edward Lemur1773f372020-02-22 00:27:14 +0000118 git.run('commit', '-F', tmp_file)
Francois Dorayd42c6812017-05-30 15:10:20 -0400119
120 # Upload a CL.
Anthony Politoc08c71b2020-08-26 23:45:30 +0000121 upload_args = ['-f']
122 if reviewers:
123 upload_args.extend(['-r', ','.join(reviewers)])
Stephen Martiniscb326682018-08-29 21:06:30 +0000124 if cq_dry_run:
125 upload_args.append('--cq-dry-run')
Francois Dorayd42c6812017-05-30 15:10:20 -0400126 if not comment:
Aaron Gablee5adf612017-07-14 10:43:58 -0700127 upload_args.append('--send-mail')
Takuto Ikuta51eca592019-02-14 19:40:52 +0000128 if enable_auto_submit:
129 upload_args.append('--enable-auto-submit')
Rachael Newitt03e49122023-06-28 21:39:21 +0000130 if topic:
131 upload_args.append('--topic={}'.format(topic))
Olivier Li06145912021-05-12 23:59:24 +0000132 print('Uploading CL for ' + directory + '...')
133
134 ret = cmd_upload(upload_args)
135 if ret != 0:
136 print('Uploading failed for ' + directory + '.')
137 print('Note: git cl split has built-in resume capabilities.')
138 print('Delete ' + git.current_branch() +
139 ' then run git cl split again to resume uploading.')
140
Francois Dorayd42c6812017-05-30 15:10:20 -0400141 if comment:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000142 changelist().AddComment(FormatDescriptionOrComment(comment, directory),
143 publish=True)
Francois Dorayd42c6812017-05-30 15:10:20 -0400144
145
Daniel Cheng403c44e2022-10-05 22:24:58 +0000146def GetFilesSplitByOwners(files, max_depth):
Francois Dorayd42c6812017-05-30 15:10:20 -0400147 """Returns a map of files split by OWNERS file.
148
149 Returns:
150 A map where keys are paths to directories containing an OWNERS file and
151 values are lists of files sharing an OWNERS file.
152 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000153 files_split_by_owners = {}
Edward Lesmes17ffd982020-03-31 17:33:16 +0000154 for action, path in files:
Daniel Cheng403c44e2022-10-05 22:24:58 +0000155 # normpath() is important to normalize separators here, in prepration for
156 # str.split() before. It would be nicer to use something like pathlib here
157 # but alas...
158 dir_with_owners = os.path.normpath(os.path.dirname(path))
159 if max_depth >= 1:
160 dir_with_owners = os.path.join(
161 *dir_with_owners.split(os.path.sep)[:max_depth])
Edward Lesmesb1174d72021-02-02 20:31:34 +0000162 # Find the closest parent directory with an OWNERS file.
163 while (dir_with_owners not in files_split_by_owners
164 and not os.path.isfile(os.path.join(dir_with_owners, 'OWNERS'))):
165 dir_with_owners = os.path.dirname(dir_with_owners)
166 files_split_by_owners.setdefault(dir_with_owners, []).append((action, path))
Edward Lemurac5c55f2020-02-29 00:17:16 +0000167 return files_split_by_owners
Francois Dorayd42c6812017-05-30 15:10:20 -0400168
169
Chris Watkinsba28e462017-12-13 11:22:17 +1100170def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Anne Redulla072d06e2023-07-06 23:12:16 +0000171 reviewers, enable_auto_submit, topic):
Chris Watkinsba28e462017-12-13 11:22:17 +1100172 """Prints info about a CL.
173
174 Args:
175 cl_index: The index of this CL in the list of CLs to upload.
176 num_cls: The total number of CLs that will be uploaded.
177 directory: Path to the directory that contains the OWNERS file for which
178 to upload a CL.
179 file_paths: A list of files in this CL.
180 description: The CL description.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000181 reviewers: A set of reviewers for this CL.
Anne Redulla072d06e2023-07-06 23:12:16 +0000182 enable_auto_submit: If the CL should also have auto submit enabled.
Rachael Newitt03e49122023-06-28 21:39:21 +0000183 topic: Topic to set for this CL.
Chris Watkinsba28e462017-12-13 11:22:17 +1100184 """
Edward Lemurac5c55f2020-02-29 00:17:16 +0000185 description_lines = FormatDescriptionOrComment(description,
186 directory).splitlines()
Chris Watkinsba28e462017-12-13 11:22:17 +1100187 indented_description = '\n'.join([' ' + l for l in description_lines])
188
Raul Tambre80ee78e2019-05-06 22:41:05 +0000189 print('CL {}/{}'.format(cl_index, num_cls))
190 print('Path: {}'.format(directory))
Edward Lemurac5c55f2020-02-29 00:17:16 +0000191 print('Reviewers: {}'.format(', '.join(reviewers)))
Anne Redulla072d06e2023-07-06 23:12:16 +0000192 print('Auto-Submit: {}'.format(enable_auto_submit))
Rachael Newitt03e49122023-06-28 21:39:21 +0000193 print('Topic: {}'.format(topic))
Raul Tambre80ee78e2019-05-06 22:41:05 +0000194 print('\n' + indented_description + '\n')
195 print('\n'.join(file_paths))
196 print()
Chris Watkinsba28e462017-12-13 11:22:17 +1100197
198
Stephen Martiniscb326682018-08-29 21:06:30 +0000199def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
Rachael Newitt03e49122023-06-28 21:39:21 +0000200 cq_dry_run, enable_auto_submit, max_depth, topic, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -0400201 """"Splits a branch into smaller branches and uploads CLs.
202
203 Args:
204 description_file: File containing the description of uploaded CLs.
205 comment_file: File containing the comment of uploaded CLs.
206 changelist: The Changelist class.
207 cmd_upload: The function associated with the git cl upload command.
Chris Watkinsba28e462017-12-13 11:22:17 +1100208 dry_run: Whether this is a dry run (no branches or CLs created).
Stephen Martiniscb326682018-08-29 21:06:30 +0000209 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +0000210 enable_auto_submit: If CL uploads should also enable auto submit.
Daniel Cheng403c44e2022-10-05 22:24:58 +0000211 max_depth: The maximum directory depth to search for OWNERS files. A value
212 less than 1 means no limit.
Rachael Newitt03e49122023-06-28 21:39:21 +0000213 topic: Topic to associate with split CLs.
Francois Dorayd42c6812017-05-30 15:10:20 -0400214
215 Returns:
216 0 in case of success. 1 in case of error.
217 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000218 description = AddUploadedByGitClSplitToDescription(
219 gclient_utils.FileRead(description_file))
220 comment = gclient_utils.FileRead(comment_file) if comment_file else None
Francois Dorayd42c6812017-05-30 15:10:20 -0400221
222 try:
Chris Watkinsba28e462017-12-13 11:22:17 +1100223 EnsureInGitRepository()
Francois Dorayd42c6812017-05-30 15:10:20 -0400224
225 cl = changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +0000226 upstream = cl.GetCommonAncestorWithUpstream()
227 files = [
228 (action.strip(), f)
229 for action, f in scm.GIT.CaptureStatus(repository_root, upstream)
230 ]
Francois Dorayd42c6812017-05-30 15:10:20 -0400231
232 if not files:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000233 print('Cannot split an empty CL.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400234 return 1
235
236 author = git.run('config', 'user.email').strip() or None
237 refactor_branch = git.current_branch()
Gabriel Charette09baacd2017-11-09 13:30:41 -0500238 assert refactor_branch, "Can't run from detached branch."
Francois Dorayd42c6812017-05-30 15:10:20 -0400239 refactor_branch_upstream = git.upstream(refactor_branch)
Gabriel Charette09baacd2017-11-09 13:30:41 -0500240 assert refactor_branch_upstream, \
241 "Branch %s must have an upstream." % refactor_branch
Francois Dorayd42c6812017-05-30 15:10:20 -0400242
Daniel Cheng403c44e2022-10-05 22:24:58 +0000243 files_split_by_owners = GetFilesSplitByOwners(files, max_depth)
Francois Dorayd42c6812017-05-30 15:10:20 -0400244
Edward Lemurac5c55f2020-02-29 00:17:16 +0000245 num_cls = len(files_split_by_owners)
246 print('Will split current branch (' + refactor_branch + ') into ' +
247 str(num_cls) + ' CLs.\n')
Stephen Martinisf53f82c2018-09-07 20:58:05 +0000248 if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000249 print(
Stephen Martiniscb326682018-08-29 21:06:30 +0000250 'This will generate "%r" CLs. This many CLs can potentially generate'
251 ' too much load on the build infrastructure. Please email'
252 ' infra-dev@chromium.org to ensure that this won\'t break anything.'
253 ' The infra team reserves the right to cancel your jobs if they are'
Raul Tambre80ee78e2019-05-06 22:41:05 +0000254 ' overloading the CQ.' % num_cls)
Edward Lesmesae3586b2020-03-23 21:21:14 +0000255 answer = gclient_utils.AskForData('Proceed? (y/n):')
Stephen Martiniscb326682018-08-29 21:06:30 +0000256 if answer.lower() != 'y':
257 return 0
Francois Dorayd42c6812017-05-30 15:10:20 -0400258
Thiago Perrotta223f48d2023-02-23 23:19:57 +0000259 # Verify that the description contains a bug link. Examples:
260 # Bug: 123
261 # Bug: chromium:456
262 bug_pattern = re.compile(r"^Bug:\s*(?:[a-zA-Z]+:)?[0-9]+", re.MULTILINE)
Olivier Li06145912021-05-12 23:59:24 +0000263 matches = re.findall(bug_pattern, description)
264 answer = 'y'
265 if not matches:
266 answer = gclient_utils.AskForData(
267 'Description does not include a bug link. Proceed? (y/n):')
268 if answer.lower() != 'y':
269 return 0
270
Edward Lemurac5c55f2020-02-29 00:17:16 +0000271 for cl_index, (directory, files) in \
272 enumerate(files_split_by_owners.items(), 1):
Francois Dorayd42c6812017-05-30 15:10:20 -0400273 # Use '/' as a path separator in the branch name and the CL description
274 # and comment.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000275 directory = directory.replace(os.path.sep, '/')
Edward Lemur2c62b332020-03-12 22:12:33 +0000276 file_paths = [f for _, f in files]
Edward Lesmes15234012021-02-17 17:25:03 +0000277 reviewers = cl.owners_client.SuggestOwners(
278 file_paths, exclude=[author, cl.owners_client.EVERYONE])
Chris Watkinsba28e462017-12-13 11:22:17 +1100279 if dry_run:
280 PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Anne Redulla072d06e2023-07-06 23:12:16 +0000281 reviewers, enable_auto_submit, topic)
Chris Watkinsba28e462017-12-13 11:22:17 +1100282 else:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000283 UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
284 description, comment, reviewers, changelist, cmd_upload,
Rachael Newitt03e49122023-06-28 21:39:21 +0000285 cq_dry_run, enable_auto_submit, topic, repository_root)
Francois Dorayd42c6812017-05-30 15:10:20 -0400286
287 # Go back to the original branch.
288 git.run('checkout', refactor_branch)
289
290 except subprocess2.CalledProcessError as cpe:
291 sys.stderr.write(cpe.stderr)
292 return 1
293 return 0