iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 1 | # Copyright 2014 The Chromium Authors. All rights reserved. |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 2 | # Use of this source code is governed by a BSD-style license that can be |
| 3 | # found in the LICENSE file. |
| 4 | |
| 5 | # Monkeypatch IMapIterator so that Ctrl-C can kill everything properly. |
| 6 | # Derived from https://gist.github.com/aljungberg/626518 |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 7 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 8 | import multiprocessing.pool |
Josip Sokcevic | de6c456 | 2020-03-26 00:39:42 +0000 | [diff] [blame] | 9 | import sys |
| 10 | import threading |
| 11 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 12 | from multiprocessing.pool import IMapIterator |
Josip Sokcevic | de6c456 | 2020-03-26 00:39:42 +0000 | [diff] [blame] | 13 | |
Aravind Vasudevan | b816418 | 2023-08-25 21:49:12 +0000 | [diff] [blame] | 14 | from third_party import colorama |
| 15 | |
| 16 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 17 | def wrapper(func): |
| 18 | def wrap(self, timeout=None): |
Gavin Mak | cc97655 | 2023-08-28 17:01:52 +0000 | [diff] [blame^] | 19 | return func(self, timeout=timeout or threading.TIMEOUT_MAX) |
Josip Sokcevic | de6c456 | 2020-03-26 00:39:42 +0000 | [diff] [blame] | 20 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 21 | return wrap |
| 22 | IMapIterator.next = wrapper(IMapIterator.next) |
| 23 | IMapIterator.__next__ = IMapIterator.next |
| 24 | # TODO(iannucci): Monkeypatch all other 'wait' methods too. |
| 25 | |
| 26 | |
| 27 | import binascii |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 28 | import collections |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 29 | import contextlib |
| 30 | import functools |
| 31 | import logging |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 32 | import os |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 33 | import re |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 34 | import setup_color |
sammc@chromium.org | 900a33f | 2015-09-29 06:57:09 +0000 | [diff] [blame] | 35 | import shutil |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 36 | import signal |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 37 | import tempfile |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 38 | import textwrap |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 39 | |
| 40 | import subprocess2 |
| 41 | |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 42 | from io import BytesIO |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 43 | |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 44 | |
| 45 | ROOT = os.path.abspath(os.path.dirname(__file__)) |
iannucci@chromium.org | 0d9e59c | 2016-01-09 08:08:41 +0000 | [diff] [blame] | 46 | IS_WIN = sys.platform == 'win32' |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 47 | TEST_MODE = False |
| 48 | |
Dan Jacques | 209a681 | 2017-07-12 11:40:20 -0700 | [diff] [blame] | 49 | |
| 50 | def win_find_git(): |
| 51 | for elem in os.environ.get('PATH', '').split(os.pathsep): |
| 52 | for candidate in ('git.exe', 'git.bat'): |
| 53 | path = os.path.join(elem, candidate) |
| 54 | if os.path.isfile(path): |
| 55 | return path |
| 56 | raise ValueError('Could not find Git on PATH.') |
| 57 | |
| 58 | |
| 59 | GIT_EXE = 'git' if not IS_WIN else win_find_git() |
| 60 | |
| 61 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 62 | FREEZE = 'FREEZE' |
| 63 | FREEZE_SECTIONS = { |
| 64 | 'indexed': 'soft', |
| 65 | 'unindexed': 'mixed' |
| 66 | } |
| 67 | FREEZE_MATCHER = re.compile(r'%s.(%s)' % (FREEZE, '|'.join(FREEZE_SECTIONS))) |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 68 | |
| 69 | |
Dan Jacques | 2f8b0c1 | 2017-04-05 12:57:21 -0700 | [diff] [blame] | 70 | # NOTE: This list is DEPRECATED in favor of the Infra Git wrapper: |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 71 | # https://chromium.googlesource.com/infra/infra/+/HEAD/go/src/infra/tools/git |
Dan Jacques | 2f8b0c1 | 2017-04-05 12:57:21 -0700 | [diff] [blame] | 72 | # |
| 73 | # New entries should be added to the Git wrapper, NOT to this list. "git_retry" |
| 74 | # is, similarly, being deprecated in favor of the Git wrapper. |
| 75 | # |
| 76 | # --- |
| 77 | # |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 78 | # Retry a git operation if git returns a error response with any of these |
| 79 | # messages. It's all observed 'bad' GoB responses so far. |
| 80 | # |
| 81 | # This list is inspired/derived from the one in ChromiumOS's Chromite: |
| 82 | # <CHROMITE>/lib/git.py::GIT_TRANSIENT_ERRORS |
| 83 | # |
| 84 | # It was last imported from '7add3ac29564d98ac35ce426bc295e743e7c0c02'. |
| 85 | GIT_TRANSIENT_ERRORS = ( |
| 86 | # crbug.com/285832 |
iannucci@chromium.org | 6e95d40 | 2014-08-29 22:10:55 +0000 | [diff] [blame] | 87 | r'!.*\[remote rejected\].*\(error in hook\)', |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 88 | |
| 89 | # crbug.com/289932 |
iannucci@chromium.org | 6e95d40 | 2014-08-29 22:10:55 +0000 | [diff] [blame] | 90 | r'!.*\[remote rejected\].*\(failed to lock\)', |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 91 | |
| 92 | # crbug.com/307156 |
iannucci@chromium.org | 6e95d40 | 2014-08-29 22:10:55 +0000 | [diff] [blame] | 93 | r'!.*\[remote rejected\].*\(error in Gerrit backend\)', |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 94 | |
| 95 | # crbug.com/285832 |
| 96 | r'remote error: Internal Server Error', |
| 97 | |
| 98 | # crbug.com/294449 |
| 99 | r'fatal: Couldn\'t find remote ref ', |
| 100 | |
| 101 | # crbug.com/220543 |
| 102 | r'git fetch_pack: expected ACK/NAK, got', |
| 103 | |
| 104 | # crbug.com/189455 |
| 105 | r'protocol error: bad pack header', |
| 106 | |
| 107 | # crbug.com/202807 |
| 108 | r'The remote end hung up unexpectedly', |
| 109 | |
| 110 | # crbug.com/298189 |
| 111 | r'TLS packet with unexpected length was received', |
| 112 | |
| 113 | # crbug.com/187444 |
| 114 | r'RPC failed; result=\d+, HTTP code = \d+', |
| 115 | |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 116 | # crbug.com/388876 |
| 117 | r'Connection timed out', |
dnj@chromium.org | 45cddd6 | 2014-11-06 19:36:42 +0000 | [diff] [blame] | 118 | |
| 119 | # crbug.com/430343 |
| 120 | # TODO(dnj): Resync with Chromite. |
| 121 | r'The requested URL returned error: 5\d+', |
Arikon | b3a2148 | 2016-07-22 10:12:24 -0700 | [diff] [blame] | 122 | |
| 123 | r'Connection reset by peer', |
| 124 | |
| 125 | r'Unable to look up', |
| 126 | |
| 127 | r'Couldn\'t resolve host', |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 128 | ) |
| 129 | |
| 130 | GIT_TRANSIENT_ERRORS_RE = re.compile('|'.join(GIT_TRANSIENT_ERRORS), |
| 131 | re.IGNORECASE) |
| 132 | |
raphael.kubo.da.costa@intel.com | 58d05b0 | 2015-06-24 08:54:41 +0000 | [diff] [blame] | 133 | # git's for-each-ref command first supported the upstream:track token in its |
| 134 | # format string in version 1.9.0, but some usages were broken until 2.3.0. |
| 135 | # See git commit b6160d95 for more information. |
| 136 | MIN_UPSTREAM_TRACK_GIT_VERSION = (2, 3) |
dnj@chromium.org | de219ec | 2014-07-28 17:39:08 +0000 | [diff] [blame] | 137 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 138 | class BadCommitRefException(Exception): |
| 139 | def __init__(self, refs): |
| 140 | msg = ('one of %s does not seem to be a valid commitref.' % |
| 141 | str(refs)) |
| 142 | super(BadCommitRefException, self).__init__(msg) |
| 143 | |
| 144 | |
| 145 | def memoize_one(**kwargs): |
| 146 | """Memoizes a single-argument pure function. |
| 147 | |
| 148 | Values of None are not cached. |
| 149 | |
| 150 | Kwargs: |
| 151 | threadsafe (bool) - REQUIRED. Specifies whether to use locking around |
| 152 | cache manipulation functions. This is a kwarg so that users of memoize_one |
| 153 | are forced to explicitly and verbosely pick True or False. |
| 154 | |
| 155 | Adds three methods to the decorated function: |
| 156 | * get(key, default=None) - Gets the value for this key from the cache. |
| 157 | * set(key, value) - Sets the value for this key from the cache. |
| 158 | * clear() - Drops the entire contents of the cache. Useful for unittests. |
| 159 | * update(other) - Updates the contents of the cache from another dict. |
| 160 | """ |
| 161 | assert 'threadsafe' in kwargs, 'Must specify threadsafe={True,False}' |
| 162 | threadsafe = kwargs['threadsafe'] |
| 163 | |
| 164 | if threadsafe: |
| 165 | def withlock(lock, f): |
| 166 | def inner(*args, **kwargs): |
| 167 | with lock: |
| 168 | return f(*args, **kwargs) |
| 169 | return inner |
| 170 | else: |
| 171 | def withlock(_lock, f): |
| 172 | return f |
| 173 | |
| 174 | def decorator(f): |
| 175 | # Instantiate the lock in decorator, in case users of memoize_one do: |
| 176 | # |
| 177 | # memoizer = memoize_one(threadsafe=True) |
| 178 | # |
| 179 | # @memoizer |
| 180 | # def fn1(val): ... |
| 181 | # |
| 182 | # @memoizer |
| 183 | # def fn2(val): ... |
| 184 | |
| 185 | lock = threading.Lock() if threadsafe else None |
| 186 | cache = {} |
| 187 | _get = withlock(lock, cache.get) |
| 188 | _set = withlock(lock, cache.__setitem__) |
| 189 | |
| 190 | @functools.wraps(f) |
| 191 | def inner(arg): |
| 192 | ret = _get(arg) |
| 193 | if ret is None: |
| 194 | ret = f(arg) |
| 195 | if ret is not None: |
| 196 | _set(arg, ret) |
| 197 | return ret |
| 198 | inner.get = _get |
| 199 | inner.set = _set |
| 200 | inner.clear = withlock(lock, cache.clear) |
| 201 | inner.update = withlock(lock, cache.update) |
| 202 | return inner |
| 203 | return decorator |
| 204 | |
| 205 | |
| 206 | def _ScopedPool_initer(orig, orig_args): # pragma: no cover |
| 207 | """Initializer method for ScopedPool's subprocesses. |
| 208 | |
| 209 | This helps ScopedPool handle Ctrl-C's correctly. |
| 210 | """ |
| 211 | signal.signal(signal.SIGINT, signal.SIG_IGN) |
| 212 | if orig: |
| 213 | orig(*orig_args) |
| 214 | |
| 215 | |
| 216 | @contextlib.contextmanager |
| 217 | def ScopedPool(*args, **kwargs): |
| 218 | """Context Manager which returns a multiprocessing.pool instance which |
| 219 | correctly deals with thrown exceptions. |
| 220 | |
| 221 | *args - Arguments to multiprocessing.pool |
| 222 | |
| 223 | Kwargs: |
| 224 | kind ('threads', 'procs') - The type of underlying coprocess to use. |
| 225 | **etc - Arguments to multiprocessing.pool |
| 226 | """ |
| 227 | if kwargs.pop('kind', None) == 'threads': |
| 228 | pool = multiprocessing.pool.ThreadPool(*args, **kwargs) |
| 229 | else: |
| 230 | orig, orig_args = kwargs.get('initializer'), kwargs.get('initargs', ()) |
| 231 | kwargs['initializer'] = _ScopedPool_initer |
| 232 | kwargs['initargs'] = orig, orig_args |
| 233 | pool = multiprocessing.pool.Pool(*args, **kwargs) |
| 234 | |
| 235 | try: |
| 236 | yield pool |
| 237 | pool.close() |
| 238 | except: |
| 239 | pool.terminate() |
| 240 | raise |
| 241 | finally: |
| 242 | pool.join() |
| 243 | |
| 244 | |
| 245 | class ProgressPrinter(object): |
| 246 | """Threaded single-stat status message printer.""" |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 247 | def __init__(self, fmt, enabled=None, fout=sys.stderr, period=0.5): |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 248 | """Create a ProgressPrinter. |
| 249 | |
| 250 | Use it as a context manager which produces a simple 'increment' method: |
| 251 | |
| 252 | with ProgressPrinter('(%%(count)d/%d)' % 1000) as inc: |
| 253 | for i in xrange(1000): |
| 254 | # do stuff |
| 255 | if i % 10 == 0: |
| 256 | inc(10) |
| 257 | |
| 258 | Args: |
| 259 | fmt - String format with a single '%(count)d' where the counter value |
| 260 | should go. |
| 261 | enabled (bool) - If this is None, will default to True if |
| 262 | logging.getLogger() is set to INFO or more verbose. |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 263 | fout (file-like) - The stream to print status messages to. |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 264 | period (float) - The time in seconds for the printer thread to wait |
| 265 | between printing. |
| 266 | """ |
| 267 | self.fmt = fmt |
| 268 | if enabled is None: # pragma: no cover |
| 269 | self.enabled = logging.getLogger().isEnabledFor(logging.INFO) |
| 270 | else: |
| 271 | self.enabled = enabled |
| 272 | |
| 273 | self._count = 0 |
| 274 | self._dead = False |
| 275 | self._dead_cond = threading.Condition() |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 276 | self._stream = fout |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 277 | self._thread = threading.Thread(target=self._run) |
| 278 | self._period = period |
| 279 | |
| 280 | def _emit(self, s): |
| 281 | if self.enabled: |
| 282 | self._stream.write('\r' + s) |
| 283 | self._stream.flush() |
| 284 | |
| 285 | def _run(self): |
| 286 | with self._dead_cond: |
| 287 | while not self._dead: |
| 288 | self._emit(self.fmt % {'count': self._count}) |
| 289 | self._dead_cond.wait(self._period) |
| 290 | self._emit((self.fmt + '\n') % {'count': self._count}) |
| 291 | |
| 292 | def inc(self, amount=1): |
| 293 | self._count += amount |
| 294 | |
| 295 | def __enter__(self): |
| 296 | self._thread.start() |
| 297 | return self.inc |
| 298 | |
| 299 | def __exit__(self, _exc_type, _exc_value, _traceback): |
| 300 | self._dead = True |
| 301 | with self._dead_cond: |
| 302 | self._dead_cond.notifyAll() |
| 303 | self._thread.join() |
| 304 | del self._thread |
| 305 | |
| 306 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 307 | def once(function): |
| 308 | """@Decorates |function| so that it only performs its action once, no matter |
| 309 | how many times the decorated |function| is called.""" |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 310 | has_run = [False] |
| 311 | def _wrapper(*args, **kwargs): |
| 312 | if not has_run[0]: |
| 313 | has_run[0] = True |
| 314 | function(*args, **kwargs) |
| 315 | return _wrapper |
| 316 | |
| 317 | |
| 318 | def unicode_repr(s): |
| 319 | result = repr(s) |
| 320 | return result[1:] if result.startswith('u') else result |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 321 | |
| 322 | |
| 323 | ## Git functions |
| 324 | |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 325 | def die(message, *args): |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 326 | print(textwrap.dedent(message % args), file=sys.stderr) |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 327 | sys.exit(1) |
| 328 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 329 | |
Mark Mentovai | f548d08 | 2017-03-08 13:32:00 -0500 | [diff] [blame] | 330 | def blame(filename, revision=None, porcelain=False, abbrev=None, *_args): |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 331 | command = ['blame'] |
| 332 | if porcelain: |
| 333 | command.append('-p') |
| 334 | if revision is not None: |
| 335 | command.append(revision) |
Mark Mentovai | f548d08 | 2017-03-08 13:32:00 -0500 | [diff] [blame] | 336 | if abbrev is not None: |
| 337 | command.append('--abbrev=%d' % abbrev) |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 338 | command.extend(['--', filename]) |
| 339 | return run(*command) |
| 340 | |
| 341 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 342 | def branch_config(branch, option, default=None): |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 343 | return get_config('branch.%s.%s' % (branch, option), default=default) |
iannucci@chromium.org | 0d9e59c | 2016-01-09 08:08:41 +0000 | [diff] [blame] | 344 | |
| 345 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 346 | def branch_config_map(option): |
| 347 | """Return {branch: <|option| value>} for all branches.""" |
| 348 | try: |
| 349 | reg = re.compile(r'^branch\.(.*)\.%s$' % option) |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 350 | lines = get_config_regexp(reg.pattern) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 351 | return {reg.match(k).group(1): v for k, v in (l.split() for l in lines)} |
| 352 | except subprocess2.CalledProcessError: |
| 353 | return {} |
| 354 | |
| 355 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 356 | def branches(use_limit=True, *args): |
akuegel@chromium.org | 58888e1 | 2015-06-09 15:26:37 +0000 | [diff] [blame] | 357 | NO_BRANCH = ('* (no branch', '* (detached', '* (HEAD detached') |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 358 | |
| 359 | key = 'depot-tools.branch-limit' |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 360 | limit = get_config_int(key, 20) |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 361 | |
| 362 | raw_branches = run('branch', *args).splitlines() |
| 363 | |
| 364 | num = len(raw_branches) |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 365 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 366 | if use_limit and num > limit: |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 367 | die("""\ |
| 368 | Your git repo has too many branches (%d/%d) for this tool to work well. |
| 369 | |
| 370 | You may adjust this limit by running: |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 371 | git config %s <new_limit> |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 372 | |
| 373 | You may also try cleaning up your old branches by running: |
| 374 | git cl archive |
| 375 | """, num, limit, key) |
iannucci@chromium.org | 3f23cdf | 2014-04-15 20:02:44 +0000 | [diff] [blame] | 376 | |
| 377 | for line in raw_branches: |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 378 | if line.startswith(NO_BRANCH): |
| 379 | continue |
| 380 | yield line.split()[-1] |
| 381 | |
| 382 | |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 383 | def get_config(option, default=None): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 384 | try: |
| 385 | return run('config', '--get', option) or default |
| 386 | except subprocess2.CalledProcessError: |
| 387 | return default |
| 388 | |
| 389 | |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 390 | def get_config_int(option, default=0): |
| 391 | assert isinstance(default, int) |
| 392 | try: |
| 393 | return int(get_config(option, default)) |
| 394 | except ValueError: |
| 395 | return default |
| 396 | |
| 397 | |
| 398 | def get_config_list(option): |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 399 | try: |
| 400 | return run('config', '--get-all', option).split() |
| 401 | except subprocess2.CalledProcessError: |
| 402 | return [] |
| 403 | |
| 404 | |
agable | 7aa2ddd | 2016-06-21 07:47:00 -0700 | [diff] [blame] | 405 | def get_config_regexp(pattern): |
| 406 | if IS_WIN: # pragma: no cover |
| 407 | # this madness is because we call git.bat which calls git.exe which calls |
| 408 | # bash.exe (or something to that effect). Each layer divides the number of |
| 409 | # ^'s by 2. |
| 410 | pattern = pattern.replace('^', '^' * 8) |
| 411 | return run('config', '--get-regexp', pattern).splitlines() |
| 412 | |
| 413 | |
Aravind Vasudevan | b816418 | 2023-08-25 21:49:12 +0000 | [diff] [blame] | 414 | def is_fsmonitor_enabled(): |
| 415 | """Returns true if core.fsmonitor is enabled in git config.""" |
| 416 | fsmonitor = get_config('core.fsmonitor', 'False') |
| 417 | return fsmonitor.strip().lower() == 'true' |
| 418 | |
| 419 | |
| 420 | def warn_submodule(): |
| 421 | """Print warnings for submodules.""" |
| 422 | # TODO(crbug.com/1475405): Warn users if the project uses submodules and |
| 423 | # they have fsmonitor enabled. |
| 424 | if is_fsmonitor_enabled(): |
| 425 | print(colorama.Fore.RED) |
| 426 | print('WARNING: You have fsmonitor enabled. There is a major issue ' |
| 427 | 'resulting in git diff-index returning wrong results. Please ' |
| 428 | 'disable it by running:') |
| 429 | print(' git config --global core.fsmonitor false') |
| 430 | print('We will remove this warning once https://crbug.com/1475405 is ' |
| 431 | 'fixed.') |
| 432 | print(colorama.Style.RESET_ALL) |
| 433 | |
| 434 | |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 435 | def current_branch(): |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 436 | try: |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 437 | return run('rev-parse', '--abbrev-ref', 'HEAD') |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 438 | except subprocess2.CalledProcessError: |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 439 | return None |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 440 | |
| 441 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 442 | def del_branch_config(branch, option, scope='local'): |
| 443 | del_config('branch.%s.%s' % (branch, option), scope=scope) |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 444 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 445 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 446 | def del_config(option, scope='local'): |
| 447 | try: |
| 448 | run('config', '--' + scope, '--unset', option) |
| 449 | except subprocess2.CalledProcessError: |
| 450 | pass |
| 451 | |
| 452 | |
mgiuca@chromium.org | 01d2cde | 2016-02-05 03:25:41 +0000 | [diff] [blame] | 453 | def diff(oldrev, newrev, *args): |
| 454 | return run('diff', oldrev, newrev, *args) |
| 455 | |
| 456 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 457 | def freeze(): |
| 458 | took_action = False |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 459 | key = 'depot-tools.freeze-size-limit' |
| 460 | MB = 2**20 |
| 461 | limit_mb = get_config_int(key, 100) |
| 462 | untracked_bytes = 0 |
| 463 | |
iannucci | eaca033 | 2016-08-03 16:46:50 -0700 | [diff] [blame] | 464 | root_path = repo_root() |
| 465 | |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 466 | # unindexed tracks all the files which are unindexed but we want to add to |
| 467 | # the `FREEZE.unindexed` commit. |
| 468 | unindexed = [] |
| 469 | |
| 470 | # will be set to true if there are any indexed files to commit. |
| 471 | have_indexed_files = False |
| 472 | |
Joanna Wang | 2541006 | 2023-08-10 23:28:44 +0000 | [diff] [blame] | 473 | for f, s in status(ignore_submodules='all'): |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 474 | if is_unmerged(s): |
| 475 | die("Cannot freeze unmerged changes!") |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 476 | if s.lstat not in ' ?': |
| 477 | # This covers all changes to indexed files. |
| 478 | # lstat = ' ' means that the file is tracked and modified, but wasn't |
| 479 | # added yet. |
| 480 | # lstat = '?' means that the file is untracked. |
| 481 | have_indexed_files = True |
| 482 | else: |
| 483 | unindexed.append(f.encode('utf-8')) |
| 484 | if s.lstat == '?' and limit_mb > 0: |
| 485 | untracked_bytes += os.lstat(os.path.join(root_path, f)).st_size |
| 486 | |
Bruce Dawson | 4bff3fd | 2018-01-04 14:44:23 -0800 | [diff] [blame] | 487 | if limit_mb > 0 and untracked_bytes > limit_mb * MB: |
| 488 | die("""\ |
| 489 | You appear to have too much untracked+unignored data in your git |
| 490 | checkout: %.1f / %d MB. |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 491 | |
Bruce Dawson | 4bff3fd | 2018-01-04 14:44:23 -0800 | [diff] [blame] | 492 | Run `git status` to see what it is. |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 493 | |
Bruce Dawson | 4bff3fd | 2018-01-04 14:44:23 -0800 | [diff] [blame] | 494 | In addition to making many git commands slower, this will prevent |
| 495 | depot_tools from freezing your in-progress changes. |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 496 | |
Bruce Dawson | 4bff3fd | 2018-01-04 14:44:23 -0800 | [diff] [blame] | 497 | You should add untracked data that you want to ignore to your repo's |
| 498 | .git/info/exclude |
| 499 | file. See `git help ignore` for the format of this file. |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 500 | |
Quinten Yearsley | 925cedb | 2020-04-13 17:49:39 +0000 | [diff] [blame] | 501 | If this data is intended as part of your commit, you may adjust the |
Bruce Dawson | 4bff3fd | 2018-01-04 14:44:23 -0800 | [diff] [blame] | 502 | freeze limit by running: |
| 503 | git config %s <new_limit> |
| 504 | Where <new_limit> is an integer threshold in megabytes.""", |
| 505 | untracked_bytes / (MB * 1.0), limit_mb, key) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 506 | |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 507 | if have_indexed_files: |
| 508 | try: |
| 509 | run('commit', '--no-verify', '-m', f'{FREEZE}.indexed') |
| 510 | took_action = True |
| 511 | except subprocess2.CalledProcessError: |
| 512 | pass |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 513 | |
agable | 96e179b | 2016-06-24 10:32:51 -0700 | [diff] [blame] | 514 | add_errors = False |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 515 | if unindexed: |
| 516 | try: |
| 517 | run('add', |
| 518 | '--pathspec-from-file', |
| 519 | '-', |
| 520 | '--ignore-errors', |
Robert Iannucci | 2f0147a | 2023-07-20 16:41:59 +0000 | [diff] [blame] | 521 | indata=b'\n'.join(unindexed), |
| 522 | cwd=root_path) |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 523 | except subprocess2.CalledProcessError: |
| 524 | add_errors = True |
agable | 96e179b | 2016-06-24 10:32:51 -0700 | [diff] [blame] | 525 | |
Robert Iannucci | 4e87f5b | 2023-07-13 19:51:33 +0000 | [diff] [blame] | 526 | try: |
| 527 | run('commit', '--no-verify', '-m', f'{FREEZE}.unindexed') |
| 528 | took_action = True |
| 529 | except subprocess2.CalledProcessError: |
| 530 | pass |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 531 | |
agable | 96e179b | 2016-06-24 10:32:51 -0700 | [diff] [blame] | 532 | ret = [] |
| 533 | if add_errors: |
| 534 | ret.append('Failed to index some unindexed files.') |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 535 | if not took_action: |
agable | 96e179b | 2016-06-24 10:32:51 -0700 | [diff] [blame] | 536 | ret.append('Nothing to freeze.') |
| 537 | return ' '.join(ret) or None |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 538 | |
| 539 | |
Gavin Mak | 2cbe95c | 2023-03-06 22:39:56 +0000 | [diff] [blame] | 540 | def get_branch_tree(use_limit=False): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 541 | """Get the dictionary of {branch: parent}, compatible with topo_iter. |
| 542 | |
| 543 | Returns a tuple of (skipped, <branch_tree dict>) where skipped is a set of |
| 544 | branches without upstream branches defined. |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 545 | """ |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 546 | skipped = set() |
| 547 | branch_tree = {} |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 548 | |
Gavin Mak | 2cbe95c | 2023-03-06 22:39:56 +0000 | [diff] [blame] | 549 | for branch in branches(use_limit=use_limit): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 550 | parent = upstream(branch) |
| 551 | if not parent: |
| 552 | skipped.add(branch) |
| 553 | continue |
| 554 | branch_tree[branch] = parent |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 555 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 556 | return skipped, branch_tree |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 557 | |
| 558 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 559 | def get_or_create_merge_base(branch, parent=None): |
| 560 | """Finds the configured merge base for branch. |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 561 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 562 | If parent is supplied, it's used instead of calling upstream(branch). |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 563 | """ |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 564 | base = branch_config(branch, 'base') |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 565 | base_upstream = branch_config(branch, 'base-upstream') |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 566 | parent = parent or upstream(branch) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 567 | if parent is None or branch is None: |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 568 | return None |
Josip Sokcevic | a3d1aaf | 2021-07-16 18:26:45 +0000 | [diff] [blame] | 569 | actual_merge_base = run('merge-base', parent, branch) |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 570 | |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 571 | if base_upstream != parent: |
| 572 | base = None |
| 573 | base_upstream = None |
| 574 | |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 575 | def is_ancestor(a, b): |
| 576 | return run_with_retcode('merge-base', '--is-ancestor', a, b) == 0 |
| 577 | |
clemensh@chromium.org | c3fe99d | 2016-04-19 08:39:55 +0000 | [diff] [blame] | 578 | if base and base != actual_merge_base: |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 579 | if not is_ancestor(base, branch): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 580 | logging.debug('Found WRONG pre-set merge-base for %s: %s', branch, base) |
| 581 | base = None |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 582 | elif is_ancestor(base, actual_merge_base): |
| 583 | logging.debug('Found OLD pre-set merge-base for %s: %s', branch, base) |
| 584 | base = None |
| 585 | else: |
| 586 | logging.debug('Found pre-set merge-base for %s: %s', branch, base) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 587 | |
| 588 | if not base: |
iannucci@chromium.org | edeaa81 | 2014-03-26 21:27:47 +0000 | [diff] [blame] | 589 | base = actual_merge_base |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 590 | manual_merge_base(branch, base, parent) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 591 | |
| 592 | return base |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 593 | |
| 594 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 595 | def hash_multi(*reflike): |
| 596 | return run('rev-parse', *reflike).splitlines() |
iannucci@chromium.org | 97345eb | 2014-03-13 07:55:15 +0000 | [diff] [blame] | 597 | |
| 598 | |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 599 | def hash_one(reflike, short=False): |
| 600 | args = ['rev-parse', reflike] |
| 601 | if short: |
| 602 | args.insert(1, '--short') |
| 603 | return run(*args) |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 604 | |
| 605 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 606 | def in_rebase(): |
| 607 | git_dir = run('rev-parse', '--git-dir') |
| 608 | return ( |
| 609 | os.path.exists(os.path.join(git_dir, 'rebase-merge')) or |
| 610 | os.path.exists(os.path.join(git_dir, 'rebase-apply'))) |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 611 | |
| 612 | |
| 613 | def intern_f(f, kind='blob'): |
| 614 | """Interns a file object into the git object store. |
| 615 | |
| 616 | Args: |
| 617 | f (file-like object) - The file-like object to intern |
| 618 | kind (git object type) - One of 'blob', 'commit', 'tree', 'tag'. |
| 619 | |
| 620 | Returns the git hash of the interned object (hex encoded). |
| 621 | """ |
| 622 | ret = run('hash-object', '-t', kind, '-w', '--stdin', stdin=f) |
| 623 | f.close() |
| 624 | return ret |
| 625 | |
| 626 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 627 | def is_dormant(branch): |
| 628 | # TODO(iannucci): Do an oldness check? |
| 629 | return branch_config(branch, 'dormant', 'false') != 'false' |
| 630 | |
| 631 | |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 632 | def is_unmerged(stat_value): |
| 633 | return ( |
| 634 | 'U' in (stat_value.lstat, stat_value.rstat) or |
| 635 | ((stat_value.lstat == stat_value.rstat) and stat_value.lstat in 'AD') |
| 636 | ) |
| 637 | |
| 638 | |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 639 | def manual_merge_base(branch, base, parent): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 640 | set_branch_config(branch, 'base', base) |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 641 | set_branch_config(branch, 'base-upstream', parent) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 642 | |
| 643 | |
| 644 | def mktree(treedict): |
| 645 | """Makes a git tree object and returns its hash. |
| 646 | |
| 647 | See |tree()| for the values of mode, type, and ref. |
| 648 | |
| 649 | Args: |
| 650 | treedict - { name: (mode, type, ref) } |
| 651 | """ |
| 652 | with tempfile.TemporaryFile() as f: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 653 | for name, (mode, typ, ref) in treedict.items(): |
Edward Lemur | 71681bf | 2019-10-09 23:46:20 +0000 | [diff] [blame] | 654 | f.write(('%s %s %s\t%s\0' % (mode, typ, ref, name)).encode('utf-8')) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 655 | f.seek(0) |
| 656 | return run('mktree', '-z', stdin=f) |
| 657 | |
| 658 | |
| 659 | def parse_commitrefs(*commitrefs): |
| 660 | """Returns binary encoded commit hashes for one or more commitrefs. |
| 661 | |
| 662 | A commitref is anything which can resolve to a commit. Popular examples: |
| 663 | * 'HEAD' |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 664 | * 'origin/main' |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 665 | * 'cool_branch~2' |
| 666 | """ |
| 667 | try: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 668 | return [binascii.unhexlify(h) for h in hash_multi(*commitrefs)] |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 669 | except subprocess2.CalledProcessError: |
| 670 | raise BadCommitRefException(commitrefs) |
| 671 | |
| 672 | |
sbc@chromium.org | 384039b | 2014-10-13 21:01:00 +0000 | [diff] [blame] | 673 | RebaseRet = collections.namedtuple('RebaseRet', 'success stdout stderr') |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 674 | |
| 675 | |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 676 | def rebase(parent, start, branch, abort=False, allow_gc=False): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 677 | """Rebases |start|..|branch| onto the branch |parent|. |
| 678 | |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 679 | Sets 'gc.auto=0' for the duration of this call to prevent the rebase from |
| 680 | running a potentially slow garbage collection cycle. |
| 681 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 682 | Args: |
| 683 | parent - The new parent ref for the rebased commits. |
| 684 | start - The commit to start from |
| 685 | branch - The branch to rebase |
| 686 | abort - If True, will call git-rebase --abort in the event that the rebase |
| 687 | doesn't complete successfully. |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 688 | allow_gc - If True, sets "-c gc.auto=1" on the rebase call, rather than |
| 689 | "-c gc.auto=0". Usually if you're doing a series of rebases, |
| 690 | you'll only want to run a single gc pass at the end of all the |
| 691 | rebase activity. |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 692 | |
| 693 | Returns a namedtuple with fields: |
| 694 | success - a boolean indicating that the rebase command completed |
| 695 | successfully. |
| 696 | message - if the rebase failed, this contains the stdout of the failed |
| 697 | rebase. |
| 698 | """ |
| 699 | try: |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 700 | args = [ |
| 701 | '-c', 'gc.auto={}'.format('1' if allow_gc else '0'), |
| 702 | 'rebase', |
| 703 | ] |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 704 | if TEST_MODE: |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 705 | args.append('--committer-date-is-author-date') |
| 706 | args += [ |
| 707 | '--onto', parent, start, branch, |
| 708 | ] |
| 709 | run(*args) |
sbc@chromium.org | 384039b | 2014-10-13 21:01:00 +0000 | [diff] [blame] | 710 | return RebaseRet(True, '', '') |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 711 | except subprocess2.CalledProcessError as cpe: |
| 712 | if abort: |
iannucci@chromium.org | dabb78b | 2015-06-11 23:17:28 +0000 | [diff] [blame] | 713 | run_with_retcode('rebase', '--abort') # ignore failure |
Josip Sokcevic | 72f991f | 2020-04-23 18:53:30 +0000 | [diff] [blame] | 714 | return RebaseRet(False, cpe.stdout.decode('utf-8', 'replace'), |
| 715 | cpe.stderr.decode('utf-8', 'replace')) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 716 | |
| 717 | |
| 718 | def remove_merge_base(branch): |
| 719 | del_branch_config(branch, 'base') |
iannucci@chromium.org | 10fbe87 | 2014-05-16 22:31:13 +0000 | [diff] [blame] | 720 | del_branch_config(branch, 'base-upstream') |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 721 | |
| 722 | |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 723 | def repo_root(): |
| 724 | """Returns the absolute path to the repository root.""" |
| 725 | return run('rev-parse', '--show-toplevel') |
| 726 | |
| 727 | |
Jeffrey Yasskin | 6b52dc2 | 2019-12-06 18:32:21 +0000 | [diff] [blame] | 728 | def upstream_default(): |
| 729 | """Returns the default branch name of the origin repository.""" |
| 730 | try: |
Josip Sokcevic | 0642373 | 2021-03-31 19:04:42 +0000 | [diff] [blame] | 731 | ret = run('rev-parse', '--abbrev-ref', 'origin/HEAD') |
| 732 | # Detect if the repository migrated to main branch |
| 733 | if ret == 'origin/master': |
| 734 | try: |
| 735 | ret = run('rev-parse', '--abbrev-ref', 'origin/main') |
| 736 | run('remote', 'set-head', '-a', 'origin') |
| 737 | ret = run('rev-parse', '--abbrev-ref', 'origin/HEAD') |
| 738 | except subprocess2.CalledProcessError: |
| 739 | pass |
| 740 | return ret |
Jeffrey Yasskin | 6b52dc2 | 2019-12-06 18:32:21 +0000 | [diff] [blame] | 741 | except subprocess2.CalledProcessError: |
Josip Sokcevic | 7e133ff | 2021-07-13 17:44:53 +0000 | [diff] [blame] | 742 | return 'origin/main' |
Jeffrey Yasskin | 6b52dc2 | 2019-12-06 18:32:21 +0000 | [diff] [blame] | 743 | |
| 744 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 745 | def root(): |
Jeffrey Yasskin | 6b52dc2 | 2019-12-06 18:32:21 +0000 | [diff] [blame] | 746 | return get_config('depot-tools.upstream', upstream_default()) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 747 | |
| 748 | |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 749 | @contextlib.contextmanager |
| 750 | def less(): # pragma: no cover |
| 751 | """Runs 'less' as context manager yielding its stdin as a PIPE. |
| 752 | |
| 753 | Automatically checks if sys.stdout is a non-TTY stream. If so, it avoids |
| 754 | running less and just yields sys.stdout. |
Edward Lemur | 0d462e9 | 2020-01-08 20:11:31 +0000 | [diff] [blame] | 755 | |
| 756 | The returned PIPE is opened on binary mode. |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 757 | """ |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 758 | if not setup_color.IS_TTY: |
Edward Lemur | 5e94b80 | 2019-11-26 21:44:08 +0000 | [diff] [blame] | 759 | # On Python 3, sys.stdout doesn't accept bytes, and sys.stdout.buffer must |
| 760 | # be used. |
| 761 | yield getattr(sys.stdout, 'buffer', sys.stdout) |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 762 | return |
| 763 | |
| 764 | # Run with the same options that git uses (see setup_pager in git repo). |
| 765 | # -F: Automatically quit if the output is less than one screen. |
| 766 | # -R: Don't escape ANSI color codes. |
| 767 | # -X: Don't clear the screen before starting. |
| 768 | cmd = ('less', '-FRX') |
| 769 | try: |
| 770 | proc = subprocess2.Popen(cmd, stdin=subprocess2.PIPE) |
| 771 | yield proc.stdin |
| 772 | finally: |
Edward Lemur | b800fde | 2020-01-10 23:04:44 +0000 | [diff] [blame] | 773 | try: |
| 774 | proc.stdin.close() |
| 775 | except BrokenPipeError: |
| 776 | # BrokenPipeError is raised if proc has already completed, |
| 777 | pass |
mgiuca@chromium.org | 8193756 | 2016-02-03 08:00:53 +0000 | [diff] [blame] | 778 | proc.wait() |
| 779 | |
| 780 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 781 | def run(*cmd, **kwargs): |
| 782 | """The same as run_with_stderr, except it only returns stdout.""" |
| 783 | return run_with_stderr(*cmd, **kwargs)[0] |
| 784 | |
| 785 | |
agable@chromium.org | d629fb4 | 2014-10-01 09:40:10 +0000 | [diff] [blame] | 786 | def run_with_retcode(*cmd, **kwargs): |
| 787 | """Run a command but only return the status code.""" |
| 788 | try: |
| 789 | run(*cmd, **kwargs) |
| 790 | return 0 |
| 791 | except subprocess2.CalledProcessError as cpe: |
| 792 | return cpe.returncode |
| 793 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 794 | def run_stream(*cmd, **kwargs): |
| 795 | """Runs a git command. Returns stdout as a PIPE (file-like object). |
| 796 | |
| 797 | stderr is dropped to avoid races if the process outputs to both stdout and |
| 798 | stderr. |
| 799 | """ |
Edward Lesmes | cf06cad | 2020-12-14 22:03:23 +0000 | [diff] [blame] | 800 | kwargs.setdefault('stderr', subprocess2.DEVNULL) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 801 | kwargs.setdefault('stdout', subprocess2.PIPE) |
iannucci@chromium.org | 0d9e59c | 2016-01-09 08:08:41 +0000 | [diff] [blame] | 802 | kwargs.setdefault('shell', False) |
iannucci@chromium.org | 2198002 | 2014-04-11 04:51:49 +0000 | [diff] [blame] | 803 | cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 804 | proc = subprocess2.Popen(cmd, **kwargs) |
| 805 | return proc.stdout |
| 806 | |
| 807 | |
tandrii@chromium.org | 6c14310 | 2015-06-11 19:21:02 +0000 | [diff] [blame] | 808 | @contextlib.contextmanager |
| 809 | def run_stream_with_retcode(*cmd, **kwargs): |
| 810 | """Runs a git command as context manager yielding stdout as a PIPE. |
| 811 | |
| 812 | stderr is dropped to avoid races if the process outputs to both stdout and |
| 813 | stderr. |
| 814 | |
| 815 | Raises subprocess2.CalledProcessError on nonzero return code. |
| 816 | """ |
Edward Lesmes | cf06cad | 2020-12-14 22:03:23 +0000 | [diff] [blame] | 817 | kwargs.setdefault('stderr', subprocess2.DEVNULL) |
tandrii@chromium.org | 6c14310 | 2015-06-11 19:21:02 +0000 | [diff] [blame] | 818 | kwargs.setdefault('stdout', subprocess2.PIPE) |
iannucci@chromium.org | 0d9e59c | 2016-01-09 08:08:41 +0000 | [diff] [blame] | 819 | kwargs.setdefault('shell', False) |
tandrii@chromium.org | 6c14310 | 2015-06-11 19:21:02 +0000 | [diff] [blame] | 820 | cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd |
| 821 | try: |
| 822 | proc = subprocess2.Popen(cmd, **kwargs) |
| 823 | yield proc.stdout |
| 824 | finally: |
| 825 | retcode = proc.wait() |
| 826 | if retcode != 0: |
| 827 | raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), |
Josip Sokcevic | 72f991f | 2020-04-23 18:53:30 +0000 | [diff] [blame] | 828 | b'', b'') |
tandrii@chromium.org | 6c14310 | 2015-06-11 19:21:02 +0000 | [diff] [blame] | 829 | |
| 830 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 831 | def run_with_stderr(*cmd, **kwargs): |
| 832 | """Runs a git command. |
| 833 | |
| 834 | Returns (stdout, stderr) as a pair of strings. |
| 835 | |
| 836 | kwargs |
| 837 | autostrip (bool) - Strip the output. Defaults to True. |
| 838 | indata (str) - Specifies stdin data for the process. |
| 839 | """ |
| 840 | kwargs.setdefault('stdin', subprocess2.PIPE) |
| 841 | kwargs.setdefault('stdout', subprocess2.PIPE) |
| 842 | kwargs.setdefault('stderr', subprocess2.PIPE) |
iannucci@chromium.org | 0d9e59c | 2016-01-09 08:08:41 +0000 | [diff] [blame] | 843 | kwargs.setdefault('shell', False) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 844 | autostrip = kwargs.pop('autostrip', True) |
| 845 | indata = kwargs.pop('indata', None) |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 846 | decode = kwargs.pop('decode', True) |
Orr Bernstein | b7e16d2 | 2023-07-14 11:00:55 +0000 | [diff] [blame] | 847 | accepted_retcodes = kwargs.pop('accepted_retcodes', [0]) |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 848 | |
iannucci@chromium.org | 2198002 | 2014-04-11 04:51:49 +0000 | [diff] [blame] | 849 | cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 850 | proc = subprocess2.Popen(cmd, **kwargs) |
| 851 | ret, err = proc.communicate(indata) |
| 852 | retcode = proc.wait() |
Orr Bernstein | b7e16d2 | 2023-07-14 11:00:55 +0000 | [diff] [blame] | 853 | if retcode not in accepted_retcodes: |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 854 | raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err) |
| 855 | |
| 856 | if autostrip: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 857 | ret = (ret or b'').strip() |
| 858 | err = (err or b'').strip() |
| 859 | |
| 860 | if decode: |
| 861 | ret = ret.decode('utf-8', 'replace') |
| 862 | err = err.decode('utf-8', 'replace') |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 863 | |
| 864 | return ret, err |
| 865 | |
| 866 | |
| 867 | def set_branch_config(branch, option, value, scope='local'): |
| 868 | set_config('branch.%s.%s' % (branch, option), value, scope=scope) |
| 869 | |
| 870 | |
| 871 | def set_config(option, value, scope='local'): |
| 872 | run('config', '--' + scope, option, value) |
| 873 | |
agable@chromium.org | d629fb4 | 2014-10-01 09:40:10 +0000 | [diff] [blame] | 874 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 875 | def get_dirty_files(): |
| 876 | # Make sure index is up-to-date before running diff-index. |
| 877 | run_with_retcode('update-index', '--refresh', '-q') |
Eli Ribble | 54434e7 | 2019-05-24 00:41:15 +0000 | [diff] [blame] | 878 | return run('diff-index', '--ignore-submodules', '--name-status', 'HEAD') |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 879 | |
| 880 | |
| 881 | def is_dirty_git_tree(cmd): |
iannucci | e38699b | 2016-08-15 17:32:31 -0700 | [diff] [blame] | 882 | w = lambda s: sys.stderr.write(s+"\n") |
| 883 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 884 | dirty = get_dirty_files() |
| 885 | if dirty: |
Josip Sokcevic | fcf9fc4 | 2022-09-27 21:59:01 +0000 | [diff] [blame] | 886 | w('Cannot %s with a dirty tree. Commit%s or stash your changes first.' % |
| 887 | (cmd, '' if cmd == 'upload' else ', freeze')) |
iannucci | e38699b | 2016-08-15 17:32:31 -0700 | [diff] [blame] | 888 | w('Uncommitted files: (git diff-index --name-status HEAD)') |
| 889 | w(dirty[:4096]) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 890 | if len(dirty) > 4096: # pragma: no cover |
iannucci | e38699b | 2016-08-15 17:32:31 -0700 | [diff] [blame] | 891 | w('... (run "git diff-index --name-status HEAD" to see full output).') |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 892 | return True |
| 893 | return False |
| 894 | |
| 895 | |
Greg NISBET | 923bcf8 | 2023-08-10 22:50:46 +0000 | [diff] [blame] | 896 | def status(ignore_submodules=None): |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 897 | """Returns a parsed version of git-status. |
| 898 | |
Greg NISBET | 923bcf8 | 2023-08-10 22:50:46 +0000 | [diff] [blame] | 899 | Args: |
| 900 | ignore_submodules (str|None): "all", "none", or None. |
| 901 | None is equivalent to "none". |
| 902 | |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 903 | Returns a generator of (current_name, (lstat, rstat, src)) pairs where: |
| 904 | * current_name is the name of the file |
| 905 | * lstat is the left status code letter from git-status |
| 906 | * rstat is the left status code letter from git-status |
| 907 | * src is the current name of the file, or the original name of the file |
| 908 | if lstat == 'R' |
| 909 | """ |
Greg NISBET | 923bcf8 | 2023-08-10 22:50:46 +0000 | [diff] [blame] | 910 | |
| 911 | ignore_submodules = ignore_submodules or 'none' |
| 912 | assert ignore_submodules in ( |
| 913 | 'all', 'none'), f'ignore_submodules value {ignore_submodules} is invalid' |
| 914 | |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 915 | stat_entry = collections.namedtuple('stat_entry', 'lstat rstat src') |
| 916 | |
| 917 | def tokenizer(stream): |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 918 | acc = BytesIO() |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 919 | c = None |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 920 | while c != b'': |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 921 | c = stream.read(1) |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 922 | if c in (None, b'', b'\0'): |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 923 | if len(acc.getvalue()) > 0: |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 924 | yield acc.getvalue() |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 925 | acc = BytesIO() |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 926 | else: |
| 927 | acc.write(c) |
| 928 | |
| 929 | def parser(tokens): |
| 930 | while True: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 931 | try: |
| 932 | status_dest = next(tokens).decode('utf-8') |
| 933 | except StopIteration: |
| 934 | return |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 935 | stat, dest = status_dest[:2], status_dest[3:] |
| 936 | lstat, rstat = stat |
| 937 | if lstat == 'R': |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 938 | src = next(tokens).decode('utf-8') |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 939 | else: |
| 940 | src = dest |
| 941 | yield (dest, stat_entry(lstat, rstat, src)) |
| 942 | |
Greg NISBET | 923bcf8 | 2023-08-10 22:50:46 +0000 | [diff] [blame] | 943 | return parser( |
| 944 | tokenizer( |
| 945 | run_stream('status', |
| 946 | '-z', |
| 947 | f'--ignore-submodules={ignore_submodules}', |
| 948 | bufsize=-1))) |
agable | 02b3c98 | 2016-06-22 07:51:22 -0700 | [diff] [blame] | 949 | |
| 950 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 951 | def squash_current_branch(header=None, merge_base=None): |
Alan Cutter | 0001782 | 2016-12-20 17:39:59 +1100 | [diff] [blame] | 952 | header = header or 'git squash commit for %s.' % current_branch() |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 953 | merge_base = merge_base or get_or_create_merge_base(current_branch()) |
| 954 | log_msg = header + '\n' |
| 955 | if log_msg: |
| 956 | log_msg += '\n' |
| 957 | log_msg += run('log', '--reverse', '--format=%H%n%B', '%s..HEAD' % merge_base) |
| 958 | run('reset', '--soft', merge_base) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 959 | |
| 960 | if not get_dirty_files(): |
| 961 | # Sometimes the squash can result in the same tree, meaning that there is |
| 962 | # nothing to commit at this point. |
Raul Tambre | c2f74c1 | 2019-03-19 05:55:53 +0000 | [diff] [blame] | 963 | print('Nothing to commit; squashed branch is empty') |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 964 | return False |
Edward Lemur | 71681bf | 2019-10-09 23:46:20 +0000 | [diff] [blame] | 965 | run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg.encode('utf-8')) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 966 | return True |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 967 | |
| 968 | |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 969 | def tags(*args): |
| 970 | return run('tag', *args).splitlines() |
| 971 | |
| 972 | |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 973 | def thaw(): |
| 974 | took_action = False |
Bruce Dawson | 4082f88 | 2023-05-15 17:14:17 +0000 | [diff] [blame] | 975 | with run_stream('rev-list', 'HEAD') as stream: |
| 976 | for sha in stream: |
| 977 | sha = sha.strip().decode('utf-8') |
| 978 | msg = run('show', '--format=%f%b', '-s', 'HEAD') |
| 979 | match = FREEZE_MATCHER.match(msg) |
| 980 | if not match: |
| 981 | if not took_action: |
| 982 | return 'Nothing to thaw.' |
| 983 | break |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 984 | |
Bruce Dawson | 4082f88 | 2023-05-15 17:14:17 +0000 | [diff] [blame] | 985 | run('reset', '--' + FREEZE_SECTIONS[match.group(1)], sha) |
| 986 | took_action = True |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 987 | |
| 988 | |
| 989 | def topo_iter(branch_tree, top_down=True): |
| 990 | """Generates (branch, parent) in topographical order for a branch tree. |
| 991 | |
| 992 | Given a tree: |
| 993 | |
| 994 | A1 |
| 995 | B1 B2 |
| 996 | C1 C2 C3 |
| 997 | D1 |
| 998 | |
| 999 | branch_tree would look like: { |
| 1000 | 'D1': 'C3', |
| 1001 | 'C3': 'B2', |
| 1002 | 'B2': 'A1', |
| 1003 | 'C1': 'B1', |
| 1004 | 'C2': 'B1', |
| 1005 | 'B1': 'A1', |
| 1006 | } |
| 1007 | |
| 1008 | It is OK to have multiple 'root' nodes in your graph. |
| 1009 | |
| 1010 | if top_down is True, items are yielded from A->D. Otherwise they're yielded |
| 1011 | from D->A. Within a layer the branches will be yielded in sorted order. |
| 1012 | """ |
| 1013 | branch_tree = branch_tree.copy() |
| 1014 | |
| 1015 | # TODO(iannucci): There is probably a more efficient way to do these. |
| 1016 | if top_down: |
| 1017 | while branch_tree: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 1018 | this_pass = [(b, p) for b, p in branch_tree.items() |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 1019 | if p not in branch_tree] |
| 1020 | assert this_pass, "Branch tree has cycles: %r" % branch_tree |
| 1021 | for branch, parent in sorted(this_pass): |
| 1022 | yield branch, parent |
| 1023 | del branch_tree[branch] |
| 1024 | else: |
| 1025 | parent_to_branches = collections.defaultdict(set) |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 1026 | for branch, parent in branch_tree.items(): |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 1027 | parent_to_branches[parent].add(branch) |
| 1028 | |
| 1029 | while branch_tree: |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 1030 | this_pass = [(b, p) for b, p in branch_tree.items() |
iannucci@chromium.org | c050a5b | 2014-03-26 06:18:50 +0000 | [diff] [blame] | 1031 | if not parent_to_branches[b]] |
| 1032 | assert this_pass, "Branch tree has cycles: %r" % branch_tree |
| 1033 | for branch, parent in sorted(this_pass): |
| 1034 | yield branch, parent |
| 1035 | parent_to_branches[parent].discard(branch) |
| 1036 | del branch_tree[branch] |
| 1037 | |
| 1038 | |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 1039 | def tree(treeref, recurse=False): |
| 1040 | """Returns a dict representation of a git tree object. |
| 1041 | |
| 1042 | Args: |
| 1043 | treeref (str) - a git ref which resolves to a tree (commits count as trees). |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 1044 | recurse (bool) - include all of the tree's descendants too. File names will |
iannucci@chromium.org | aa74cf6 | 2013-11-19 20:00:49 +0000 | [diff] [blame] | 1045 | take the form of 'some/path/to/file'. |
| 1046 | |
| 1047 | Return format: |
| 1048 | { 'file_name': (mode, type, ref) } |
| 1049 | |
| 1050 | mode is an integer where: |
| 1051 | * 0040000 - Directory |
| 1052 | * 0100644 - Regular non-executable file |
| 1053 | * 0100664 - Regular non-executable group-writeable file |
| 1054 | * 0100755 - Regular executable file |
| 1055 | * 0120000 - Symbolic link |
| 1056 | * 0160000 - Gitlink |
| 1057 | |
| 1058 | type is a string where it's one of 'blob', 'commit', 'tree', 'tag'. |
| 1059 | |
| 1060 | ref is the hex encoded hash of the entry. |
| 1061 | """ |
| 1062 | ret = {} |
| 1063 | opts = ['ls-tree', '--full-tree'] |
| 1064 | if recurse: |
| 1065 | opts.append('-r') |
| 1066 | opts.append(treeref) |
| 1067 | try: |
| 1068 | for line in run(*opts).splitlines(): |
| 1069 | mode, typ, ref, name = line.split(None, 3) |
| 1070 | ret[name] = (mode, typ, ref) |
| 1071 | except subprocess2.CalledProcessError: |
| 1072 | return None |
| 1073 | return ret |
| 1074 | |
| 1075 | |
Mun Yong Jang | 781e71e | 2017-10-25 15:46:20 -0700 | [diff] [blame] | 1076 | def get_remote_url(remote='origin'): |
| 1077 | try: |
| 1078 | return run('config', 'remote.%s.url' % remote) |
| 1079 | except subprocess2.CalledProcessError: |
| 1080 | return None |
| 1081 | |
| 1082 | |
iannucci@chromium.org | 8bc9b5c | 2014-03-12 01:36:18 +0000 | [diff] [blame] | 1083 | def upstream(branch): |
| 1084 | try: |
| 1085 | return run('rev-parse', '--abbrev-ref', '--symbolic-full-name', |
| 1086 | branch+'@{upstream}') |
| 1087 | except subprocess2.CalledProcessError: |
| 1088 | return None |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1089 | |
agable@chromium.org | d629fb4 | 2014-10-01 09:40:10 +0000 | [diff] [blame] | 1090 | |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1091 | def get_git_version(): |
| 1092 | """Returns a tuple that contains the numeric components of the current git |
| 1093 | version.""" |
| 1094 | version_string = run('--version') |
| 1095 | version_match = re.search(r'(\d+.)+(\d+)', version_string) |
| 1096 | version = version_match.group() if version_match else '' |
| 1097 | |
| 1098 | return tuple(int(x) for x in version.split('.')) |
| 1099 | |
| 1100 | |
calamity@chromium.org | 745ffa6 | 2014-09-08 01:03:19 +0000 | [diff] [blame] | 1101 | def get_branches_info(include_tracking_status): |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1102 | format_string = ( |
| 1103 | '--format=%(refname:short):%(objectname:short):%(upstream:short):') |
| 1104 | |
| 1105 | # This is not covered by the depot_tools CQ which only has git version 1.8. |
calamity@chromium.org | 745ffa6 | 2014-09-08 01:03:19 +0000 | [diff] [blame] | 1106 | if (include_tracking_status and |
| 1107 | get_git_version() >= MIN_UPSTREAM_TRACK_GIT_VERSION): # pragma: no cover |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1108 | format_string += '%(upstream:track)' |
| 1109 | |
| 1110 | info_map = {} |
| 1111 | data = run('for-each-ref', format_string, 'refs/heads') |
calamity@chromium.org | 745ffa6 | 2014-09-08 01:03:19 +0000 | [diff] [blame] | 1112 | BranchesInfo = collections.namedtuple( |
Gavin Mak | 8d7201b | 2020-09-17 19:21:38 +0000 | [diff] [blame] | 1113 | 'BranchesInfo', 'hash upstream commits behind') |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1114 | for line in data.splitlines(): |
| 1115 | (branch, branch_hash, upstream_branch, tracking_status) = line.split(':') |
| 1116 | |
Gavin Mak | 8d7201b | 2020-09-17 19:21:38 +0000 | [diff] [blame] | 1117 | commits = None |
Antonio Sartori | e0dff20 | 2021-02-18 06:33:50 +0000 | [diff] [blame] | 1118 | if include_tracking_status: |
| 1119 | base = get_or_create_merge_base(branch) |
| 1120 | if base: |
| 1121 | commits_list = run('rev-list', '--count', branch, '^%s' % base, '--') |
| 1122 | commits = int(commits_list) or None |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1123 | |
| 1124 | behind_match = re.search(r'behind (\d+)', tracking_status) |
| 1125 | behind = int(behind_match.group(1)) if behind_match else None |
| 1126 | |
calamity@chromium.org | 745ffa6 | 2014-09-08 01:03:19 +0000 | [diff] [blame] | 1127 | info_map[branch] = BranchesInfo( |
Robert Iannucci | d3acb16 | 2021-05-04 21:37:40 +0000 | [diff] [blame] | 1128 | hash=branch_hash, upstream=upstream_branch, commits=commits, |
Gavin Mak | 8d7201b | 2020-09-17 19:21:38 +0000 | [diff] [blame] | 1129 | behind=behind) |
calamity@chromium.org | 9d2c880 | 2014-09-03 02:04:46 +0000 | [diff] [blame] | 1130 | |
| 1131 | # Set None for upstreams which are not branches (e.g empty upstream, remotes |
| 1132 | # and deleted upstream branches). |
| 1133 | missing_upstreams = {} |
| 1134 | for info in info_map.values(): |
| 1135 | if info.upstream not in info_map and info.upstream not in missing_upstreams: |
| 1136 | missing_upstreams[info.upstream] = None |
| 1137 | |
Edward Lemur | 12a537f | 2019-10-03 21:57:15 +0000 | [diff] [blame] | 1138 | result = info_map.copy() |
| 1139 | result.update(missing_upstreams) |
| 1140 | return result |
sammc@chromium.org | 900a33f | 2015-09-29 06:57:09 +0000 | [diff] [blame] | 1141 | |
| 1142 | |
| 1143 | def make_workdir_common(repository, new_workdir, files_to_symlink, |
scottmg@chromium.org | d4218d4 | 2015-10-07 23:49:20 +0000 | [diff] [blame] | 1144 | files_to_copy, symlink=None): |
| 1145 | if not symlink: |
| 1146 | symlink = os.symlink |
sammc@chromium.org | 900a33f | 2015-09-29 06:57:09 +0000 | [diff] [blame] | 1147 | os.makedirs(new_workdir) |
| 1148 | for entry in files_to_symlink: |
scottmg@chromium.org | d4218d4 | 2015-10-07 23:49:20 +0000 | [diff] [blame] | 1149 | clone_file(repository, new_workdir, entry, symlink) |
sammc@chromium.org | 900a33f | 2015-09-29 06:57:09 +0000 | [diff] [blame] | 1150 | for entry in files_to_copy: |
| 1151 | clone_file(repository, new_workdir, entry, shutil.copy) |
| 1152 | |
| 1153 | |
| 1154 | def make_workdir(repository, new_workdir): |
| 1155 | GIT_DIRECTORY_WHITELIST = [ |
| 1156 | 'config', |
| 1157 | 'info', |
| 1158 | 'hooks', |
| 1159 | 'logs/refs', |
| 1160 | 'objects', |
| 1161 | 'packed-refs', |
| 1162 | 'refs', |
| 1163 | 'remotes', |
| 1164 | 'rr-cache', |
Richard He | 42033b2 | 2020-05-22 03:03:45 +0000 | [diff] [blame] | 1165 | 'shallow', |
sammc@chromium.org | 900a33f | 2015-09-29 06:57:09 +0000 | [diff] [blame] | 1166 | ] |
| 1167 | make_workdir_common(repository, new_workdir, GIT_DIRECTORY_WHITELIST, |
| 1168 | ['HEAD']) |
| 1169 | |
| 1170 | |
| 1171 | def clone_file(repository, new_workdir, link, operation): |
| 1172 | if not os.path.exists(os.path.join(repository, link)): |
| 1173 | return |
| 1174 | link_dir = os.path.dirname(os.path.join(new_workdir, link)) |
| 1175 | if not os.path.exists(link_dir): |
| 1176 | os.makedirs(link_dir) |
Henrique Ferreiro | fd4ad24 | 2018-01-10 12:19:18 +0100 | [diff] [blame] | 1177 | src = os.path.join(repository, link) |
| 1178 | if os.path.islink(src): |
Henrique Ferreiro | aea45d2 | 2018-02-19 09:48:36 +0100 | [diff] [blame] | 1179 | src = os.path.realpath(src) |
Henrique Ferreiro | fd4ad24 | 2018-01-10 12:19:18 +0100 | [diff] [blame] | 1180 | operation(src, os.path.join(new_workdir, link)) |