Josip Sokcevic | 4de5dea | 2022-03-23 21:15:14 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 2 | # 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 Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 8 | from __future__ import print_function |
| 9 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 10 | import collections |
| 11 | import os |
| 12 | import re |
| 13 | import subprocess2 |
| 14 | import sys |
| 15 | import tempfile |
| 16 | |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 17 | import gclient_utils |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 18 | import git_footers |
Josip Sokcevic | 7958e30 | 2023-03-01 23:02:21 +0000 | [diff] [blame] | 19 | import scm |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 20 | |
| 21 | import git_common as git |
| 22 | |
| 23 | |
Stephen Martinis | f53f82c | 2018-09-07 20:58:05 +0000 | [diff] [blame] | 24 | # 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. |
| 28 | CL_SPLIT_FORCE_LIMIT = 10 |
| 29 | |
| 30 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 31 | def EnsureInGitRepository(): |
| 32 | """Throws an exception if the current directory is not a git repository.""" |
| 33 | git.run('rev-parse') |
| 34 | |
| 35 | |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 36 | def CreateBranchForDirectory(prefix, directory, upstream): |
| 37 | """Creates a branch named |prefix| + "_" + |directory| + "_split". |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 38 | |
| 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 Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 43 | branch_name = prefix + '_' + directory + '_split' |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 44 | if branch_name in existing_branches: |
| 45 | return False |
| 46 | git.run('checkout', '-t', upstream, '-b', branch_name) |
| 47 | return True |
| 48 | |
| 49 | |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 50 | def FormatDescriptionOrComment(txt, directory): |
| 51 | """Replaces $directory with |directory| in |txt|.""" |
| 52 | return txt.replace('$directory', '/' + directory) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 53 | |
| 54 | |
| 55 | def 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 Fangzhen | 534f505 | 2021-06-23 08:51:34 +0000 | [diff] [blame] | 63 | if lines[-1] and not lines[-1].isspace(): |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 64 | 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 Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 71 | def UploadCl(refactor_branch, refactor_branch_upstream, directory, files, |
| 72 | description, comment, reviewers, changelist, cmd_upload, |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 73 | cq_dry_run, enable_auto_submit, repository_root): |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 74 | """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 Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 82 | description: Description of the uploaded CL. |
| 83 | comment: Comment to post on the uploaded CL. |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 84 | reviewers: A set of reviewers for the CL. |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 85 | changelist: The Changelist class. |
| 86 | cmd_upload: The function associated with the git cl upload command. |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 87 | cq_dry_run: If CL uploads should also do a cq dry run. |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 88 | enable_auto_submit: If CL uploads should also enable auto submit. |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 89 | """ |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 90 | # Create a branch. |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 91 | if not CreateBranchForDirectory( |
| 92 | refactor_branch, directory, refactor_branch_upstream): |
| 93 | print('Skipping ' + directory + ' for which a branch already exists.') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 94 | return |
| 95 | |
| 96 | # Checkout all changes to files in |files|. |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 97 | deleted_files = [] |
| 98 | modified_files = [] |
| 99 | for action, f in files: |
| 100 | abspath = os.path.abspath(os.path.join(repository_root, f)) |
| 101 | if action == 'D': |
| 102 | deleted_files.append(abspath) |
| 103 | else: |
| 104 | modified_files.append(abspath) |
| 105 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 106 | if deleted_files: |
| 107 | git.run(*['rm'] + deleted_files) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 108 | if modified_files: |
| 109 | git.run(*['checkout', refactor_branch, '--'] + modified_files) |
| 110 | |
| 111 | # Commit changes. The temporary file is created with delete=False so that it |
| 112 | # can be deleted manually after git has read it rather than automatically |
| 113 | # when it is closed. |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 114 | with gclient_utils.temporary_file() as tmp_file: |
| 115 | gclient_utils.FileWrite( |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 116 | tmp_file, FormatDescriptionOrComment(description, directory)) |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 117 | git.run('commit', '-F', tmp_file) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 118 | |
| 119 | # Upload a CL. |
Anthony Polito | c08c71b | 2020-08-26 23:45:30 +0000 | [diff] [blame] | 120 | upload_args = ['-f'] |
| 121 | if reviewers: |
| 122 | upload_args.extend(['-r', ','.join(reviewers)]) |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 123 | if cq_dry_run: |
| 124 | upload_args.append('--cq-dry-run') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 125 | if not comment: |
Aaron Gable | e5adf61 | 2017-07-14 10:43:58 -0700 | [diff] [blame] | 126 | upload_args.append('--send-mail') |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 127 | if enable_auto_submit: |
| 128 | upload_args.append('--enable-auto-submit') |
Olivier Li | 0614591 | 2021-05-12 23:59:24 +0000 | [diff] [blame] | 129 | print('Uploading CL for ' + directory + '...') |
| 130 | |
| 131 | ret = cmd_upload(upload_args) |
| 132 | if ret != 0: |
| 133 | print('Uploading failed for ' + directory + '.') |
| 134 | print('Note: git cl split has built-in resume capabilities.') |
| 135 | print('Delete ' + git.current_branch() + |
| 136 | ' then run git cl split again to resume uploading.') |
| 137 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 138 | if comment: |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 139 | changelist().AddComment(FormatDescriptionOrComment(comment, directory), |
| 140 | publish=True) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 141 | |
| 142 | |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 143 | def GetFilesSplitByOwners(files, max_depth): |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 144 | """Returns a map of files split by OWNERS file. |
| 145 | |
| 146 | Returns: |
| 147 | A map where keys are paths to directories containing an OWNERS file and |
| 148 | values are lists of files sharing an OWNERS file. |
| 149 | """ |
Edward Lesmes | b1174d7 | 2021-02-02 20:31:34 +0000 | [diff] [blame] | 150 | files_split_by_owners = {} |
Edward Lesmes | 17ffd98 | 2020-03-31 17:33:16 +0000 | [diff] [blame] | 151 | for action, path in files: |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 152 | # normpath() is important to normalize separators here, in prepration for |
| 153 | # str.split() before. It would be nicer to use something like pathlib here |
| 154 | # but alas... |
| 155 | dir_with_owners = os.path.normpath(os.path.dirname(path)) |
| 156 | if max_depth >= 1: |
| 157 | dir_with_owners = os.path.join( |
| 158 | *dir_with_owners.split(os.path.sep)[:max_depth]) |
Edward Lesmes | b1174d7 | 2021-02-02 20:31:34 +0000 | [diff] [blame] | 159 | # Find the closest parent directory with an OWNERS file. |
| 160 | while (dir_with_owners not in files_split_by_owners |
| 161 | and not os.path.isfile(os.path.join(dir_with_owners, 'OWNERS'))): |
| 162 | dir_with_owners = os.path.dirname(dir_with_owners) |
| 163 | files_split_by_owners.setdefault(dir_with_owners, []).append((action, path)) |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 164 | return files_split_by_owners |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 165 | |
| 166 | |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 167 | def PrintClInfo(cl_index, num_cls, directory, file_paths, description, |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 168 | reviewers): |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 169 | """Prints info about a CL. |
| 170 | |
| 171 | Args: |
| 172 | cl_index: The index of this CL in the list of CLs to upload. |
| 173 | num_cls: The total number of CLs that will be uploaded. |
| 174 | directory: Path to the directory that contains the OWNERS file for which |
| 175 | to upload a CL. |
| 176 | file_paths: A list of files in this CL. |
| 177 | description: The CL description. |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 178 | reviewers: A set of reviewers for this CL. |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 179 | """ |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 180 | description_lines = FormatDescriptionOrComment(description, |
| 181 | directory).splitlines() |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 182 | indented_description = '\n'.join([' ' + l for l in description_lines]) |
| 183 | |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 184 | print('CL {}/{}'.format(cl_index, num_cls)) |
| 185 | print('Path: {}'.format(directory)) |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 186 | print('Reviewers: {}'.format(', '.join(reviewers))) |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 187 | print('\n' + indented_description + '\n') |
| 188 | print('\n'.join(file_paths)) |
| 189 | print() |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 190 | |
| 191 | |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 192 | def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run, |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 193 | cq_dry_run, enable_auto_submit, max_depth, repository_root): |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 194 | """"Splits a branch into smaller branches and uploads CLs. |
| 195 | |
| 196 | Args: |
| 197 | description_file: File containing the description of uploaded CLs. |
| 198 | comment_file: File containing the comment of uploaded CLs. |
| 199 | changelist: The Changelist class. |
| 200 | cmd_upload: The function associated with the git cl upload command. |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 201 | dry_run: Whether this is a dry run (no branches or CLs created). |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 202 | cq_dry_run: If CL uploads should also do a cq dry run. |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 203 | enable_auto_submit: If CL uploads should also enable auto submit. |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 204 | max_depth: The maximum directory depth to search for OWNERS files. A value |
| 205 | less than 1 means no limit. |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 206 | |
| 207 | Returns: |
| 208 | 0 in case of success. 1 in case of error. |
| 209 | """ |
Edward Lesmes | b1174d7 | 2021-02-02 20:31:34 +0000 | [diff] [blame] | 210 | description = AddUploadedByGitClSplitToDescription( |
| 211 | gclient_utils.FileRead(description_file)) |
| 212 | comment = gclient_utils.FileRead(comment_file) if comment_file else None |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 213 | |
| 214 | try: |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 215 | EnsureInGitRepository() |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 216 | |
| 217 | cl = changelist() |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 218 | upstream = cl.GetCommonAncestorWithUpstream() |
| 219 | files = [ |
| 220 | (action.strip(), f) |
| 221 | for action, f in scm.GIT.CaptureStatus(repository_root, upstream) |
| 222 | ] |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 223 | |
| 224 | if not files: |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 225 | print('Cannot split an empty CL.') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 226 | return 1 |
| 227 | |
| 228 | author = git.run('config', 'user.email').strip() or None |
| 229 | refactor_branch = git.current_branch() |
Gabriel Charette | 09baacd | 2017-11-09 13:30:41 -0500 | [diff] [blame] | 230 | assert refactor_branch, "Can't run from detached branch." |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 231 | refactor_branch_upstream = git.upstream(refactor_branch) |
Gabriel Charette | 09baacd | 2017-11-09 13:30:41 -0500 | [diff] [blame] | 232 | assert refactor_branch_upstream, \ |
| 233 | "Branch %s must have an upstream." % refactor_branch |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 234 | |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 235 | files_split_by_owners = GetFilesSplitByOwners(files, max_depth) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 236 | |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 237 | num_cls = len(files_split_by_owners) |
| 238 | print('Will split current branch (' + refactor_branch + ') into ' + |
| 239 | str(num_cls) + ' CLs.\n') |
Stephen Martinis | f53f82c | 2018-09-07 20:58:05 +0000 | [diff] [blame] | 240 | if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT: |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 241 | print( |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 242 | 'This will generate "%r" CLs. This many CLs can potentially generate' |
| 243 | ' too much load on the build infrastructure. Please email' |
| 244 | ' infra-dev@chromium.org to ensure that this won\'t break anything.' |
| 245 | ' The infra team reserves the right to cancel your jobs if they are' |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 246 | ' overloading the CQ.' % num_cls) |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 247 | answer = gclient_utils.AskForData('Proceed? (y/n):') |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 248 | if answer.lower() != 'y': |
| 249 | return 0 |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 250 | |
Thiago Perrotta | 223f48d | 2023-02-23 23:19:57 +0000 | [diff] [blame] | 251 | # Verify that the description contains a bug link. Examples: |
| 252 | # Bug: 123 |
| 253 | # Bug: chromium:456 |
| 254 | bug_pattern = re.compile(r"^Bug:\s*(?:[a-zA-Z]+:)?[0-9]+", re.MULTILINE) |
Olivier Li | 0614591 | 2021-05-12 23:59:24 +0000 | [diff] [blame] | 255 | matches = re.findall(bug_pattern, description) |
| 256 | answer = 'y' |
| 257 | if not matches: |
| 258 | answer = gclient_utils.AskForData( |
| 259 | 'Description does not include a bug link. Proceed? (y/n):') |
| 260 | if answer.lower() != 'y': |
| 261 | return 0 |
| 262 | |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 263 | for cl_index, (directory, files) in \ |
| 264 | enumerate(files_split_by_owners.items(), 1): |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 265 | # Use '/' as a path separator in the branch name and the CL description |
| 266 | # and comment. |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 267 | directory = directory.replace(os.path.sep, '/') |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 268 | file_paths = [f for _, f in files] |
Edward Lesmes | 1523401 | 2021-02-17 17:25:03 +0000 | [diff] [blame] | 269 | reviewers = cl.owners_client.SuggestOwners( |
| 270 | file_paths, exclude=[author, cl.owners_client.EVERYONE]) |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 271 | if dry_run: |
| 272 | PrintClInfo(cl_index, num_cls, directory, file_paths, description, |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 273 | reviewers) |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 274 | else: |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 275 | UploadCl(refactor_branch, refactor_branch_upstream, directory, files, |
| 276 | description, comment, reviewers, changelist, cmd_upload, |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 277 | cq_dry_run, enable_auto_submit, repository_root) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 278 | |
| 279 | # Go back to the original branch. |
| 280 | git.run('checkout', refactor_branch) |
| 281 | |
| 282 | except subprocess2.CalledProcessError as cpe: |
| 283 | sys.stderr.write(cpe.stderr) |
| 284 | return 1 |
| 285 | return 0 |