blob: a83497f33c3fa7d0968011d020f110a2a3aba5f8 [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env python3
maruel@chromium.org96550942015-05-22 18:46:51 +00002# Copyright 2015 The Chromium Authors. All rights reserved.
szager@chromium.org03fd85b2014-06-09 23:43:33 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
maruel@chromium.org96550942015-05-22 18:46:51 +00006"""Rolls DEPS controlled dependency.
szager@chromium.org03fd85b2014-06-09 23:43:33 +00007
Josip Sokcevicc1a06c12022-01-12 00:44:14 +00008Works only with git checkout and git dependencies. Currently this script will
9always roll to the tip of to origin/main.
szager@chromium.org03fd85b2014-06-09 23:43:33 +000010"""
11
Raul Tambre80ee78e2019-05-06 22:41:05 +000012from __future__ import print_function
13
sbc@chromium.org30e5b232015-06-01 18:06:59 +000014import argparse
Thiago Perrottaa0892812022-09-03 11:22:46 +000015import itertools
szager@chromium.org03fd85b2014-06-09 23:43:33 +000016import os
17import re
Corentin Wallez5157fbf2020-11-12 22:31:35 +000018import subprocess2
szager@chromium.org03fd85b2014-06-09 23:43:33 +000019import sys
Bruce Dawson03af44a2022-12-27 19:37:58 +000020import tempfile
szager@chromium.org03fd85b2014-06-09 23:43:33 +000021
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000022NEED_SHELL = sys.platform.startswith('win')
Edward Lemurfaae42e2018-11-26 18:34:30 +000023GCLIENT_PATH = os.path.join(
24 os.path.dirname(os.path.abspath(__file__)), 'gclient.py')
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000025
26
Marc-Antoine Ruel1e2cb152019-04-17 17:32:52 +000027# Commit subject that will be considered a roll. In the format generated by the
28# git log used, so it's "<year>-<month>-<day> <author> <subject>"
29_ROLL_SUBJECT = re.compile(
30 # Date
31 r'^\d\d\d\d-\d\d-\d\d '
32 # Author
33 r'[^ ]+ '
34 # Subject
35 r'('
36 # Generated by
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000037 # https://skia.googlesource.com/buildbot/+/HEAdA/autoroll/go/repo_manager/deps_repo_manager.go
Marc-Antoine Ruel1e2cb152019-04-17 17:32:52 +000038 r'Roll [^ ]+ [a-f0-9]+\.\.[a-f0-9]+ \(\d+ commits\)'
39 r'|'
40 # Generated by
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000041 # https://chromium.googlesource.com/infra/infra/+/HEAD/recipes/recipe_modules/recipe_autoroller/api.py
Marc-Antoine Ruel1e2cb152019-04-17 17:32:52 +000042 r'Roll recipe dependencies \(trivial\)\.'
43 r')$')
44
45
sbc@chromium.orge5d984b2015-05-29 22:09:39 +000046class Error(Exception):
47 pass
48
49
smut7036c4f2016-06-09 14:28:48 -070050class AlreadyRolledError(Error):
51 pass
52
53
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000054def check_output(*args, **kwargs):
Corentin Wallez8732c0e2020-12-09 17:43:46 +000055 """subprocess2.check_output() passing shell=True on Windows for git."""
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000056 kwargs.setdefault('shell', NEED_SHELL)
Corentin Wallez5157fbf2020-11-12 22:31:35 +000057 return subprocess2.check_output(*args, **kwargs).decode('utf-8')
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000058
59
60def check_call(*args, **kwargs):
Corentin Wallez8732c0e2020-12-09 17:43:46 +000061 """subprocess2.check_call() passing shell=True on Windows for git."""
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000062 kwargs.setdefault('shell', NEED_SHELL)
Corentin Wallez5157fbf2020-11-12 22:31:35 +000063 subprocess2.check_call(*args, **kwargs)
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000064
65
Corentin Wallez5157fbf2020-11-12 22:31:35 +000066def return_code(*args, **kwargs):
Corentin Wallez8732c0e2020-12-09 17:43:46 +000067 """subprocess2.call() passing shell=True on Windows for git and
Edward Lesmescf06cad2020-12-14 22:03:23 +000068 subprocess2.DEVNULL for stdout and stderr."""
Corentin Wallez5157fbf2020-11-12 22:31:35 +000069 kwargs.setdefault('shell', NEED_SHELL)
Edward Lesmescf06cad2020-12-14 22:03:23 +000070 kwargs.setdefault('stdout', subprocess2.DEVNULL)
71 kwargs.setdefault('stderr', subprocess2.DEVNULL)
Corentin Wallez5157fbf2020-11-12 22:31:35 +000072 return subprocess2.call(*args, **kwargs)
73
74
75def is_pristine(root):
maruel@chromium.org96550942015-05-22 18:46:51 +000076 """Returns True if a git checkout is pristine."""
Josip Sokcevicc1a06c12022-01-12 00:44:14 +000077 # `git rev-parse --verify` has a non-zero return code if the revision
78 # doesn't exist.
79 diff_cmd = ['git', 'diff', '--ignore-submodules', 'origin/main']
80 return (not check_output(diff_cmd, cwd=root).strip() and
81 not check_output(diff_cmd + ['--cached'], cwd=root).strip())
Corentin Wallez5157fbf2020-11-12 22:31:35 +000082
83
szager@chromium.org03fd85b2014-06-09 23:43:33 +000084
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000085def get_log_url(upstream_url, head, tot):
maruel@chromium.org398ed342015-09-29 12:27:25 +000086 """Returns an URL to read logs via a Web UI if applicable."""
87 if re.match(r'https://[^/]*\.googlesource\.com/', upstream_url):
88 # gitiles
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000089 return '%s/+log/%s..%s' % (upstream_url, head[:12], tot[:12])
maruel@chromium.org398ed342015-09-29 12:27:25 +000090 if upstream_url.startswith('https://github.com/'):
91 upstream_url = upstream_url.rstrip('/')
92 if upstream_url.endswith('.git'):
93 upstream_url = upstream_url[:-len('.git')]
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000094 return '%s/compare/%s...%s' % (upstream_url, head[:12], tot[:12])
maruel@chromium.org398ed342015-09-29 12:27:25 +000095 return None
96
97
98def should_show_log(upstream_url):
99 """Returns True if a short log should be included in the tree."""
100 # Skip logs for very active projects.
Eric Boren07efc5a2017-08-28 09:13:20 -0400101 if upstream_url.endswith('/v8/v8.git'):
maruel@chromium.org398ed342015-09-29 12:27:25 +0000102 return False
103 if 'webrtc' in upstream_url:
104 return False
105 return True
106
107
Edward Lemurfaae42e2018-11-26 18:34:30 +0000108def gclient(args):
109 """Executes gclient with the given args and returns the stdout."""
110 return check_output([sys.executable, GCLIENT_PATH] + args).strip()
sbc@chromium.org98201122015-04-22 20:21:34 +0000111
maruel@chromium.org96550942015-05-22 18:46:51 +0000112
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500113def generate_commit_message(
114 full_dir, dependency, head, roll_to, no_log, log_limit):
115 """Creates the commit message for this specific roll."""
Sylvain Defresneae2b9622020-01-31 09:46:06 +0000116 commit_range = '%s..%s' % (head, roll_to)
117 commit_range_for_header = '%s..%s' % (head[:9], roll_to[:9])
maruel@chromium.org398ed342015-09-29 12:27:25 +0000118 upstream_url = check_output(
119 ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
120 log_url = get_log_url(upstream_url, head, roll_to)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500121 cmd = ['git', 'log', commit_range, '--date=short', '--no-merges']
maruel@chromium.orgc6e39fe2015-09-23 13:45:52 +0000122 logs = check_output(
Sylvain Defresneae2b9622020-01-31 09:46:06 +0000123 # Args with '=' are automatically quoted.
124 cmd + ['--format=%ad %ae %s', '--'],
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500125 cwd=full_dir).rstrip()
maruel@chromium.orgc6e39fe2015-09-23 13:45:52 +0000126 logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500127 lines = logs.splitlines()
Marc-Antoine Ruel1e2cb152019-04-17 17:32:52 +0000128 cleaned_lines = [l for l in lines if not _ROLL_SUBJECT.match(l)]
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500129 logs = '\n'.join(cleaned_lines) + '\n'
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500130
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500131 nb_commits = len(lines)
132 rolls = nb_commits - len(cleaned_lines)
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500133 header = 'Roll %s/ %s (%d commit%s%s)\n\n' % (
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500134 dependency,
Sylvain Defresneae2b9622020-01-31 09:46:06 +0000135 commit_range_for_header,
maruel@chromium.org398ed342015-09-29 12:27:25 +0000136 nb_commits,
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500137 's' if nb_commits > 1 else '',
138 ('; %s trivial rolls' % rolls) if rolls else '')
maruel@chromium.org398ed342015-09-29 12:27:25 +0000139 log_section = ''
140 if log_url:
141 log_section = log_url + '\n\n'
johannkoenig@google.com64f2fc32015-10-07 19:11:17 +0000142 log_section += '$ %s ' % ' '.join(cmd)
143 log_section += '--format=\'%ad %ae %s\'\n'
Sylvain Defresne4ada8ab2020-01-31 17:22:56 +0000144 log_section = log_section.replace(commit_range, commit_range_for_header)
Eric Boren3be96a82017-09-29 10:07:46 -0400145 # It is important that --no-log continues to work, as it is used by
146 # internal -> external rollers. Please do not remove or break it.
maruel@chromium.org398ed342015-09-29 12:27:25 +0000147 if not no_log and should_show_log(upstream_url):
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500148 if len(cleaned_lines) > log_limit:
Marc-Antoine Ruel6ce18222019-01-16 21:36:36 +0000149 # Keep the first N/2 log entries and last N/2 entries.
150 lines = logs.splitlines(True)
Edward Lesmes994bed52020-04-01 16:21:40 +0000151 lines = lines[:log_limit//2] + ['(...)\n'] + lines[-log_limit//2:]
Marc-Antoine Ruel6ce18222019-01-16 21:36:36 +0000152 logs = ''.join(lines)
maruel@chromium.org398ed342015-09-29 12:27:25 +0000153 log_section += logs
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500154 return header + log_section
maruel@chromium.org398ed342015-09-29 12:27:25 +0000155
maruel@chromium.org96550942015-05-22 18:46:51 +0000156
Edward Lemurfaae42e2018-11-26 18:34:30 +0000157def calculate_roll(full_dir, dependency, roll_to):
Edward Lesmesc772cf72018-04-03 14:47:30 -0400158 """Calculates the roll for a dependency by processing gclient_dict, and
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500159 fetching the dependency via git.
160 """
Edward Lemurfaae42e2018-11-26 18:34:30 +0000161 head = gclient(['getdep', '-r', dependency])
Edward Lesmesc772cf72018-04-03 14:47:30 -0400162 if not head:
163 raise Error('%s is unpinned.' % dependency)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500164 check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
Josip Sokcevic69902d02021-02-02 21:57:55 +0000165 if roll_to == 'origin/HEAD':
166 check_output(['git', 'remote', 'set-head', 'origin', '-a'], cwd=full_dir)
167
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500168 roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip()
169 return head, roll_to
170
171
Josip Sokcevic69902d02021-02-02 21:57:55 +0000172
Robert Iannuccic1e65942018-10-18 17:59:45 +0000173def gen_commit_msg(logs, cmdline, reviewers, bug):
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500174 """Returns the final commit message."""
175 commit_msg = ''
176 if len(logs) > 1:
177 commit_msg = 'Rolling %d dependencies\n\n' % len(logs)
178 commit_msg += '\n\n'.join(logs)
Kenneth Russellebe839b2017-12-22 14:55:39 -0800179 commit_msg += '\nCreated with:\n ' + cmdline + '\n'
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500180 commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else ''
Robert Iannuccic1e65942018-10-18 17:59:45 +0000181 commit_msg += '\nBug: %s\n' % bug if bug else ''
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500182 return commit_msg
183
184
Edward Lemurfaae42e2018-11-26 18:34:30 +0000185def finalize(commit_msg, current_dir, rolls):
186 """Commits changes to the DEPS file, then uploads a CL."""
maruel@chromium.org96550942015-05-22 18:46:51 +0000187 print('Commit message:')
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500188 print('\n'.join(' ' + i for i in commit_msg.splitlines()))
189
Edward Lesmes3f277fc2018-04-06 15:32:51 -0400190 check_call(['git', 'add', 'DEPS'], cwd=current_dir)
Bruce Dawson03af44a2022-12-27 19:37:58 +0000191 # We have to set delete=False and then let the object go out of scope so
192 # that the file can be opened by name on Windows.
193 with tempfile.NamedTemporaryFile('w+', newline='', delete=False) as f:
194 commit_filename = f.name
195 f.write(commit_msg)
196 check_call(['git', 'commit', '--quiet', '--file', commit_filename],
197 cwd=current_dir)
198 os.remove(commit_filename)
maruel@chromium.org398ed342015-09-29 12:27:25 +0000199
200 # Pull the dependency to the right revision. This is surprising to users
201 # otherwise.
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000202 for _head, roll_to, full_dir in sorted(rolls.values()):
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500203 check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000204
205
maruel@chromium.org96550942015-05-22 18:46:51 +0000206def main():
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000207 parser = argparse.ArgumentParser(description=__doc__)
maruel@chromium.org398ed342015-09-29 12:27:25 +0000208 parser.add_argument(
smut@google.com02d20872015-11-14 00:46:41 +0000209 '--ignore-dirty-tree', action='store_true',
210 help='Roll anyways, even if there is a diff.')
211 parser.add_argument(
Thiago Perrottaa0892812022-09-03 11:22:46 +0000212 '-r',
213 '--reviewer',
214 action='append',
215 help=
216 'To specify multiple reviewers, either use a comma separated list, e.g. '
217 '-r joe,jane,john or provide the flag multiple times, e.g. '
218 '-r joe -r jane. Defaults to @chromium.org')
maruel@chromium.org398ed342015-09-29 12:27:25 +0000219 parser.add_argument('-b', '--bug', help='Associate a bug number to the roll')
Eric Boren3be96a82017-09-29 10:07:46 -0400220 # It is important that --no-log continues to work, as it is used by
221 # internal -> external rollers. Please do not remove or break it.
maruel@chromium.org398ed342015-09-29 12:27:25 +0000222 parser.add_argument(
223 '--no-log', action='store_true',
224 help='Do not include the short log in the commit message')
225 parser.add_argument(
226 '--log-limit', type=int, default=100,
227 help='Trim log after N commits (default: %(default)s)')
228 parser.add_argument(
Josip Sokcevic69902d02021-02-02 21:57:55 +0000229 '--roll-to', default='origin/HEAD',
maruel@chromium.org398ed342015-09-29 12:27:25 +0000230 help='Specify the new commit to roll to (default: %(default)s)')
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500231 parser.add_argument(
232 '--key', action='append', default=[],
233 help='Regex(es) for dependency in DEPS file')
234 parser.add_argument('dep_path', nargs='+', help='Path(s) to dependency')
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000235 args = parser.parse_args()
maruel@chromium.org96550942015-05-22 18:46:51 +0000236
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500237 if len(args.dep_path) > 1:
Josip Sokcevic69902d02021-02-02 21:57:55 +0000238 if args.roll_to != 'origin/HEAD':
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500239 parser.error(
240 'Can\'t use multiple paths to roll simultaneously and --roll-to')
241 if args.key:
242 parser.error(
243 'Can\'t use multiple paths to roll simultaneously and --key')
maruel@chromium.org96550942015-05-22 18:46:51 +0000244 reviewers = None
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000245 if args.reviewer:
Thiago Perrottaa0892812022-09-03 11:22:46 +0000246 reviewers = list(itertools.chain(*[r.split(',') for r in args.reviewer]))
maruel@chromium.org96550942015-05-22 18:46:51 +0000247 for i, r in enumerate(reviewers):
248 if not '@' in r:
249 reviewers[i] = r + '@chromium.org'
250
Edward Lemurfaae42e2018-11-26 18:34:30 +0000251 gclient_root = gclient(['root'])
Edward Lesmes3f277fc2018-04-06 15:32:51 -0400252 current_dir = os.getcwd()
Bruce Dawson37b62e52020-06-23 18:06:00 +0000253 dependencies = sorted(d.replace('\\', '/').rstrip('/') for d in args.dep_path)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500254 cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join(
255 ' --key ' + k for k in args.key)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000256 try:
Edward Lesmes3f277fc2018-04-06 15:32:51 -0400257 if not args.ignore_dirty_tree and not is_pristine(current_dir):
258 raise Error(
259 'Ensure %s is clean first (no non-merged commits).' % current_dir)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500260 # First gather all the information without modifying anything, except for a
261 # git fetch.
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500262 rolls = {}
263 for dependency in dependencies:
Edward Lemurfaae42e2018-11-26 18:34:30 +0000264 full_dir = os.path.normpath(os.path.join(gclient_root, dependency))
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500265 if not os.path.isdir(full_dir):
Edward Lemurfaae42e2018-11-26 18:34:30 +0000266 print('Dependency %s not found at %s' % (dependency, full_dir))
267 full_dir = os.path.normpath(os.path.join(current_dir, dependency))
268 print('Will look for relative dependency at %s' % full_dir)
269 if not os.path.isdir(full_dir):
270 raise Error('Directory not found: %s (%s)' % (dependency, full_dir))
271
272 head, roll_to = calculate_roll(full_dir, dependency, args.roll_to)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500273 if roll_to == head:
274 if len(dependencies) == 1:
275 raise AlreadyRolledError('No revision to roll!')
276 print('%s: Already at latest commit %s' % (dependency, roll_to))
277 else:
278 print(
279 '%s: Rolling from %s to %s' % (dependency, head[:10], roll_to[:10]))
Edward Lemurfaae42e2018-11-26 18:34:30 +0000280 rolls[dependency] = (head, roll_to, full_dir)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000281
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500282 logs = []
Edward Lemurfaae42e2018-11-26 18:34:30 +0000283 setdep_args = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for dependency, (head, roll_to, full_dir) in sorted(rolls.items()):
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500285 log = generate_commit_message(
286 full_dir, dependency, head, roll_to, args.no_log, args.log_limit)
287 logs.append(log)
Edward Lemurfaae42e2018-11-26 18:34:30 +0000288 setdep_args.extend(['-r', '{}@{}'.format(dependency, roll_to)])
Edward Lesmesc772cf72018-04-03 14:47:30 -0400289
Edward Lemurfaae42e2018-11-26 18:34:30 +0000290 gclient(['setdep'] + setdep_args)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500291
Robert Iannuccic1e65942018-10-18 17:59:45 +0000292 commit_msg = gen_commit_msg(logs, cmdline, reviewers, args.bug)
Edward Lemurfaae42e2018-11-26 18:34:30 +0000293 finalize(commit_msg, current_dir, rolls)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000294 except Error as e:
295 sys.stderr.write('error: %s\n' % e)
smut7036c4f2016-06-09 14:28:48 -0700296 return 2 if isinstance(e, AlreadyRolledError) else 1
Corentin Wallez8732c0e2020-12-09 17:43:46 +0000297 except subprocess2.CalledProcessError:
Edward Lemur3c117942020-03-12 17:21:12 +0000298 return 1
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000299
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500300 print('')
301 if not reviewers:
302 print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
303 print('to the commit description before emailing.')
304 print('')
305 print('Run:')
306 print(' git cl upload --send-mail')
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000307 return 0
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000308
sbc@chromium.org98201122015-04-22 20:21:34 +0000309
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000310if __name__ == '__main__':
maruel@chromium.org96550942015-05-22 18:46:51 +0000311 sys.exit(main())