#!/usr/bin/env python3 # Copyright 2017 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Splits a branch into smaller branches and uploads CLs.""" from __future__ import print_function import collections import os import re import subprocess2 import sys import tempfile import gclient_utils import git_footers import scm import git_common as git # If a call to `git cl split` will generate more than this number of CLs, the # command will prompt the user to make sure they know what they're doing. Large # numbers of CLs generated by `git cl split` have caused infrastructure issues # in the past. CL_SPLIT_FORCE_LIMIT = 10 def EnsureInGitRepository(): """Throws an exception if the current directory is not a git repository.""" git.run('rev-parse') def CreateBranchForDirectory(prefix, directory, upstream): """Creates a branch named |prefix| + "_" + |directory| + "_split". Return false if the branch already exists. |upstream| is used as upstream for the created branch. """ existing_branches = set(git.branches(use_limit = False)) branch_name = prefix + '_' + directory + '_split' if branch_name in existing_branches: return False git.run('checkout', '-t', upstream, '-b', branch_name) return True def FormatDescriptionOrComment(txt, directory): """Replaces $directory with |directory| in |txt|.""" return txt.replace('$directory', '/' + directory) def AddUploadedByGitClSplitToDescription(description): """Adds a 'This CL was uploaded by git cl split.' line to |description|. The line is added before footers, or at the end of |description| if it has no footers. """ split_footers = git_footers.split_footers(description) lines = split_footers[0] if lines[-1] and not lines[-1].isspace(): lines = lines + [''] lines = lines + ['This CL was uploaded by git cl split.'] if split_footers[1]: lines += [''] + split_footers[1] return '\n'.join(lines) def UploadCl(refactor_branch, refactor_branch_upstream, directory, files, description, comment, reviewers, changelist, cmd_upload, cq_dry_run, enable_auto_submit, repository_root): """Uploads a CL with all changes to |files| in |refactor_branch|. Args: refactor_branch: Name of the branch that contains the changes to upload. refactor_branch_upstream: Name of the upstream of |refactor_branch|. directory: Path to the directory that contains the OWNERS file for which to upload a CL. files: List of AffectedFile instances to include in the uploaded CL. description: Description of the uploaded CL. comment: Comment to post on the uploaded CL. reviewers: A set of reviewers for the CL. changelist: The Changelist class. cmd_upload: The function associated with the git cl upload command. cq_dry_run: If CL uploads should also do a cq dry run. enable_auto_submit: If CL uploads should also enable auto submit. """ # Create a branch. if not CreateBranchForDirectory( refactor_branch, directory, refactor_branch_upstream): print('Skipping ' + directory + ' for which a branch already exists.') return # Checkout all changes to files in |files|. deleted_files = [] modified_files = [] for action, f in files: abspath = os.path.abspath(os.path.join(repository_root, f)) if action == 'D': deleted_files.append(abspath) else: modified_files.append(abspath) if deleted_files: git.run(*['rm'] + deleted_files) if modified_files: git.run(*['checkout', refactor_branch, '--'] + modified_files) # Commit changes. The temporary file is created with delete=False so that it # can be deleted manually after git has read it rather than automatically # when it is closed. with gclient_utils.temporary_file() as tmp_file: gclient_utils.FileWrite( tmp_file, FormatDescriptionOrComment(description, directory)) git.run('commit', '-F', tmp_file) # Upload a CL. upload_args = ['-f'] if reviewers: upload_args.extend(['-r', ','.join(reviewers)]) if cq_dry_run: upload_args.append('--cq-dry-run') if not comment: upload_args.append('--send-mail') if enable_auto_submit: upload_args.append('--enable-auto-submit') print('Uploading CL for ' + directory + '...') ret = cmd_upload(upload_args) if ret != 0: print('Uploading failed for ' + directory + '.') print('Note: git cl split has built-in resume capabilities.') print('Delete ' + git.current_branch() + ' then run git cl split again to resume uploading.') if comment: changelist().AddComment(FormatDescriptionOrComment(comment, directory), publish=True) def GetFilesSplitByOwners(files, max_depth): """Returns a map of files split by OWNERS file. Returns: A map where keys are paths to directories containing an OWNERS file and values are lists of files sharing an OWNERS file. """ files_split_by_owners = {} for action, path in files: # normpath() is important to normalize separators here, in prepration for # str.split() before. It would be nicer to use something like pathlib here # but alas... dir_with_owners = os.path.normpath(os.path.dirname(path)) if max_depth >= 1: dir_with_owners = os.path.join( *dir_with_owners.split(os.path.sep)[:max_depth]) # Find the closest parent directory with an OWNERS file. while (dir_with_owners not in files_split_by_owners and not os.path.isfile(os.path.join(dir_with_owners, 'OWNERS'))): dir_with_owners = os.path.dirname(dir_with_owners) files_split_by_owners.setdefault(dir_with_owners, []).append((action, path)) return files_split_by_owners def PrintClInfo(cl_index, num_cls, directory, file_paths, description, reviewers): """Prints info about a CL. Args: cl_index: The index of this CL in the list of CLs to upload. num_cls: The total number of CLs that will be uploaded. directory: Path to the directory that contains the OWNERS file for which to upload a CL. file_paths: A list of files in this CL. description: The CL description. reviewers: A set of reviewers for this CL. """ description_lines = FormatDescriptionOrComment(description, directory).splitlines() indented_description = '\n'.join([' ' + l for l in description_lines]) print('CL {}/{}'.format(cl_index, num_cls)) print('Path: {}'.format(directory)) print('Reviewers: {}'.format(', '.join(reviewers))) print('\n' + indented_description + '\n') print('\n'.join(file_paths)) print() def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run, cq_dry_run, enable_auto_submit, max_depth, repository_root): """"Splits a branch into smaller branches and uploads CLs. Args: description_file: File containing the description of uploaded CLs. comment_file: File containing the comment of uploaded CLs. changelist: The Changelist class. cmd_upload: The function associated with the git cl upload command. dry_run: Whether this is a dry run (no branches or CLs created). cq_dry_run: If CL uploads should also do a cq dry run. enable_auto_submit: If CL uploads should also enable auto submit. max_depth: The maximum directory depth to search for OWNERS files. A value less than 1 means no limit. Returns: 0 in case of success. 1 in case of error. """ description = AddUploadedByGitClSplitToDescription( gclient_utils.FileRead(description_file)) comment = gclient_utils.FileRead(comment_file) if comment_file else None try: EnsureInGitRepository() cl = changelist() upstream = cl.GetCommonAncestorWithUpstream() files = [ (action.strip(), f) for action, f in scm.GIT.CaptureStatus(repository_root, upstream) ] if not files: print('Cannot split an empty CL.') return 1 author = git.run('config', 'user.email').strip() or None refactor_branch = git.current_branch() assert refactor_branch, "Can't run from detached branch." refactor_branch_upstream = git.upstream(refactor_branch) assert refactor_branch_upstream, \ "Branch %s must have an upstream." % refactor_branch files_split_by_owners = GetFilesSplitByOwners(files, max_depth) num_cls = len(files_split_by_owners) print('Will split current branch (' + refactor_branch + ') into ' + str(num_cls) + ' CLs.\n') if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT: print( 'This will generate "%r" CLs. This many CLs can potentially generate' ' too much load on the build infrastructure. Please email' ' infra-dev@chromium.org to ensure that this won\'t break anything.' ' The infra team reserves the right to cancel your jobs if they are' ' overloading the CQ.' % num_cls) answer = gclient_utils.AskForData('Proceed? (y/n):') if answer.lower() != 'y': return 0 # Verify that the description contains a bug link. Examples: # Bug: 123 # Bug: chromium:456 bug_pattern = re.compile(r"^Bug:\s*(?:[a-zA-Z]+:)?[0-9]+", re.MULTILINE) matches = re.findall(bug_pattern, description) answer = 'y' if not matches: answer = gclient_utils.AskForData( 'Description does not include a bug link. Proceed? (y/n):') if answer.lower() != 'y': return 0 for cl_index, (directory, files) in \ enumerate(files_split_by_owners.items(), 1): # Use '/' as a path separator in the branch name and the CL description # and comment. directory = directory.replace(os.path.sep, '/') file_paths = [f for _, f in files] reviewers = cl.owners_client.SuggestOwners( file_paths, exclude=[author, cl.owners_client.EVERYONE]) if dry_run: PrintClInfo(cl_index, num_cls, directory, file_paths, description, reviewers) else: UploadCl(refactor_branch, refactor_branch_upstream, directory, files, description, comment, reviewers, changelist, cmd_upload, cq_dry_run, enable_auto_submit, repository_root) # Go back to the original branch. git.run('checkout', refactor_branch) except subprocess2.CalledProcessError as cpe: sys.stderr.write(cpe.stderr) return 1 return 0