blob: 89f1864bdc9b197bb7b8184d5d54463747538bb5 [file] [log] [blame]
szager@chromium.org03fd85b2014-06-09 23:43:33 +00001#!/usr/bin/env python
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
sbc@chromium.org30e5b232015-06-01 18:06:59 +00008Works only with git checkout and git dependencies. Currently this
9script will always roll to the tip of to origin/master.
szager@chromium.org03fd85b2014-06-09 23:43:33 +000010"""
11
sbc@chromium.org30e5b232015-06-01 18:06:59 +000012import argparse
Edward Lesmesa1df57c2018-04-03 20:00:07 -040013import collections
Edward Lesmesc772cf72018-04-03 14:47:30 -040014import gclient_eval
szager@chromium.org03fd85b2014-06-09 23:43:33 +000015import os
16import re
maruel@chromium.org96550942015-05-22 18:46:51 +000017import subprocess
szager@chromium.org03fd85b2014-06-09 23:43:33 +000018import sys
19
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000020NEED_SHELL = sys.platform.startswith('win')
21
22
sbc@chromium.orge5d984b2015-05-29 22:09:39 +000023class Error(Exception):
24 pass
25
26
smut7036c4f2016-06-09 14:28:48 -070027class AlreadyRolledError(Error):
28 pass
29
30
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000031def check_output(*args, **kwargs):
32 """subprocess.check_output() passing shell=True on Windows for git."""
33 kwargs.setdefault('shell', NEED_SHELL)
34 return subprocess.check_output(*args, **kwargs)
35
36
37def check_call(*args, **kwargs):
38 """subprocess.check_call() passing shell=True on Windows for git."""
39 kwargs.setdefault('shell', NEED_SHELL)
40 subprocess.check_call(*args, **kwargs)
41
42
maruel@chromium.org96550942015-05-22 18:46:51 +000043def is_pristine(root, merge_base='origin/master'):
44 """Returns True if a git checkout is pristine."""
45 cmd = ['git', 'diff', '--ignore-submodules', merge_base]
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +000046 return not (check_output(cmd, cwd=root).strip() or
47 check_output(cmd + ['--cached'], cwd=root).strip())
szager@chromium.org03fd85b2014-06-09 23:43:33 +000048
49
maruel@chromium.org398ed342015-09-29 12:27:25 +000050def get_log_url(upstream_url, head, master):
51 """Returns an URL to read logs via a Web UI if applicable."""
52 if re.match(r'https://[^/]*\.googlesource\.com/', upstream_url):
53 # gitiles
54 return '%s/+log/%s..%s' % (upstream_url, head[:12], master[:12])
55 if upstream_url.startswith('https://github.com/'):
56 upstream_url = upstream_url.rstrip('/')
57 if upstream_url.endswith('.git'):
58 upstream_url = upstream_url[:-len('.git')]
59 return '%s/compare/%s...%s' % (upstream_url, head[:12], master[:12])
60 return None
61
62
63def should_show_log(upstream_url):
64 """Returns True if a short log should be included in the tree."""
65 # Skip logs for very active projects.
Eric Boren07efc5a2017-08-28 09:13:20 -040066 if upstream_url.endswith('/v8/v8.git'):
maruel@chromium.org398ed342015-09-29 12:27:25 +000067 return False
68 if 'webrtc' in upstream_url:
69 return False
70 return True
71
72
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -050073def get_deps(root):
74 """Returns the path and the content of the DEPS file."""
75 deps_path = os.path.join(root, 'DEPS')
szager@chromium.org03fd85b2014-06-09 23:43:33 +000076 try:
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -050077 with open(deps_path, 'rb') as f:
maruel@chromium.org96550942015-05-22 18:46:51 +000078 deps_content = f.read()
maruel@chromium.orga7a229f2015-05-22 21:34:46 +000079 except (IOError, OSError):
sbc@chromium.orge5d984b2015-05-29 22:09:39 +000080 raise Error('Ensure the script is run in the directory '
81 'containing DEPS file.')
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -050082 return deps_path, deps_content
sbc@chromium.org98201122015-04-22 20:21:34 +000083
maruel@chromium.org96550942015-05-22 18:46:51 +000084
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -050085def generate_commit_message(
86 full_dir, dependency, head, roll_to, no_log, log_limit):
87 """Creates the commit message for this specific roll."""
maruel@chromium.org398ed342015-09-29 12:27:25 +000088 commit_range = '%s..%s' % (head[:9], roll_to[:9])
maruel@chromium.org398ed342015-09-29 12:27:25 +000089 upstream_url = check_output(
90 ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
91 log_url = get_log_url(upstream_url, head, roll_to)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -050092 cmd = ['git', 'log', commit_range, '--date=short', '--no-merges']
maruel@chromium.orgc6e39fe2015-09-23 13:45:52 +000093 logs = check_output(
johannkoenig@google.com64f2fc32015-10-07 19:11:17 +000094 cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -050095 cwd=full_dir).rstrip()
maruel@chromium.orgc6e39fe2015-09-23 13:45:52 +000096 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 -050097 lines = logs.splitlines()
98 cleaned_lines = [
99 l for l in lines
100 if not l.endswith('recipe-roller Roll recipe dependencies (trivial).')
101 ]
102 logs = '\n'.join(cleaned_lines) + '\n'
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500103
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500104 nb_commits = len(lines)
105 rolls = nb_commits - len(cleaned_lines)
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500106 header = 'Roll %s/ %s (%d commit%s%s)\n\n' % (
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500107 dependency,
maruel@chromium.org398ed342015-09-29 12:27:25 +0000108 commit_range,
109 nb_commits,
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500110 's' if nb_commits > 1 else '',
111 ('; %s trivial rolls' % rolls) if rolls else '')
maruel@chromium.org398ed342015-09-29 12:27:25 +0000112 log_section = ''
113 if log_url:
114 log_section = log_url + '\n\n'
johannkoenig@google.com64f2fc32015-10-07 19:11:17 +0000115 log_section += '$ %s ' % ' '.join(cmd)
116 log_section += '--format=\'%ad %ae %s\'\n'
Eric Boren3be96a82017-09-29 10:07:46 -0400117 # It is important that --no-log continues to work, as it is used by
118 # internal -> external rollers. Please do not remove or break it.
maruel@chromium.org398ed342015-09-29 12:27:25 +0000119 if not no_log and should_show_log(upstream_url):
Marc-Antoine Ruel51104fe2017-03-01 17:57:41 -0500120 if len(cleaned_lines) > log_limit:
maruel@chromium.org398ed342015-09-29 12:27:25 +0000121 # Keep the first N log entries.
122 logs = ''.join(logs.splitlines(True)[:log_limit]) + '(...)\n'
123 log_section += logs
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500124 return header + log_section
maruel@chromium.org398ed342015-09-29 12:27:25 +0000125
maruel@chromium.org96550942015-05-22 18:46:51 +0000126
Edward Lesmesc772cf72018-04-03 14:47:30 -0400127def calculate_roll(full_dir, dependency, gclient_dict, roll_to):
128 """Calculates the roll for a dependency by processing gclient_dict, and
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500129 fetching the dependency via git.
130 """
Edward Lesmesa1df57c2018-04-03 20:00:07 -0400131 if dependency not in gclient_dict['deps']:
132 raise Error('%s is not in the "deps" section of the DEPS file.')
133
134 head = None
135 if isinstance(gclient_dict['deps'][dependency], basestring):
136 _, _, head = gclient_dict['deps'][dependency].partition('@')
137 elif (isinstance(gclient_dict['deps'][dependency], collections.Mapping)
138 and 'url' in gclient_dict['deps'][dependency]):
139 _, _, head = gclient_dict['deps'][dependency]['url'].partition('@')
140 else:
141 raise Error('%s is not a valid git dependency.')
142
Edward Lesmesc772cf72018-04-03 14:47:30 -0400143 if not head:
144 raise Error('%s is unpinned.' % dependency)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500145 check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
146 roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip()
147 return head, roll_to
148
149
150def gen_commit_msg(logs, cmdline, rolls, reviewers, bug):
151 """Returns the final commit message."""
152 commit_msg = ''
153 if len(logs) > 1:
154 commit_msg = 'Rolling %d dependencies\n\n' % len(logs)
155 commit_msg += '\n\n'.join(logs)
Kenneth Russellebe839b2017-12-22 14:55:39 -0800156 commit_msg += '\nCreated with:\n ' + cmdline + '\n'
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500157 commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else ''
158 commit_msg += 'BUG=%s\n' % bug if bug else ''
159 return commit_msg
160
161
Eric Boren0eb39562018-04-05 11:34:09 -0400162def get_full_dir(root, dependency, is_relative):
163 """Return the full path to the dependency."""
164 root_dir = root
165 if not is_relative:
166 root_dir = os.path.dirname(root_dir)
167 return os.path.normpath(os.path.join(root_dir, dependency))
168
169
170def finalize(commit_msg, deps_path, deps_content, rolls, is_relative):
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500171 """Edits the DEPS file, commits it, then uploads a CL."""
maruel@chromium.org96550942015-05-22 18:46:51 +0000172 print('Commit message:')
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500173 print('\n'.join(' ' + i for i in commit_msg.splitlines()))
174
175 with open(deps_path, 'wb') as f:
maruel@chromium.org96550942015-05-22 18:46:51 +0000176 f.write(deps_content)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500177 root = os.path.dirname(deps_path)
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +0000178 check_call(['git', 'add', 'DEPS'], cwd=root)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500179 check_call(['git', 'commit', '--quiet', '-m', commit_msg], cwd=root)
maruel@chromium.org398ed342015-09-29 12:27:25 +0000180
181 # Pull the dependency to the right revision. This is surprising to users
182 # otherwise.
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500183 for dependency, (_head, roll_to) in sorted(rolls.iteritems()):
Eric Boren0eb39562018-04-05 11:34:09 -0400184 full_dir = get_full_dir(root, dependency, is_relative)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500185 check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000186
187
maruel@chromium.org96550942015-05-22 18:46:51 +0000188def main():
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000189 parser = argparse.ArgumentParser(description=__doc__)
maruel@chromium.org398ed342015-09-29 12:27:25 +0000190 parser.add_argument(
smut@google.com02d20872015-11-14 00:46:41 +0000191 '--ignore-dirty-tree', action='store_true',
192 help='Roll anyways, even if there is a diff.')
193 parser.add_argument(
maruel@chromium.org398ed342015-09-29 12:27:25 +0000194 '-r', '--reviewer',
maruel@chromium.org96550942015-05-22 18:46:51 +0000195 help='To specify multiple reviewers, use comma separated list, e.g. '
scottmg@chromium.orgc20f4702015-05-23 00:44:46 +0000196 '-r joe,jane,john. Defaults to @chromium.org')
maruel@chromium.org398ed342015-09-29 12:27:25 +0000197 parser.add_argument('-b', '--bug', help='Associate a bug number to the roll')
Eric Boren3be96a82017-09-29 10:07:46 -0400198 # It is important that --no-log continues to work, as it is used by
199 # internal -> external rollers. Please do not remove or break it.
maruel@chromium.org398ed342015-09-29 12:27:25 +0000200 parser.add_argument(
201 '--no-log', action='store_true',
202 help='Do not include the short log in the commit message')
203 parser.add_argument(
204 '--log-limit', type=int, default=100,
205 help='Trim log after N commits (default: %(default)s)')
206 parser.add_argument(
207 '--roll-to', default='origin/master',
208 help='Specify the new commit to roll to (default: %(default)s)')
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500209 parser.add_argument(
210 '--key', action='append', default=[],
211 help='Regex(es) for dependency in DEPS file')
212 parser.add_argument('dep_path', nargs='+', help='Path(s) to dependency')
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000213 args = parser.parse_args()
maruel@chromium.org96550942015-05-22 18:46:51 +0000214
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500215 if len(args.dep_path) > 1:
216 if args.roll_to != 'origin/master':
217 parser.error(
218 'Can\'t use multiple paths to roll simultaneously and --roll-to')
219 if args.key:
220 parser.error(
221 'Can\'t use multiple paths to roll simultaneously and --key')
maruel@chromium.org96550942015-05-22 18:46:51 +0000222 reviewers = None
sbc@chromium.org30e5b232015-06-01 18:06:59 +0000223 if args.reviewer:
224 reviewers = args.reviewer.split(',')
maruel@chromium.org96550942015-05-22 18:46:51 +0000225 for i, r in enumerate(reviewers):
226 if not '@' in r:
227 reviewers[i] = r + '@chromium.org'
228
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500229 root = os.getcwd()
230 dependencies = sorted(d.rstrip('/').rstrip('\\') for d in args.dep_path)
231 cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join(
232 ' --key ' + k for k in args.key)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000233 try:
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500234 if not args.ignore_dirty_tree and not is_pristine(root):
235 raise Error('Ensure %s is clean first (no non-merged commits).' % root)
236 # First gather all the information without modifying anything, except for a
237 # git fetch.
238 deps_path, deps_content = get_deps(root)
Edward Lesmesc772cf72018-04-03 14:47:30 -0400239 gclient_dict = gclient_eval.Parse(deps_content, True, True, deps_path)
Eric Boren0eb39562018-04-05 11:34:09 -0400240 is_relative = gclient_dict.get('use_relative_paths', False)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500241 rolls = {}
242 for dependency in dependencies:
Eric Boren0eb39562018-04-05 11:34:09 -0400243 full_dir = get_full_dir(root, dependency, is_relative)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500244 if not os.path.isdir(full_dir):
245 raise Error('Directory not found: %s (%s)' % (dependency, full_dir))
246 head, roll_to = calculate_roll(
Edward Lesmesc772cf72018-04-03 14:47:30 -0400247 full_dir, dependency, gclient_dict, args.roll_to)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500248 if roll_to == head:
249 if len(dependencies) == 1:
250 raise AlreadyRolledError('No revision to roll!')
251 print('%s: Already at latest commit %s' % (dependency, roll_to))
252 else:
253 print(
254 '%s: Rolling from %s to %s' % (dependency, head[:10], roll_to[:10]))
255 rolls[dependency] = (head, roll_to)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000256
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500257 logs = []
258 for dependency, (head, roll_to) in sorted(rolls.iteritems()):
Eric Boren0eb39562018-04-05 11:34:09 -0400259 full_dir = get_full_dir(root, dependency, is_relative)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500260 log = generate_commit_message(
261 full_dir, dependency, head, roll_to, args.no_log, args.log_limit)
262 logs.append(log)
Edward Lesmesc772cf72018-04-03 14:47:30 -0400263 gclient_eval.SetRevision(gclient_dict, dependency, roll_to)
264
265 deps_content = gclient_eval.RenderDEPSFile(gclient_dict)
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500266
267 commit_msg = gen_commit_msg(logs, cmdline, rolls, reviewers, args.bug)
Eric Boren0eb39562018-04-05 11:34:09 -0400268 finalize(commit_msg, deps_path, deps_content, rolls, is_relative)
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000269 except Error as e:
270 sys.stderr.write('error: %s\n' % e)
smut7036c4f2016-06-09 14:28:48 -0700271 return 2 if isinstance(e, AlreadyRolledError) else 1
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000272
Marc-Antoine Ruel85a8c102017-12-12 15:42:25 -0500273 print('')
274 if not reviewers:
275 print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
276 print('to the commit description before emailing.')
277 print('')
278 print('Run:')
279 print(' git cl upload --send-mail')
sbc@chromium.orge5d984b2015-05-29 22:09:39 +0000280 return 0
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000281
sbc@chromium.org98201122015-04-22 20:21:34 +0000282
szager@chromium.org03fd85b2014-06-09 23:43:33 +0000283if __name__ == '__main__':
maruel@chromium.org96550942015-05-22 18:46:51 +0000284 sys.exit(main())