Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 1 | #!/usr/bin/env python |
| 2 | # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 | # |
| 4 | # Use of this source code is governed by a BSD-style license |
| 5 | # that can be found in the LICENSE file in the root of the source |
| 6 | # tree. An additional intellectual property rights grant can be found |
| 7 | # in the file PATENTS. All contributing project authors may |
| 8 | # be found in the AUTHORS file in the root of the source tree. |
| 9 | |
Henrik Kjellander | 24db179 | 2016-12-15 10:20:10 +0100 | [diff] [blame] | 10 | """Script to automatically roll dependencies in the WebRTC DEPS file.""" |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 11 | |
| 12 | import argparse |
| 13 | import base64 |
| 14 | import collections |
| 15 | import logging |
| 16 | import os |
| 17 | import re |
| 18 | import subprocess |
| 19 | import sys |
| 20 | import urllib |
| 21 | |
| 22 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 23 | # Skip these dependencies (list without solution name prefix). |
| 24 | DONT_AUTOROLL_THESE = [ |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 25 | 'src/third_party/winsdk_samples', |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 26 | 'src/examples/androidtests/third_party/gradle', |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 27 | ] |
| 28 | |
ehmaldonado | 4d46a5e | 2017-08-10 15:32:02 -0700 | [diff] [blame] | 29 | # Run these CQ trybots in addition to the default ones in infra/config/cq.cfg. |
| 30 | EXTRA_TRYBOTS = ( |
| 31 | 'master.internal.tryserver.corp.webrtc:linux_internal' |
| 32 | ) |
| 33 | |
Aaron Gable | 2db9c28 | 2017-09-13 11:59:45 -0700 | [diff] [blame] | 34 | WEBRTC_URL = 'https://webrtc.googlesource.com/src' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 35 | CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src' |
| 36 | CHROMIUM_COMMIT_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s' |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 37 | CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 38 | CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s' |
| 39 | |
| 40 | COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$') |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 41 | CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'(\d+)\'$') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 42 | ROLL_BRANCH_NAME = 'roll_chromium_revision' |
| 43 | |
| 44 | SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 45 | CHECKOUT_SRC_DIR = os.path.realpath(os.path.join(SCRIPT_DIR, os.pardir, |
| 46 | os.pardir)) |
| 47 | CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(CHECKOUT_SRC_DIR, os.pardir)) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 48 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 49 | sys.path.append(os.path.join(CHECKOUT_SRC_DIR, 'build')) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 50 | import find_depot_tools |
| 51 | find_depot_tools.add_depot_tools_to_path() |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 52 | |
kjellander | 917ba52 | 2015-12-03 00:00:07 -0800 | [diff] [blame] | 53 | CLANG_UPDATE_SCRIPT_URL_PATH = 'tools/clang/scripts/update.py' |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 54 | CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools', |
| 55 | 'clang', 'scripts', 'update.py') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 56 | |
| 57 | DepsEntry = collections.namedtuple('DepsEntry', 'path url revision') |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 58 | ChangedDep = collections.namedtuple('ChangedDep', |
| 59 | 'path url current_rev new_rev') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 60 | |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 61 | class RollError(Exception): |
| 62 | pass |
| 63 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 64 | |
oprypin | 1e64cfa | 2017-07-25 01:57:17 -0700 | [diff] [blame] | 65 | def VarLookup(local_scope): |
| 66 | return lambda var_name: local_scope['vars'][var_name] |
| 67 | |
| 68 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 69 | def ParseDepsDict(deps_content): |
| 70 | local_scope = {} |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 71 | global_scope = { |
oprypin | 1e64cfa | 2017-07-25 01:57:17 -0700 | [diff] [blame] | 72 | 'Var': VarLookup(local_scope), |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 73 | 'deps_os': {}, |
| 74 | } |
| 75 | exec(deps_content, global_scope, local_scope) |
| 76 | return local_scope |
| 77 | |
| 78 | |
| 79 | def ParseLocalDepsFile(filename): |
| 80 | with open(filename, 'rb') as f: |
| 81 | deps_content = f.read() |
| 82 | return ParseDepsDict(deps_content) |
| 83 | |
| 84 | |
| 85 | def ParseRemoteCrDepsFile(revision): |
| 86 | deps_content = ReadRemoteCrFile('DEPS', revision) |
| 87 | return ParseDepsDict(deps_content) |
| 88 | |
| 89 | |
| 90 | def ParseCommitPosition(commit_message): |
| 91 | for line in reversed(commit_message.splitlines()): |
| 92 | m = COMMIT_POSITION_RE.match(line.strip()) |
| 93 | if m: |
| 94 | return m.group(1) |
| 95 | logging.error('Failed to parse commit position id from:\n%s\n', |
| 96 | commit_message) |
| 97 | sys.exit(-1) |
| 98 | |
| 99 | |
| 100 | def _RunCommand(command, working_dir=None, ignore_exit_code=False, |
| 101 | extra_env=None): |
| 102 | """Runs a command and returns the output from that command. |
| 103 | |
| 104 | If the command fails (exit code != 0), the function will exit the process. |
| 105 | |
| 106 | Returns: |
| 107 | A tuple containing the stdout and stderr outputs as strings. |
| 108 | """ |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 109 | working_dir = working_dir or CHECKOUT_SRC_DIR |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 110 | logging.debug('CMD: %s CWD: %s', ' '.join(command), working_dir) |
| 111 | env = os.environ.copy() |
| 112 | if extra_env: |
| 113 | assert all(type(value) == str for value in extra_env.values()) |
| 114 | logging.debug('extra env: %s', extra_env) |
| 115 | env.update(extra_env) |
| 116 | p = subprocess.Popen(command, stdout=subprocess.PIPE, |
| 117 | stderr=subprocess.PIPE, env=env, |
| 118 | cwd=working_dir, universal_newlines=True) |
| 119 | std_output = p.stdout.read() |
| 120 | err_output = p.stderr.read() |
| 121 | p.wait() |
| 122 | p.stdout.close() |
| 123 | p.stderr.close() |
| 124 | if not ignore_exit_code and p.returncode != 0: |
| 125 | logging.error('Command failed: %s\n' |
| 126 | 'stdout:\n%s\n' |
| 127 | 'stderr:\n%s\n', ' '.join(command), std_output, err_output) |
| 128 | sys.exit(p.returncode) |
| 129 | return std_output, err_output |
| 130 | |
| 131 | |
| 132 | def _GetBranches(): |
| 133 | """Returns a tuple of active,branches. |
| 134 | |
| 135 | The 'active' is the name of the currently active branch and 'branches' is a |
| 136 | list of all branches. |
| 137 | """ |
| 138 | lines = _RunCommand(['git', 'branch'])[0].split('\n') |
| 139 | branches = [] |
| 140 | active = '' |
| 141 | for line in lines: |
| 142 | if '*' in line: |
| 143 | # The assumption is that the first char will always be the '*'. |
| 144 | active = line[1:].strip() |
| 145 | branches.append(active) |
| 146 | else: |
| 147 | branch = line.strip() |
| 148 | if branch: |
| 149 | branches.append(branch) |
| 150 | return active, branches |
| 151 | |
| 152 | |
| 153 | def _ReadGitilesContent(url): |
| 154 | # Download and decode BASE64 content until |
| 155 | # https://code.google.com/p/gitiles/issues/detail?id=7 is fixed. |
| 156 | base64_content = ReadUrlContent(url + '?format=TEXT') |
| 157 | return base64.b64decode(base64_content[0]) |
| 158 | |
| 159 | |
| 160 | def ReadRemoteCrFile(path_below_src, revision): |
| 161 | """Reads a remote Chromium file of a specific revision. Returns a string.""" |
| 162 | return _ReadGitilesContent(CHROMIUM_FILE_TEMPLATE % (revision, |
| 163 | path_below_src)) |
| 164 | |
| 165 | |
| 166 | def ReadRemoteCrCommit(revision): |
| 167 | """Reads a remote Chromium commit message. Returns a string.""" |
| 168 | return _ReadGitilesContent(CHROMIUM_COMMIT_TEMPLATE % revision) |
| 169 | |
| 170 | |
| 171 | def ReadUrlContent(url): |
| 172 | """Connect to a remote host and read the contents. Returns a list of lines.""" |
| 173 | conn = urllib.urlopen(url) |
| 174 | try: |
| 175 | return conn.readlines() |
| 176 | except IOError as e: |
| 177 | logging.exception('Error connecting to %s. Error: %s', url, e) |
| 178 | raise |
| 179 | finally: |
| 180 | conn.close() |
| 181 | |
| 182 | |
| 183 | def GetMatchingDepsEntries(depsentry_dict, dir_path): |
| 184 | """Gets all deps entries matching the provided path. |
| 185 | |
| 186 | This list may contain more than one DepsEntry object. |
| 187 | Example: dir_path='src/testing' would give results containing both |
| 188 | 'src/testing/gtest' and 'src/testing/gmock' deps entries for Chromium's DEPS. |
| 189 | Example 2: dir_path='src/build' should return 'src/build' but not |
| 190 | 'src/buildtools'. |
| 191 | |
| 192 | Returns: |
| 193 | A list of DepsEntry objects. |
| 194 | """ |
| 195 | result = [] |
| 196 | for path, depsentry in depsentry_dict.iteritems(): |
| 197 | if path == dir_path: |
| 198 | result.append(depsentry) |
| 199 | else: |
Henrik Kjellander | 14771ac | 2015-06-02 13:10:04 +0200 | [diff] [blame] | 200 | parts = path.split('/') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 201 | if all(part == parts[i] |
Henrik Kjellander | 14771ac | 2015-06-02 13:10:04 +0200 | [diff] [blame] | 202 | for i, part in enumerate(dir_path.split('/'))): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 203 | result.append(depsentry) |
| 204 | return result |
| 205 | |
| 206 | |
| 207 | def BuildDepsentryDict(deps_dict): |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 208 | """Builds a dict of paths to DepsEntry objects from a raw parsed deps dict.""" |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 209 | result = {} |
| 210 | def AddDepsEntries(deps_subdict): |
| 211 | for path, deps_url in deps_subdict.iteritems(): |
Edward Lemur | 73c8175 | 2017-09-22 18:14:56 +0200 | [diff] [blame] | 212 | if isinstance(deps_url, dict): |
Edward Lemur | bbceb76 | 2017-09-28 19:09:17 +0200 | [diff] [blame^] | 213 | deps_url = deps_url['url'] |
| 214 | if not result.has_key(path): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 215 | url, revision = deps_url.split('@') if deps_url else (None, None) |
| 216 | result[path] = DepsEntry(path, url, revision) |
| 217 | |
| 218 | AddDepsEntries(deps_dict['deps']) |
| 219 | for deps_os in ['win', 'mac', 'unix', 'android', 'ios', 'unix']: |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 220 | AddDepsEntries(deps_dict.get('deps_os', {}).get(deps_os, {})) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 221 | return result |
| 222 | |
| 223 | |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 224 | def CalculateChangedDeps(webrtc_deps, new_cr_deps): |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 225 | """ |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 226 | Calculate changed deps entries based on entries defined in the WebRTC DEPS |
| 227 | file: |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 228 | - If a shared dependency with the Chromium DEPS file: roll it to the same |
| 229 | revision as Chromium (i.e. entry in the new_cr_deps dict) |
| 230 | - If it's a Chromium sub-directory, roll it to the HEAD revision (notice |
| 231 | this means it may be ahead of the chromium_revision, but generally these |
| 232 | should be close). |
| 233 | - If it's another DEPS entry (not shared with Chromium), roll it to HEAD |
| 234 | unless it's configured to be skipped. |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 235 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 236 | Returns: |
| 237 | A list of ChangedDep objects representing the changed deps. |
| 238 | """ |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 239 | result = [] |
| 240 | webrtc_entries = BuildDepsentryDict(webrtc_deps) |
| 241 | new_cr_entries = BuildDepsentryDict(new_cr_deps) |
| 242 | for path, webrtc_deps_entry in webrtc_entries.iteritems(): |
| 243 | if path in DONT_AUTOROLL_THESE: |
| 244 | continue |
| 245 | cr_deps_entry = new_cr_entries.get(path) |
| 246 | if cr_deps_entry: |
| 247 | # Use the revision from Chromium's DEPS file. |
| 248 | new_rev = cr_deps_entry.revision |
| 249 | assert webrtc_deps_entry.url == cr_deps_entry.url, ( |
| 250 | 'WebRTC DEPS entry %s has a different URL (%s) than Chromium (%s).' % |
| 251 | (path, webrtc_deps_entry.url, cr_deps_entry.url)) |
| 252 | else: |
| 253 | # Use the HEAD of the deps repo. |
| 254 | stdout, _ = _RunCommand(['git', 'ls-remote', webrtc_deps_entry.url, |
| 255 | 'HEAD']) |
| 256 | new_rev = stdout.strip().split('\t')[0] |
| 257 | |
| 258 | # Check if an update is necessary. |
| 259 | if webrtc_deps_entry.revision != new_rev: |
| 260 | logging.debug('Roll dependency %s to %s', path, new_rev) |
| 261 | result.append(ChangedDep(path, webrtc_deps_entry.url, |
| 262 | webrtc_deps_entry.revision, new_rev)) |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 263 | return sorted(result) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 264 | |
| 265 | |
| 266 | def CalculateChangedClang(new_cr_rev): |
| 267 | def GetClangRev(lines): |
| 268 | for line in lines: |
| 269 | match = CLANG_REVISION_RE.match(line) |
| 270 | if match: |
| 271 | return match.group(1) |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 272 | raise RollError('Could not parse Clang revision!') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 273 | |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 274 | with open(CLANG_UPDATE_SCRIPT_LOCAL_PATH, 'rb') as f: |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 275 | current_lines = f.readlines() |
| 276 | current_rev = GetClangRev(current_lines) |
| 277 | |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 278 | new_clang_update_py = ReadRemoteCrFile(CLANG_UPDATE_SCRIPT_URL_PATH, |
| 279 | new_cr_rev).splitlines() |
| 280 | new_rev = GetClangRev(new_clang_update_py) |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 281 | return ChangedDep(CLANG_UPDATE_SCRIPT_LOCAL_PATH, None, current_rev, new_rev) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 282 | |
| 283 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 284 | def GenerateCommitMessage(current_cr_rev, new_cr_rev, current_commit_pos, |
| 285 | new_commit_pos, changed_deps_list, clang_change): |
kjellander | 052af4c | 2016-03-30 02:30:50 -0700 | [diff] [blame] | 286 | current_cr_rev = current_cr_rev[0:10] |
| 287 | new_cr_rev = new_cr_rev[0:10] |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 288 | rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev) |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 289 | git_number_interval = '%s:%s' % (current_commit_pos, new_commit_pos) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 290 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 291 | commit_msg = ['Roll chromium_revision %s (%s)\n' % (rev_interval, |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 292 | git_number_interval)] |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 293 | commit_msg.append('Change log: %s' % (CHROMIUM_LOG_TEMPLATE % rev_interval)) |
| 294 | commit_msg.append('Full diff: %s\n' % (CHROMIUM_COMMIT_TEMPLATE % |
| 295 | rev_interval)) |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 296 | tbr_authors = '' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 297 | if changed_deps_list: |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 298 | commit_msg.append('Changed dependencies:') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 299 | |
| 300 | for c in changed_deps_list: |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 301 | commit_msg.append('* %s: %s/+log/%s..%s' % (c.path, c.url, |
kjellander | 052af4c | 2016-03-30 02:30:50 -0700 | [diff] [blame] | 302 | c.current_rev[0:10], |
| 303 | c.new_rev[0:10])) |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 304 | if 'libvpx' in c.path: |
stefan | a540ada | 2016-07-18 11:15:55 -0700 | [diff] [blame] | 305 | tbr_authors += 'marpan@webrtc.org, ' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 306 | |
| 307 | change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, 'DEPS') |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 308 | commit_msg.append('DEPS diff: %s\n' % change_url) |
| 309 | else: |
| 310 | commit_msg.append('No dependencies changed.') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 311 | |
| 312 | if clang_change.current_rev != clang_change.new_rev: |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 313 | commit_msg.append('Clang version changed %s:%s' % |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 314 | (clang_change.current_rev, clang_change.new_rev)) |
| 315 | change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, |
| 316 | CLANG_UPDATE_SCRIPT_URL_PATH) |
Henrik Kjellander | 417fec2 | 2015-10-02 13:39:52 +0200 | [diff] [blame] | 317 | commit_msg.append('Details: %s\n' % change_url) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 318 | else: |
Henrik Kjellander | 417fec2 | 2015-10-02 13:39:52 +0200 | [diff] [blame] | 319 | commit_msg.append('No update to Clang.\n') |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 320 | |
Edward Lemur | 033a1bf | 2017-09-14 14:50:54 +0200 | [diff] [blame] | 321 | # TBR needs to be non-empty for Gerrit to process it. |
Edward Lemur | 6ef2002 | 2017-09-14 20:46:01 +0200 | [diff] [blame] | 322 | git_author = _RunCommand(['git', 'config', 'user.email'], |
| 323 | working_dir=CHECKOUT_SRC_DIR)[0].splitlines()[0] |
| 324 | tbr_authors = git_author + ',' + tbr_authors |
| 325 | |
| 326 | commit_msg.append('TBR=%s' % tbr_authors) |
Henrik Kjellander | 0bb7f05 | 2016-09-21 23:11:23 +0200 | [diff] [blame] | 327 | commit_msg.append('BUG=None') |
ehmaldonado | 4d46a5e | 2017-08-10 15:32:02 -0700 | [diff] [blame] | 328 | commit_msg.append('CQ_INCLUDE_TRYBOTS=%s' % EXTRA_TRYBOTS) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 329 | return '\n'.join(commit_msg) |
| 330 | |
| 331 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 332 | def UpdateDepsFile(deps_filename, old_cr_revision, new_cr_revision, |
| 333 | changed_deps): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 334 | """Update the DEPS file with the new revision.""" |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 335 | |
| 336 | # Update the chromium_revision variable. |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 337 | with open(deps_filename, 'rb') as deps_file: |
| 338 | deps_content = deps_file.read() |
| 339 | deps_content = deps_content.replace(old_cr_revision, new_cr_revision) |
| 340 | with open(deps_filename, 'wb') as deps_file: |
| 341 | deps_file.write(deps_content) |
| 342 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 343 | # Update each individual DEPS entry. |
| 344 | for dep in changed_deps: |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 345 | local_dep_dir = os.path.join(CHECKOUT_ROOT_DIR, dep.path) |
| 346 | if not os.path.isdir(local_dep_dir): |
| 347 | raise RollError( |
| 348 | 'Cannot find local directory %s. Either run\n' |
| 349 | 'gclient sync --deps=all\n' |
| 350 | 'or make sure the .gclient file for your solution contains all ' |
| 351 | 'platforms in the target_os list, i.e.\n' |
| 352 | 'target_os = ["android", "unix", "mac", "ios", "win"];\n' |
| 353 | 'Then run "gclient sync" again.' % local_dep_dir) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 354 | _, stderr = _RunCommand( |
| 355 | ['roll-dep-svn', '--no-verify-revision', dep.path, dep.new_rev], |
| 356 | working_dir=CHECKOUT_SRC_DIR, ignore_exit_code=True) |
| 357 | if stderr: |
| 358 | logging.warning('roll-dep-svn: %s', stderr) |
| 359 | |
| 360 | |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 361 | def _IsTreeClean(): |
| 362 | stdout, _ = _RunCommand(['git', 'status', '--porcelain']) |
| 363 | if len(stdout) == 0: |
| 364 | return True |
| 365 | |
| 366 | logging.error('Dirty/unversioned files:\n%s', stdout) |
| 367 | return False |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 368 | |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 369 | |
| 370 | def _EnsureUpdatedMasterBranch(dry_run): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 371 | current_branch = _RunCommand( |
| 372 | ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])[0].splitlines()[0] |
| 373 | if current_branch != 'master': |
| 374 | logging.error('Please checkout the master branch and re-run this script.') |
| 375 | if not dry_run: |
| 376 | sys.exit(-1) |
| 377 | |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 378 | logging.info('Updating master branch...') |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 379 | _RunCommand(['git', 'pull']) |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 380 | |
| 381 | |
| 382 | def _CreateRollBranch(dry_run): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 383 | logging.info('Creating roll branch: %s', ROLL_BRANCH_NAME) |
| 384 | if not dry_run: |
| 385 | _RunCommand(['git', 'checkout', '-b', ROLL_BRANCH_NAME]) |
| 386 | |
| 387 | |
| 388 | def _RemovePreviousRollBranch(dry_run): |
| 389 | active_branch, branches = _GetBranches() |
| 390 | if active_branch == ROLL_BRANCH_NAME: |
| 391 | active_branch = 'master' |
| 392 | if ROLL_BRANCH_NAME in branches: |
| 393 | logging.info('Removing previous roll branch (%s)', ROLL_BRANCH_NAME) |
| 394 | if not dry_run: |
| 395 | _RunCommand(['git', 'checkout', active_branch]) |
| 396 | _RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME]) |
| 397 | |
| 398 | |
| 399 | def _LocalCommit(commit_msg, dry_run): |
| 400 | logging.info('Committing changes locally.') |
| 401 | if not dry_run: |
| 402 | _RunCommand(['git', 'add', '--update', '.']) |
| 403 | _RunCommand(['git', 'commit', '-m', commit_msg]) |
| 404 | |
| 405 | |
Edward Lemur | 033a1bf | 2017-09-14 14:50:54 +0200 | [diff] [blame] | 406 | def _UploadCL(dry_run, skip_cq=False): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 407 | logging.info('Uploading CL...') |
| 408 | if not dry_run: |
Edward Lemur | 033a1bf | 2017-09-14 14:50:54 +0200 | [diff] [blame] | 409 | cmd = ['git', 'cl', 'upload', '-f', '--gerrit'] |
| 410 | if not skip_cq: |
| 411 | logging.info('Sending the CL to the CQ...') |
| 412 | cmd.extend(['--use-commit-queue', '--send-mail']) |
Edward Lemur | ef6ee98 | 2017-09-18 11:41:47 +0200 | [diff] [blame] | 413 | _RunCommand(cmd, extra_env={'EDITOR': 'true', 'SKIP_GCE_AUTH_FOR_GIT': '1'}) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 414 | |
| 415 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 416 | def main(): |
| 417 | p = argparse.ArgumentParser() |
| 418 | p.add_argument('--clean', action='store_true', default=False, |
| 419 | help='Removes any previous local roll branch.') |
| 420 | p.add_argument('-r', '--revision', |
| 421 | help=('Chromium Git revision to roll to. Defaults to the ' |
Henrik Kjellander | 18b042f | 2015-10-02 09:01:39 +0200 | [diff] [blame] | 422 | 'Chromium HEAD revision if omitted.')) |
Henrik Kjellander | 42b6c63 | 2015-10-05 10:44:24 +0200 | [diff] [blame] | 423 | p.add_argument('-u', '--rietveld-email', |
| 424 | help=('E-mail address to use for creating the CL at Rietveld' |
| 425 | 'If omitted a previously cached one will be used or an ' |
| 426 | 'error will be thrown during upload.')) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 427 | p.add_argument('--dry-run', action='store_true', default=False, |
| 428 | help=('Calculate changes and modify DEPS, but don\'t create ' |
| 429 | 'any local branch, commit, upload CL or send any ' |
| 430 | 'tryjobs.')) |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 431 | p.add_argument('-i', '--ignore-unclean-workdir', action='store_true', |
| 432 | default=False, |
| 433 | help=('Ignore if the current branch is not master or if there ' |
| 434 | 'are uncommitted changes (default: %(default)s).')) |
Henrik Kjellander | 417fec2 | 2015-10-02 13:39:52 +0200 | [diff] [blame] | 435 | p.add_argument('--skip-cq', action='store_true', default=False, |
| 436 | help='Skip sending the CL to the CQ (default: %(default)s)') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 437 | p.add_argument('-v', '--verbose', action='store_true', default=False, |
| 438 | help='Be extra verbose in printing of log messages.') |
| 439 | opts = p.parse_args() |
| 440 | |
| 441 | if opts.verbose: |
| 442 | logging.basicConfig(level=logging.DEBUG) |
| 443 | else: |
| 444 | logging.basicConfig(level=logging.INFO) |
| 445 | |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 446 | if not opts.ignore_unclean_workdir and not _IsTreeClean(): |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 447 | logging.error('Please clean your local checkout first.') |
| 448 | return 1 |
| 449 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 450 | if opts.clean: |
| 451 | _RemovePreviousRollBranch(opts.dry_run) |
| 452 | |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 453 | if not opts.ignore_unclean_workdir: |
| 454 | _EnsureUpdatedMasterBranch(opts.dry_run) |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 455 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 456 | new_cr_rev = opts.revision |
| 457 | if not new_cr_rev: |
Henrik Kjellander | 18b042f | 2015-10-02 09:01:39 +0200 | [diff] [blame] | 458 | stdout, _ = _RunCommand(['git', 'ls-remote', CHROMIUM_SRC_URL, 'HEAD']) |
| 459 | head_rev = stdout.strip().split('\t')[0] |
| 460 | logging.info('No revision specified. Using HEAD: %s', head_rev) |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 461 | new_cr_rev = head_rev |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 462 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 463 | deps_filename = os.path.join(CHECKOUT_SRC_DIR, 'DEPS') |
| 464 | webrtc_deps = ParseLocalDepsFile(deps_filename) |
| 465 | current_cr_rev = webrtc_deps['vars']['chromium_revision'] |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 466 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 467 | current_commit_pos = ParseCommitPosition(ReadRemoteCrCommit(current_cr_rev)) |
| 468 | new_commit_pos = ParseCommitPosition(ReadRemoteCrCommit(new_cr_rev)) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 469 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 470 | new_cr_deps = ParseRemoteCrDepsFile(new_cr_rev) |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 471 | changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 472 | clang_change = CalculateChangedClang(new_cr_rev) |
| 473 | commit_msg = GenerateCommitMessage(current_cr_rev, new_cr_rev, |
| 474 | current_commit_pos, new_commit_pos, |
| 475 | changed_deps, clang_change) |
| 476 | logging.debug('Commit message:\n%s', commit_msg) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 477 | |
| 478 | _CreateRollBranch(opts.dry_run) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 479 | UpdateDepsFile(deps_filename, current_cr_rev, new_cr_rev, changed_deps) |
kjellander | c99bddf | 2017-05-15 02:40:58 -0700 | [diff] [blame] | 480 | if _IsTreeClean(): |
| 481 | logging.info("No DEPS changes detected, skipping CL creation.") |
| 482 | else: |
| 483 | _LocalCommit(commit_msg, opts.dry_run) |
Edward Lemur | 033a1bf | 2017-09-14 14:50:54 +0200 | [diff] [blame] | 484 | _UploadCL(opts.dry_run, opts.skip_cq) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 485 | return 0 |
| 486 | |
| 487 | |
| 488 | if __name__ == '__main__': |
| 489 | sys.exit(main()) |