blob: 59f80b90baf237c0c7326f5acd8d0cdac1839ebe [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
Edward Lesmes17ffd982020-03-31 17:33:16 +000021import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040022
23import git_common as git
24
25
Stephen Martinisf53f82c2018-09-07 20:58:05 +000026# If a call to `git cl split` will generate more than this number of CLs, the
27# command will prompt the user to make sure they know what they're doing. Large
28# numbers of CLs generated by `git cl split` have caused infrastructure issues
29# in the past.
30CL_SPLIT_FORCE_LIMIT = 10
31
32
Francois Dorayd42c6812017-05-30 15:10:20 -040033def EnsureInGitRepository():
34 """Throws an exception if the current directory is not a git repository."""
35 git.run('rev-parse')
36
37
Edward Lemurac5c55f2020-02-29 00:17:16 +000038def CreateBranchForDirectory(prefix, directory, upstream):
39 """Creates a branch named |prefix| + "_" + |directory| + "_split".
Francois Dorayd42c6812017-05-30 15:10:20 -040040
41 Return false if the branch already exists. |upstream| is used as upstream for
42 the created branch.
43 """
44 existing_branches = set(git.branches(use_limit = False))
Edward Lemurac5c55f2020-02-29 00:17:16 +000045 branch_name = prefix + '_' + directory + '_split'
Francois Dorayd42c6812017-05-30 15:10:20 -040046 if branch_name in existing_branches:
47 return False
48 git.run('checkout', '-t', upstream, '-b', branch_name)
49 return True
50
51
Edward Lemurac5c55f2020-02-29 00:17:16 +000052def FormatDescriptionOrComment(txt, directory):
53 """Replaces $directory with |directory| in |txt|."""
54 return txt.replace('$directory', '/' + directory)
Francois Dorayd42c6812017-05-30 15:10:20 -040055
56
57def AddUploadedByGitClSplitToDescription(description):
58 """Adds a 'This CL was uploaded by git cl split.' line to |description|.
59
60 The line is added before footers, or at the end of |description| if it has no
61 footers.
62 """
63 split_footers = git_footers.split_footers(description)
64 lines = split_footers[0]
65 if not lines[-1] or lines[-1].isspace():
66 lines = lines + ['']
67 lines = lines + ['This CL was uploaded by git cl split.']
68 if split_footers[1]:
69 lines += [''] + split_footers[1]
70 return '\n'.join(lines)
71
72
Edward Lemurac5c55f2020-02-29 00:17:16 +000073def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
74 description, comment, reviewers, changelist, cmd_upload,
Edward Lemur2c62b332020-03-12 22:12:33 +000075 cq_dry_run, enable_auto_submit, repository_root):
Francois Dorayd42c6812017-05-30 15:10:20 -040076 """Uploads a CL with all changes to |files| in |refactor_branch|.
77
78 Args:
79 refactor_branch: Name of the branch that contains the changes to upload.
80 refactor_branch_upstream: Name of the upstream of |refactor_branch|.
81 directory: Path to the directory that contains the OWNERS file for which
82 to upload a CL.
83 files: List of AffectedFile instances to include in the uploaded CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040084 description: Description of the uploaded CL.
85 comment: Comment to post on the uploaded CL.
Edward Lemurac5c55f2020-02-29 00:17:16 +000086 reviewers: A set of reviewers for the CL.
Francois Dorayd42c6812017-05-30 15:10:20 -040087 changelist: The Changelist class.
88 cmd_upload: The function associated with the git cl upload command.
Stephen Martiniscb326682018-08-29 21:06:30 +000089 cq_dry_run: If CL uploads should also do a cq dry run.
Takuto Ikuta51eca592019-02-14 19:40:52 +000090 enable_auto_submit: If CL uploads should also enable auto submit.
Francois Dorayd42c6812017-05-30 15:10:20 -040091 """
Francois Dorayd42c6812017-05-30 15:10:20 -040092 # Create a branch.
Edward Lemurac5c55f2020-02-29 00:17:16 +000093 if not CreateBranchForDirectory(
94 refactor_branch, directory, refactor_branch_upstream):
95 print('Skipping ' + directory + ' for which a branch already exists.')
Francois Dorayd42c6812017-05-30 15:10:20 -040096 return
97
98 # Checkout all changes to files in |files|.
Edward Lemur2c62b332020-03-12 22:12:33 +000099 deleted_files = []
100 modified_files = []
101 for action, f in files:
102 abspath = os.path.abspath(os.path.join(repository_root, f))
103 if action == 'D':
104 deleted_files.append(abspath)
105 else:
106 modified_files.append(abspath)
107
Francois Dorayd42c6812017-05-30 15:10:20 -0400108 if deleted_files:
109 git.run(*['rm'] + deleted_files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400110 if modified_files:
111 git.run(*['checkout', refactor_branch, '--'] + modified_files)
112
113 # Commit changes. The temporary file is created with delete=False so that it
114 # can be deleted manually after git has read it rather than automatically
115 # when it is closed.
Edward Lemur1773f372020-02-22 00:27:14 +0000116 with gclient_utils.temporary_file() as tmp_file:
117 gclient_utils.FileWrite(
Edward Lemurac5c55f2020-02-29 00:17:16 +0000118 tmp_file, FormatDescriptionOrComment(description, directory))
Edward Lemur1773f372020-02-22 00:27:14 +0000119 git.run('commit', '-F', tmp_file)
Francois Dorayd42c6812017-05-30 15:10:20 -0400120
121 # Upload a CL.
Anthony Politoc08c71b2020-08-26 23:45:30 +0000122 upload_args = ['-f']
123 if reviewers:
124 upload_args.extend(['-r', ','.join(reviewers)])
Stephen Martiniscb326682018-08-29 21:06:30 +0000125 if cq_dry_run:
126 upload_args.append('--cq-dry-run')
Francois Dorayd42c6812017-05-30 15:10:20 -0400127 if not comment:
Aaron Gablee5adf612017-07-14 10:43:58 -0700128 upload_args.append('--send-mail')
Takuto Ikuta51eca592019-02-14 19:40:52 +0000129 if enable_auto_submit:
130 upload_args.append('--enable-auto-submit')
Raul Tambre80ee78e2019-05-06 22:41:05 +0000131 print('Uploading CL for ' + directory + '.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400132 cmd_upload(upload_args)
133 if comment:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000134 changelist().AddComment(FormatDescriptionOrComment(comment, directory),
135 publish=True)
Francois Dorayd42c6812017-05-30 15:10:20 -0400136
137
Edward Lesmesb1174d72021-02-02 20:31:34 +0000138def GetFilesSplitByOwners(files):
Francois Dorayd42c6812017-05-30 15:10:20 -0400139 """Returns a map of files split by OWNERS file.
140
141 Returns:
142 A map where keys are paths to directories containing an OWNERS file and
143 values are lists of files sharing an OWNERS file.
144 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000145 files_split_by_owners = {}
Edward Lesmes17ffd982020-03-31 17:33:16 +0000146 for action, path in files:
Edward Lesmesb1174d72021-02-02 20:31:34 +0000147 dir_with_owners = os.path.dirname(path)
148 # Find the closest parent directory with an OWNERS file.
149 while (dir_with_owners not in files_split_by_owners
150 and not os.path.isfile(os.path.join(dir_with_owners, 'OWNERS'))):
151 dir_with_owners = os.path.dirname(dir_with_owners)
152 files_split_by_owners.setdefault(dir_with_owners, []).append((action, path))
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 """
Edward Lesmesb1174d72021-02-02 20:31:34 +0000197 description = AddUploadedByGitClSplitToDescription(
198 gclient_utils.FileRead(description_file))
199 comment = gclient_utils.FileRead(comment_file) if comment_file else None
Francois Dorayd42c6812017-05-30 15:10:20 -0400200
201 try:
Chris Watkinsba28e462017-12-13 11:22:17 +1100202 EnsureInGitRepository()
Francois Dorayd42c6812017-05-30 15:10:20 -0400203
204 cl = changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +0000205 upstream = cl.GetCommonAncestorWithUpstream()
206 files = [
207 (action.strip(), f)
208 for action, f in scm.GIT.CaptureStatus(repository_root, upstream)
209 ]
Francois Dorayd42c6812017-05-30 15:10:20 -0400210
211 if not files:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000212 print('Cannot split an empty CL.')
Francois Dorayd42c6812017-05-30 15:10:20 -0400213 return 1
214
215 author = git.run('config', 'user.email').strip() or None
216 refactor_branch = git.current_branch()
Gabriel Charette09baacd2017-11-09 13:30:41 -0500217 assert refactor_branch, "Can't run from detached branch."
Francois Dorayd42c6812017-05-30 15:10:20 -0400218 refactor_branch_upstream = git.upstream(refactor_branch)
Gabriel Charette09baacd2017-11-09 13:30:41 -0500219 assert refactor_branch_upstream, \
220 "Branch %s must have an upstream." % refactor_branch
Francois Dorayd42c6812017-05-30 15:10:20 -0400221
Edward Lemur2c62b332020-03-12 22:12:33 +0000222 owners_database = owners.Database(repository_root, open, os.path)
223 owners_database.load_data_needed_for([f for _, f in files])
Francois Dorayd42c6812017-05-30 15:10:20 -0400224
Edward Lesmesb1174d72021-02-02 20:31:34 +0000225 files_split_by_owners = GetFilesSplitByOwners(files)
Francois Dorayd42c6812017-05-30 15:10:20 -0400226
Edward Lemurac5c55f2020-02-29 00:17:16 +0000227 num_cls = len(files_split_by_owners)
228 print('Will split current branch (' + refactor_branch + ') into ' +
229 str(num_cls) + ' CLs.\n')
Stephen Martinisf53f82c2018-09-07 20:58:05 +0000230 if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
Raul Tambre80ee78e2019-05-06 22:41:05 +0000231 print(
Stephen Martiniscb326682018-08-29 21:06:30 +0000232 'This will generate "%r" CLs. This many CLs can potentially generate'
233 ' too much load on the build infrastructure. Please email'
234 ' infra-dev@chromium.org to ensure that this won\'t break anything.'
235 ' The infra team reserves the right to cancel your jobs if they are'
Raul Tambre80ee78e2019-05-06 22:41:05 +0000236 ' overloading the CQ.' % num_cls)
Edward Lesmesae3586b2020-03-23 21:21:14 +0000237 answer = gclient_utils.AskForData('Proceed? (y/n):')
Stephen Martiniscb326682018-08-29 21:06:30 +0000238 if answer.lower() != 'y':
239 return 0
Francois Dorayd42c6812017-05-30 15:10:20 -0400240
Edward Lemurac5c55f2020-02-29 00:17:16 +0000241 for cl_index, (directory, files) in \
242 enumerate(files_split_by_owners.items(), 1):
Francois Dorayd42c6812017-05-30 15:10:20 -0400243 # Use '/' as a path separator in the branch name and the CL description
244 # and comment.
Edward Lemurac5c55f2020-02-29 00:17:16 +0000245 directory = directory.replace(os.path.sep, '/')
Edward Lemur2c62b332020-03-12 22:12:33 +0000246 file_paths = [f for _, f in files]
Edward Lemurac5c55f2020-02-29 00:17:16 +0000247 reviewers = owners_database.reviewers_for(file_paths, author)
Anthony Politoc08c71b2020-08-26 23:45:30 +0000248 reviewers.discard(owners.ANYONE)
Chris Watkinsba28e462017-12-13 11:22:17 +1100249 if dry_run:
250 PrintClInfo(cl_index, num_cls, directory, file_paths, description,
Edward Lemurac5c55f2020-02-29 00:17:16 +0000251 reviewers)
Chris Watkinsba28e462017-12-13 11:22:17 +1100252 else:
Edward Lemurac5c55f2020-02-29 00:17:16 +0000253 UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
254 description, comment, reviewers, changelist, cmd_upload,
Edward Lemur2c62b332020-03-12 22:12:33 +0000255 cq_dry_run, enable_auto_submit, repository_root)
Francois Dorayd42c6812017-05-30 15:10:20 -0400256
257 # Go back to the original branch.
258 git.run('checkout', refactor_branch)
259
260 except subprocess2.CalledProcessError as cpe:
261 sys.stderr.write(cpe.stderr)
262 return 1
263 return 0