blob: fecaf751ce12e5eff557673f20be586a0dacd765 [file] [log] [blame]
Francois Dorayd42c6812017-05-30 15:10:20 -04001#!/usr/bin/env python
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 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
19import owners
20import owners_finder
21
22import git_common as git
23
24
Stephen Martinisf53f82c2018-09-07 20:58:05 +000025# If a call to `git cl split` will generate more than this number of CLs, the
26# command will prompt the user to make sure they know what they're doing. Large
27# numbers of CLs generated by `git cl split` have caused infrastructure issues
28# in the past.
29CL_SPLIT_FORCE_LIMIT = 10
30
31
Francois Dorayd42c6812017-05-30 15:10:20 -040032def ReadFile(file_path):
33 """Returns the content of |file_path|."""
34 with open(file_path) as f:
35 content = f.read()
36 return content
37
38
39def EnsureInGitRepository():
40 """Throws an exception if the current directory is not a git repository."""
41 git.run('rev-parse')
42
43
Edward Lemurac5c55f2020-02-29 00:17:16 +000044def CreateBranchForDirectory(prefix, directory, upstream):
45 """Creates a branch named |prefix| + "_" + |directory| + "_split".
Francois Dorayd42c6812017-05-30 15:10:20 -040046
47 Return false if the branch already exists. |upstream| is used as upstream for
48 the created branch.
49 """
50 existing_branches = set(git.branches(use_limit = False))
Edward Lemurac5c55f2020-02-29 00:17:16 +000051 branch_name = prefix + '_' + directory + '_split'
Francois Dorayd42c6812017-05-30 15:10:20 -040052 if branch_name in existing_branches:
53 return False
54 git.run('checkout', '-t', upstream, '-b', branch_name)
55 return True
56
57
Edward Lemurac5c55f2020-02-29 00:17:16 +000058def FormatDescriptionOrComment(txt, directory):
59 """Replaces $directory with |directory| in |txt|."""
60 return txt.replace('$directory', '/' + directory)
Francois Dorayd42c6812017-05-30 15:10:20 -040061
62
63def AddUploadedByGitClSplitToDescription(description):
64 """Adds a 'This CL was uploaded by git cl split.' line to |description|.
65
66 The line is added before footers, or at the end of |description| if it has no
67 footers.
68 """
69 split_footers = git_footers.split_footers(description)
70 lines = split_footers[0]
71 if not lines[-1] or lines[-1].isspace():
72 lines = lines + ['']
73 lines = lines + ['This CL was uploaded by git cl split.']
74 if split_footers[1]:
75 lines += [''] + split_footers[1]
76 return '\n'.join(lines)
77
78
Edward Lemurac5c55f2020-02-29 00:17:16 +000079def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
80 description, comment, reviewers, changelist, cmd_upload,
Edward Lemur2c62b332020-03-12 22:12:33 +000081 cq_dry_run, enable_auto_submit, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -040082 """Uploads a CL with all changes to |files| in |refactor_branch|.
83
84 Args:
85 refactor_branch: Name of the branch that contains the changes to upload.
86 refactor_branch_upstream: Name of the upstream of |refactor_branch|.
87 directory: Path to the directory that contains the OWNERS file for which
88 to upload a CL.
89 files: List of AffectedFile instances to include in the uploaded CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040090 description: Description of the uploaded CL.
91 comment: Comment to post on the uploaded CL.
Edward Lemurac5c55f2020-02-29 00:17:16 +000092 reviewers: A set of reviewers for the CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040093 changelist: The Changelist class.
94 cmd_upload: The function associated with the git cl upload command.
Stephen Martiniscb326682018-08-29 21:06:30 +000095 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +000096 enable_auto_submit: If CL uploads should also enable auto submit.
Francois Dorayd42c6812017-05-30 15:10:20 -040097 """
Francois Dorayd42c6812017-05-30 15:10:20 -040098 # Create a branch.
Edward Lemurac5c55f2020-02-29 00:17:16 +000099 if not CreateBranchForDirectory(
100 refactor_branch, directory, refactor_branch_upstream):
101 print('Skipping ' + directory + ' for which a branch already exists.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400102 return
103
104 # Checkout all changes to files in |files|.
Edward Lemur2c62b332020-03-12 22:12:33 +0000105 deleted_files = []
106 modified_files = []
107 for action, f in files:
108 abspath = os.path.abspath(os.path.join(repository_root, f))
109 if action == 'D':
110 deleted_files.append(abspath)
111 else:
112 modified_files.append(abspath)
113
Francois Dorayd42c6812017-05-30 15:10:20 -0400114 if deleted_files:
115 git.run(*['rm'] + deleted_files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400116 if modified_files:
117 git.run(*['checkout', refactor_branch, '--'] + modified_files)
118
119 # Commit changes. The temporary file is created with delete=False so that it
120 # can be deleted manually after git has read it rather than automatically
121 # when it is closed.
Edward Lemur1773f372020-02-22 00:27:14 +0000122 with gclient_utils.temporary_file() as tmp_file:
123 gclient_utils.FileWrite(
Edward Lemurac5c55f2020-02-29 00:17:16 +0000124 tmp_file, FormatDescriptionOrComment(description, directory))
Edward Lemur1773f372020-02-22 00:27:14 +0000125 git.run('commit', '-F', tmp_file)
Francois Dorayd42c6812017-05-30 15:10:20 -0400126
127 # Upload a CL.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000128 upload_args = ['-f', '-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')
Raul Tambre80ee78e2019-05-06 22:41:05 +0000135 print('Uploading CL for ' + directory + '.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400136 cmd_upload(upload_args)
137 if comment:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000138 changelist().AddComment(FormatDescriptionOrComment(comment, directory),
139 publish=True)
Francois Dorayd42c6812017-05-30 15:10:20 -0400140
141
Edward Lemurac5c55f2020-02-29 00:17:16 +0000142def GetFilesSplitByOwners(owners_database, files):
Francois Dorayd42c6812017-05-30 15:10:20 -0400143 """Returns a map of files split by OWNERS file.
144
145 Returns:
146 A map where keys are paths to directories containing an OWNERS file and
147 values are lists of files sharing an OWNERS file.
148 """
Edward Lemurac5c55f2020-02-29 00:17:16 +0000149 files_split_by_owners = collections.defaultdict(list)
Edward Lemur2c62b332020-03-12 22:12:33 +0000150 for _, f in files:
151 enclosing_dir = owners_database.enclosing_dir_with_owners(f)
152 files_split_by_owners[enclosing_dir].append(f)
Edward Lemurac5c55f2020-02-29 00:17:16 +0000153 return files_split_by_owners
Francois Dorayd42c6812017-05-30 15:10:20 -0400154
155
Chris Watkinsba28e462017-12-13 11:22:17 +1100156def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Edward Lemurac5c55f2020-02-29 00:17:16 +0000157 reviewers):
Chris Watkinsba28e462017-12-13 11:22:17 +1100158 """Prints info about a CL.
159
160 Args:
161 cl_index: The index of this CL in the list of CLs to upload.
162 num_cls: The total number of CLs that will be uploaded.
163 directory: Path to the directory that contains the OWNERS file for which
164 to upload a CL.
165 file_paths: A list of files in this CL.
166 description: The CL description.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000167 reviewers: A set of reviewers for this CL.
Chris Watkinsba28e462017-12-13 11:22:17 +1100168 """
Edward Lemurac5c55f2020-02-29 00:17:16 +0000169 description_lines = FormatDescriptionOrComment(description,
170 directory).splitlines()
Chris Watkinsba28e462017-12-13 11:22:17 +1100171 indented_description = '\n'.join([' ' + l for l in description_lines])
172
Raul Tambre80ee78e2019-05-06 22:41:05 +0000173 print('CL {}/{}'.format(cl_index, num_cls))
174 print('Path: {}'.format(directory))
Edward Lemurac5c55f2020-02-29 00:17:16 +0000175 print('Reviewers: {}'.format(', '.join(reviewers)))
Raul Tambre80ee78e2019-05-06 22:41:05 +0000176 print('\n' + indented_description + '\n')
177 print('\n'.join(file_paths))
178 print()
Chris Watkinsba28e462017-12-13 11:22:17 +1100179
180
Stephen Martiniscb326682018-08-29 21:06:30 +0000181def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
Edward Lemur2c62b332020-03-12 22:12:33 +0000182 cq_dry_run, enable_auto_submit, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -0400183 """"Splits a branch into smaller branches and uploads CLs.
184
185 Args:
186 description_file: File containing the description of uploaded CLs.
187 comment_file: File containing the comment of uploaded CLs.
188 changelist: The Changelist class.
189 cmd_upload: The function associated with the git cl upload command.
Chris Watkinsba28e462017-12-13 11:22:17 +1100190 dry_run: Whether this is a dry run (no branches or CLs created).
Stephen Martiniscb326682018-08-29 21:06:30 +0000191 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +0000192 enable_auto_submit: If CL uploads should also enable auto submit.
Francois Dorayd42c6812017-05-30 15:10:20 -0400193
194 Returns:
195 0 in case of success. 1 in case of error.
196 """
197 description = AddUploadedByGitClSplitToDescription(ReadFile(description_file))
198 comment = ReadFile(comment_file) if comment_file else None
199
200 try:
Chris Watkinsba28e462017-12-13 11:22:17 +1100201 EnsureInGitRepository()
Francois Dorayd42c6812017-05-30 15:10:20 -0400202
203 cl = changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +0000204 upstream = cl.GetCommonAncestorWithUpstream()
205 files = [
206 (action.strip(), f)
207 for action, f in scm.GIT.CaptureStatus(repository_root, upstream)
208 ]
Francois Dorayd42c6812017-05-30 15:10:20 -0400209
210 if not files:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000211 print('Cannot split an empty CL.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400212 return 1
213
214 author = git.run('config', 'user.email').strip() or None
215 refactor_branch = git.current_branch()
Gabriel Charette09baacd2017-11-09 13:30:41 -0500216 assert refactor_branch, "Can't run from detached branch."
Francois Dorayd42c6812017-05-30 15:10:20 -0400217 refactor_branch_upstream = git.upstream(refactor_branch)
Gabriel Charette09baacd2017-11-09 13:30:41 -0500218 assert refactor_branch_upstream, \
219 "Branch %s must have an upstream." % refactor_branch
Francois Dorayd42c6812017-05-30 15:10:20 -0400220
Edward Lemur2c62b332020-03-12 22:12:33 +0000221 owners_database = owners.Database(repository_root, open, os.path)
222 owners_database.load_data_needed_for([f for _, f in files])
Francois Dorayd42c6812017-05-30 15:10:20 -0400223
Edward Lemurac5c55f2020-02-29 00:17:16 +0000224 files_split_by_owners = GetFilesSplitByOwners(owners_database, files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400225
Edward Lemurac5c55f2020-02-29 00:17:16 +0000226 num_cls = len(files_split_by_owners)
227 print('Will split current branch (' + refactor_branch + ') into ' +
228 str(num_cls) + ' CLs.\n')
Stephen Martinisf53f82c2018-09-07 20:58:05 +0000229 if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000230 print(
Stephen Martiniscb326682018-08-29 21:06:30 +0000231 'This will generate "%r" CLs. This many CLs can potentially generate'
232 ' too much load on the build infrastructure. Please email'
233 ' infra-dev@chromium.org to ensure that this won\'t break anything.'
234 ' The infra team reserves the right to cancel your jobs if they are'
Raul Tambre80ee78e2019-05-06 22:41:05 +0000235 ' overloading the CQ.' % num_cls)
Edward Lesmesae3586b2020-03-23 21:21:14 +0000236 answer = gclient_utils.AskForData('Proceed? (y/n):')
Stephen Martiniscb326682018-08-29 21:06:30 +0000237 if answer.lower() != 'y':
238 return 0
Francois Dorayd42c6812017-05-30 15:10:20 -0400239
Edward Lemurac5c55f2020-02-29 00:17:16 +0000240 for cl_index, (directory, files) in \
241 enumerate(files_split_by_owners.items(), 1):
Francois Dorayd42c6812017-05-30 15:10:20 -0400242 # Use '/' as a path separator in the branch name and the CL description
243 # and comment.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000244 directory = directory.replace(os.path.sep, '/')
Edward Lemur2c62b332020-03-12 22:12:33 +0000245 file_paths = [f for _, f in files]
Edward Lemurac5c55f2020-02-29 00:17:16 +0000246 reviewers = owners_database.reviewers_for(file_paths, author)
Chris Watkinsba28e462017-12-13 11:22:17 +1100247
248 if dry_run:
249 PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Edward Lemurac5c55f2020-02-29 00:17:16 +0000250 reviewers)
Chris Watkinsba28e462017-12-13 11:22:17 +1100251 else:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000252 UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
253 description, comment, reviewers, changelist, cmd_upload,
Edward Lemur2c62b332020-03-12 22:12:33 +0000254 cq_dry_run, enable_auto_submit, repository_root)
Francois Dorayd42c6812017-05-30 15:10:20 -0400255
256 # Go back to the original branch.
257 git.run('checkout', refactor_branch)
258
259 except subprocess2.CalledProcessError as cpe:
260 sys.stderr.write(cpe.stderr)
261 return 1
262 return 0