Josip Sokcevic | 4de5dea | 2022-03-23 21:15:14 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 2 | # Copyright 2015 The Chromium Authors. All rights reserved. |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 6 | """Rolls DEPS controlled dependency. |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 7 | |
Josip Sokcevic | c1a06c1 | 2022-01-12 00:44:14 +0000 | [diff] [blame] | 8 | Works only with git checkout and git dependencies. Currently this script will |
| 9 | always roll to the tip of to origin/main. |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 10 | """ |
| 11 | |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 12 | from __future__ import print_function |
| 13 | |
sbc@chromium.org | 30e5b23 | 2015-06-01 18:06:59 +0000 | [diff] [blame] | 14 | import argparse |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 15 | import os |
| 16 | import re |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 17 | import subprocess2 |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 18 | import sys |
| 19 | |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 20 | NEED_SHELL = sys.platform.startswith('win') |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 21 | GCLIENT_PATH = os.path.join( |
| 22 | os.path.dirname(os.path.abspath(__file__)), 'gclient.py') |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 23 | |
| 24 | |
Marc-Antoine Ruel | 1e2cb15 | 2019-04-17 17:32:52 +0000 | [diff] [blame] | 25 | # Commit subject that will be considered a roll. In the format generated by the |
| 26 | # git log used, so it's "<year>-<month>-<day> <author> <subject>" |
| 27 | _ROLL_SUBJECT = re.compile( |
| 28 | # Date |
| 29 | r'^\d\d\d\d-\d\d-\d\d ' |
| 30 | # Author |
| 31 | r'[^ ]+ ' |
| 32 | # Subject |
| 33 | r'(' |
| 34 | # Generated by |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 35 | # https://skia.googlesource.com/buildbot/+/HEAdA/autoroll/go/repo_manager/deps_repo_manager.go |
Marc-Antoine Ruel | 1e2cb15 | 2019-04-17 17:32:52 +0000 | [diff] [blame] | 36 | r'Roll [^ ]+ [a-f0-9]+\.\.[a-f0-9]+ \(\d+ commits\)' |
| 37 | r'|' |
| 38 | # Generated by |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 39 | # https://chromium.googlesource.com/infra/infra/+/HEAD/recipes/recipe_modules/recipe_autoroller/api.py |
Marc-Antoine Ruel | 1e2cb15 | 2019-04-17 17:32:52 +0000 | [diff] [blame] | 40 | r'Roll recipe dependencies \(trivial\)\.' |
| 41 | r')$') |
| 42 | |
| 43 | |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 44 | class Error(Exception): |
| 45 | pass |
| 46 | |
| 47 | |
smut | 7036c4f | 2016-06-09 14:28:48 -0700 | [diff] [blame] | 48 | class AlreadyRolledError(Error): |
| 49 | pass |
| 50 | |
| 51 | |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 52 | def check_output(*args, **kwargs): |
Corentin Wallez | 8732c0e | 2020-12-09 17:43:46 +0000 | [diff] [blame] | 53 | """subprocess2.check_output() passing shell=True on Windows for git.""" |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 54 | kwargs.setdefault('shell', NEED_SHELL) |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 55 | return subprocess2.check_output(*args, **kwargs).decode('utf-8') |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 56 | |
| 57 | |
| 58 | def check_call(*args, **kwargs): |
Corentin Wallez | 8732c0e | 2020-12-09 17:43:46 +0000 | [diff] [blame] | 59 | """subprocess2.check_call() passing shell=True on Windows for git.""" |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 60 | kwargs.setdefault('shell', NEED_SHELL) |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 61 | subprocess2.check_call(*args, **kwargs) |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 62 | |
| 63 | |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 64 | def return_code(*args, **kwargs): |
Corentin Wallez | 8732c0e | 2020-12-09 17:43:46 +0000 | [diff] [blame] | 65 | """subprocess2.call() passing shell=True on Windows for git and |
Edward Lesmes | cf06cad | 2020-12-14 22:03:23 +0000 | [diff] [blame] | 66 | subprocess2.DEVNULL for stdout and stderr.""" |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 67 | kwargs.setdefault('shell', NEED_SHELL) |
Edward Lesmes | cf06cad | 2020-12-14 22:03:23 +0000 | [diff] [blame] | 68 | kwargs.setdefault('stdout', subprocess2.DEVNULL) |
| 69 | kwargs.setdefault('stderr', subprocess2.DEVNULL) |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 70 | return subprocess2.call(*args, **kwargs) |
| 71 | |
| 72 | |
| 73 | def is_pristine(root): |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 74 | """Returns True if a git checkout is pristine.""" |
Josip Sokcevic | c1a06c1 | 2022-01-12 00:44:14 +0000 | [diff] [blame] | 75 | # `git rev-parse --verify` has a non-zero return code if the revision |
| 76 | # doesn't exist. |
| 77 | diff_cmd = ['git', 'diff', '--ignore-submodules', 'origin/main'] |
| 78 | return (not check_output(diff_cmd, cwd=root).strip() and |
| 79 | not check_output(diff_cmd + ['--cached'], cwd=root).strip()) |
Corentin Wallez | 5157fbf | 2020-11-12 22:31:35 +0000 | [diff] [blame] | 80 | |
| 81 | |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 82 | |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 83 | def get_log_url(upstream_url, head, tot): |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 84 | """Returns an URL to read logs via a Web UI if applicable.""" |
| 85 | if re.match(r'https://[^/]*\.googlesource\.com/', upstream_url): |
| 86 | # gitiles |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 87 | return '%s/+log/%s..%s' % (upstream_url, head[:12], tot[:12]) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 88 | if upstream_url.startswith('https://github.com/'): |
| 89 | upstream_url = upstream_url.rstrip('/') |
| 90 | if upstream_url.endswith('.git'): |
| 91 | upstream_url = upstream_url[:-len('.git')] |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 92 | return '%s/compare/%s...%s' % (upstream_url, head[:12], tot[:12]) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 93 | return None |
| 94 | |
| 95 | |
| 96 | def should_show_log(upstream_url): |
| 97 | """Returns True if a short log should be included in the tree.""" |
| 98 | # Skip logs for very active projects. |
Eric Boren | 07efc5a | 2017-08-28 09:13:20 -0400 | [diff] [blame] | 99 | if upstream_url.endswith('/v8/v8.git'): |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 100 | return False |
| 101 | if 'webrtc' in upstream_url: |
| 102 | return False |
| 103 | return True |
| 104 | |
| 105 | |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 106 | def gclient(args): |
| 107 | """Executes gclient with the given args and returns the stdout.""" |
| 108 | return check_output([sys.executable, GCLIENT_PATH] + args).strip() |
sbc@chromium.org | 9820112 | 2015-04-22 20:21:34 +0000 | [diff] [blame] | 109 | |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 110 | |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 111 | def generate_commit_message( |
| 112 | full_dir, dependency, head, roll_to, no_log, log_limit): |
| 113 | """Creates the commit message for this specific roll.""" |
Sylvain Defresne | ae2b962 | 2020-01-31 09:46:06 +0000 | [diff] [blame] | 114 | commit_range = '%s..%s' % (head, roll_to) |
| 115 | commit_range_for_header = '%s..%s' % (head[:9], roll_to[:9]) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 116 | upstream_url = check_output( |
| 117 | ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip() |
| 118 | log_url = get_log_url(upstream_url, head, roll_to) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 119 | cmd = ['git', 'log', commit_range, '--date=short', '--no-merges'] |
maruel@chromium.org | c6e39fe | 2015-09-23 13:45:52 +0000 | [diff] [blame] | 120 | logs = check_output( |
Sylvain Defresne | ae2b962 | 2020-01-31 09:46:06 +0000 | [diff] [blame] | 121 | # Args with '=' are automatically quoted. |
| 122 | cmd + ['--format=%ad %ae %s', '--'], |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 123 | cwd=full_dir).rstrip() |
maruel@chromium.org | c6e39fe | 2015-09-23 13:45:52 +0000 | [diff] [blame] | 124 | logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs) |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 125 | lines = logs.splitlines() |
Marc-Antoine Ruel | 1e2cb15 | 2019-04-17 17:32:52 +0000 | [diff] [blame] | 126 | cleaned_lines = [l for l in lines if not _ROLL_SUBJECT.match(l)] |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 127 | logs = '\n'.join(cleaned_lines) + '\n' |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 128 | |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 129 | nb_commits = len(lines) |
| 130 | rolls = nb_commits - len(cleaned_lines) |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 131 | header = 'Roll %s/ %s (%d commit%s%s)\n\n' % ( |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 132 | dependency, |
Sylvain Defresne | ae2b962 | 2020-01-31 09:46:06 +0000 | [diff] [blame] | 133 | commit_range_for_header, |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 134 | nb_commits, |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 135 | 's' if nb_commits > 1 else '', |
| 136 | ('; %s trivial rolls' % rolls) if rolls else '') |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 137 | log_section = '' |
| 138 | if log_url: |
| 139 | log_section = log_url + '\n\n' |
johannkoenig@google.com | 64f2fc3 | 2015-10-07 19:11:17 +0000 | [diff] [blame] | 140 | log_section += '$ %s ' % ' '.join(cmd) |
| 141 | log_section += '--format=\'%ad %ae %s\'\n' |
Sylvain Defresne | 4ada8ab | 2020-01-31 17:22:56 +0000 | [diff] [blame] | 142 | log_section = log_section.replace(commit_range, commit_range_for_header) |
Eric Boren | 3be96a8 | 2017-09-29 10:07:46 -0400 | [diff] [blame] | 143 | # It is important that --no-log continues to work, as it is used by |
| 144 | # internal -> external rollers. Please do not remove or break it. |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 145 | if not no_log and should_show_log(upstream_url): |
Marc-Antoine Ruel | 51104fe | 2017-03-01 17:57:41 -0500 | [diff] [blame] | 146 | if len(cleaned_lines) > log_limit: |
Marc-Antoine Ruel | 6ce1822 | 2019-01-16 21:36:36 +0000 | [diff] [blame] | 147 | # Keep the first N/2 log entries and last N/2 entries. |
| 148 | lines = logs.splitlines(True) |
Edward Lesmes | 994bed5 | 2020-04-01 16:21:40 +0000 | [diff] [blame] | 149 | lines = lines[:log_limit//2] + ['(...)\n'] + lines[-log_limit//2:] |
Marc-Antoine Ruel | 6ce1822 | 2019-01-16 21:36:36 +0000 | [diff] [blame] | 150 | logs = ''.join(lines) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 151 | log_section += logs |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 152 | return header + log_section |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 153 | |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 154 | |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 155 | def calculate_roll(full_dir, dependency, roll_to): |
Edward Lesmes | c772cf7 | 2018-04-03 14:47:30 -0400 | [diff] [blame] | 156 | """Calculates the roll for a dependency by processing gclient_dict, and |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 157 | fetching the dependency via git. |
| 158 | """ |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 159 | head = gclient(['getdep', '-r', dependency]) |
Edward Lesmes | c772cf7 | 2018-04-03 14:47:30 -0400 | [diff] [blame] | 160 | if not head: |
| 161 | raise Error('%s is unpinned.' % dependency) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 162 | check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir) |
Josip Sokcevic | 69902d0 | 2021-02-02 21:57:55 +0000 | [diff] [blame] | 163 | if roll_to == 'origin/HEAD': |
| 164 | check_output(['git', 'remote', 'set-head', 'origin', '-a'], cwd=full_dir) |
| 165 | |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 166 | roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip() |
| 167 | return head, roll_to |
| 168 | |
| 169 | |
Josip Sokcevic | 69902d0 | 2021-02-02 21:57:55 +0000 | [diff] [blame] | 170 | |
Robert Iannucci | c1e6594 | 2018-10-18 17:59:45 +0000 | [diff] [blame] | 171 | def gen_commit_msg(logs, cmdline, reviewers, bug): |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 172 | """Returns the final commit message.""" |
| 173 | commit_msg = '' |
| 174 | if len(logs) > 1: |
| 175 | commit_msg = 'Rolling %d dependencies\n\n' % len(logs) |
| 176 | commit_msg += '\n\n'.join(logs) |
Kenneth Russell | ebe839b | 2017-12-22 14:55:39 -0800 | [diff] [blame] | 177 | commit_msg += '\nCreated with:\n ' + cmdline + '\n' |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 178 | commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else '' |
Robert Iannucci | c1e6594 | 2018-10-18 17:59:45 +0000 | [diff] [blame] | 179 | commit_msg += '\nBug: %s\n' % bug if bug else '' |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 180 | return commit_msg |
| 181 | |
| 182 | |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 183 | def finalize(commit_msg, current_dir, rolls): |
| 184 | """Commits changes to the DEPS file, then uploads a CL.""" |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 185 | print('Commit message:') |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 186 | print('\n'.join(' ' + i for i in commit_msg.splitlines())) |
| 187 | |
Edward Lesmes | 3f277fc | 2018-04-06 15:32:51 -0400 | [diff] [blame] | 188 | check_call(['git', 'add', 'DEPS'], cwd=current_dir) |
| 189 | check_call(['git', 'commit', '--quiet', '-m', commit_msg], cwd=current_dir) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 190 | |
| 191 | # Pull the dependency to the right revision. This is surprising to users |
| 192 | # otherwise. |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 193 | for _head, roll_to, full_dir in sorted(rolls.values()): |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 194 | check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir) |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 195 | |
| 196 | |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 197 | def main(): |
sbc@chromium.org | 30e5b23 | 2015-06-01 18:06:59 +0000 | [diff] [blame] | 198 | parser = argparse.ArgumentParser(description=__doc__) |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 199 | parser.add_argument( |
smut@google.com | 02d2087 | 2015-11-14 00:46:41 +0000 | [diff] [blame] | 200 | '--ignore-dirty-tree', action='store_true', |
| 201 | help='Roll anyways, even if there is a diff.') |
| 202 | parser.add_argument( |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 203 | '-r', '--reviewer', |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 204 | help='To specify multiple reviewers, use comma separated list, e.g. ' |
scottmg@chromium.org | c20f470 | 2015-05-23 00:44:46 +0000 | [diff] [blame] | 205 | '-r joe,jane,john. Defaults to @chromium.org') |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 206 | parser.add_argument('-b', '--bug', help='Associate a bug number to the roll') |
Eric Boren | 3be96a8 | 2017-09-29 10:07:46 -0400 | [diff] [blame] | 207 | # It is important that --no-log continues to work, as it is used by |
| 208 | # internal -> external rollers. Please do not remove or break it. |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 209 | parser.add_argument( |
| 210 | '--no-log', action='store_true', |
| 211 | help='Do not include the short log in the commit message') |
| 212 | parser.add_argument( |
| 213 | '--log-limit', type=int, default=100, |
| 214 | help='Trim log after N commits (default: %(default)s)') |
| 215 | parser.add_argument( |
Josip Sokcevic | 69902d0 | 2021-02-02 21:57:55 +0000 | [diff] [blame] | 216 | '--roll-to', default='origin/HEAD', |
maruel@chromium.org | 398ed34 | 2015-09-29 12:27:25 +0000 | [diff] [blame] | 217 | help='Specify the new commit to roll to (default: %(default)s)') |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 218 | parser.add_argument( |
| 219 | '--key', action='append', default=[], |
| 220 | help='Regex(es) for dependency in DEPS file') |
| 221 | parser.add_argument('dep_path', nargs='+', help='Path(s) to dependency') |
sbc@chromium.org | 30e5b23 | 2015-06-01 18:06:59 +0000 | [diff] [blame] | 222 | args = parser.parse_args() |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 223 | |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 224 | if len(args.dep_path) > 1: |
Josip Sokcevic | 69902d0 | 2021-02-02 21:57:55 +0000 | [diff] [blame] | 225 | if args.roll_to != 'origin/HEAD': |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 226 | parser.error( |
| 227 | 'Can\'t use multiple paths to roll simultaneously and --roll-to') |
| 228 | if args.key: |
| 229 | parser.error( |
| 230 | 'Can\'t use multiple paths to roll simultaneously and --key') |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 231 | reviewers = None |
sbc@chromium.org | 30e5b23 | 2015-06-01 18:06:59 +0000 | [diff] [blame] | 232 | if args.reviewer: |
| 233 | reviewers = args.reviewer.split(',') |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 234 | for i, r in enumerate(reviewers): |
| 235 | if not '@' in r: |
| 236 | reviewers[i] = r + '@chromium.org' |
| 237 | |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 238 | gclient_root = gclient(['root']) |
Edward Lesmes | 3f277fc | 2018-04-06 15:32:51 -0400 | [diff] [blame] | 239 | current_dir = os.getcwd() |
Bruce Dawson | 37b62e5 | 2020-06-23 18:06:00 +0000 | [diff] [blame] | 240 | dependencies = sorted(d.replace('\\', '/').rstrip('/') for d in args.dep_path) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 241 | cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join( |
| 242 | ' --key ' + k for k in args.key) |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 243 | try: |
Edward Lesmes | 3f277fc | 2018-04-06 15:32:51 -0400 | [diff] [blame] | 244 | if not args.ignore_dirty_tree and not is_pristine(current_dir): |
| 245 | raise Error( |
| 246 | 'Ensure %s is clean first (no non-merged commits).' % current_dir) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 247 | # First gather all the information without modifying anything, except for a |
| 248 | # git fetch. |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 249 | rolls = {} |
| 250 | for dependency in dependencies: |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 251 | full_dir = os.path.normpath(os.path.join(gclient_root, dependency)) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 252 | if not os.path.isdir(full_dir): |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 253 | print('Dependency %s not found at %s' % (dependency, full_dir)) |
| 254 | full_dir = os.path.normpath(os.path.join(current_dir, dependency)) |
| 255 | print('Will look for relative dependency at %s' % full_dir) |
| 256 | if not os.path.isdir(full_dir): |
| 257 | raise Error('Directory not found: %s (%s)' % (dependency, full_dir)) |
| 258 | |
| 259 | head, roll_to = calculate_roll(full_dir, dependency, args.roll_to) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 260 | if roll_to == head: |
| 261 | if len(dependencies) == 1: |
| 262 | raise AlreadyRolledError('No revision to roll!') |
| 263 | print('%s: Already at latest commit %s' % (dependency, roll_to)) |
| 264 | else: |
| 265 | print( |
| 266 | '%s: Rolling from %s to %s' % (dependency, head[:10], roll_to[:10])) |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 267 | rolls[dependency] = (head, roll_to, full_dir) |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 268 | |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 269 | logs = [] |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 270 | setdep_args = [] |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 271 | for dependency, (head, roll_to, full_dir) in sorted(rolls.items()): |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 272 | log = generate_commit_message( |
| 273 | full_dir, dependency, head, roll_to, args.no_log, args.log_limit) |
| 274 | logs.append(log) |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 275 | setdep_args.extend(['-r', '{}@{}'.format(dependency, roll_to)]) |
Edward Lesmes | c772cf7 | 2018-04-03 14:47:30 -0400 | [diff] [blame] | 276 | |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 277 | gclient(['setdep'] + setdep_args) |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 278 | |
Robert Iannucci | c1e6594 | 2018-10-18 17:59:45 +0000 | [diff] [blame] | 279 | commit_msg = gen_commit_msg(logs, cmdline, reviewers, args.bug) |
Edward Lemur | faae42e | 2018-11-26 18:34:30 +0000 | [diff] [blame] | 280 | finalize(commit_msg, current_dir, rolls) |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 281 | except Error as e: |
| 282 | sys.stderr.write('error: %s\n' % e) |
smut | 7036c4f | 2016-06-09 14:28:48 -0700 | [diff] [blame] | 283 | return 2 if isinstance(e, AlreadyRolledError) else 1 |
Corentin Wallez | 8732c0e | 2020-12-09 17:43:46 +0000 | [diff] [blame] | 284 | except subprocess2.CalledProcessError: |
Edward Lemur | 3c11794 | 2020-03-12 17:21:12 +0000 | [diff] [blame] | 285 | return 1 |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 286 | |
Marc-Antoine Ruel | 85a8c10 | 2017-12-12 15:42:25 -0500 | [diff] [blame] | 287 | print('') |
| 288 | if not reviewers: |
| 289 | print('You forgot to pass -r, make sure to insert a R=foo@example.com line') |
| 290 | print('to the commit description before emailing.') |
| 291 | print('') |
| 292 | print('Run:') |
| 293 | print(' git cl upload --send-mail') |
sbc@chromium.org | e5d984b | 2015-05-29 22:09:39 +0000 | [diff] [blame] | 294 | return 0 |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 295 | |
sbc@chromium.org | 9820112 | 2015-04-22 20:21:34 +0000 | [diff] [blame] | 296 | |
szager@chromium.org | 03fd85b | 2014-06-09 23:43:33 +0000 | [diff] [blame] | 297 | if __name__ == '__main__': |
maruel@chromium.org | 9655094 | 2015-05-22 18:46:51 +0000 | [diff] [blame] | 298 | sys.exit(main()) |