blob: 83092258d60d94af00347671e54b8de979e62654 [file] [log] [blame]
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +00001# Copyright 2014 The Chromium Authors. All rights reserved.
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +00002# 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 Tambrec2f74c12019-03-19 05:55:53 +00007
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +00008import multiprocessing.pool
Josip Sokcevicde6c4562020-03-26 00:39:42 +00009import sys
10import threading
11
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000012from multiprocessing.pool import IMapIterator
Josip Sokcevicde6c4562020-03-26 00:39:42 +000013
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000014def wrapper(func):
15 def wrap(self, timeout=None):
Josip Sokcevicde6c4562020-03-26 00:39:42 +000016 default_timeout = (1 << 31 if sys.version_info.major == 2 else
17 threading.TIMEOUT_MAX)
18 return func(self, timeout=timeout or default_timeout)
19
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000020 return wrap
21IMapIterator.next = wrapper(IMapIterator.next)
22IMapIterator.__next__ = IMapIterator.next
23# TODO(iannucci): Monkeypatch all other 'wait' methods too.
24
25
26import binascii
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +000027import collections
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000028import contextlib
29import functools
30import logging
iannucci@chromium.org97345eb2014-03-13 07:55:15 +000031import os
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +000032import re
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000033import setup_color
sammc@chromium.org900a33f2015-09-29 06:57:09 +000034import shutil
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000035import signal
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000036import tempfile
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +000037import textwrap
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000038
39import subprocess2
40
Raul Tambrec2f74c12019-03-19 05:55:53 +000041from io import BytesIO
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000042
agable02b3c982016-06-22 07:51:22 -070043
44ROOT = os.path.abspath(os.path.dirname(__file__))
iannucci@chromium.org0d9e59c2016-01-09 08:08:41 +000045IS_WIN = sys.platform == 'win32'
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +000046TEST_MODE = False
47
Dan Jacques209a6812017-07-12 11:40:20 -070048
49def win_find_git():
50 for elem in os.environ.get('PATH', '').split(os.pathsep):
51 for candidate in ('git.exe', 'git.bat'):
52 path = os.path.join(elem, candidate)
53 if os.path.isfile(path):
54 return path
55 raise ValueError('Could not find Git on PATH.')
56
57
58GIT_EXE = 'git' if not IS_WIN else win_find_git()
59
60
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +000061FREEZE = 'FREEZE'
62FREEZE_SECTIONS = {
63 'indexed': 'soft',
64 'unindexed': 'mixed'
65}
66FREEZE_MATCHER = re.compile(r'%s.(%s)' % (FREEZE, '|'.join(FREEZE_SECTIONS)))
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +000067
68
Dan Jacques2f8b0c12017-04-05 12:57:21 -070069# NOTE: This list is DEPRECATED in favor of the Infra Git wrapper:
Josip Sokcevic9c0dc302020-11-20 18:41:25 +000070# https://chromium.googlesource.com/infra/infra/+/HEAD/go/src/infra/tools/git
Dan Jacques2f8b0c12017-04-05 12:57:21 -070071#
72# New entries should be added to the Git wrapper, NOT to this list. "git_retry"
73# is, similarly, being deprecated in favor of the Git wrapper.
74#
75# ---
76#
dnj@chromium.orgde219ec2014-07-28 17:39:08 +000077# Retry a git operation if git returns a error response with any of these
78# messages. It's all observed 'bad' GoB responses so far.
79#
80# This list is inspired/derived from the one in ChromiumOS's Chromite:
81# <CHROMITE>/lib/git.py::GIT_TRANSIENT_ERRORS
82#
83# It was last imported from '7add3ac29564d98ac35ce426bc295e743e7c0c02'.
84GIT_TRANSIENT_ERRORS = (
85 # crbug.com/285832
iannucci@chromium.org6e95d402014-08-29 22:10:55 +000086 r'!.*\[remote rejected\].*\(error in hook\)',
dnj@chromium.orgde219ec2014-07-28 17:39:08 +000087
88 # crbug.com/289932
iannucci@chromium.org6e95d402014-08-29 22:10:55 +000089 r'!.*\[remote rejected\].*\(failed to lock\)',
dnj@chromium.orgde219ec2014-07-28 17:39:08 +000090
91 # crbug.com/307156
iannucci@chromium.org6e95d402014-08-29 22:10:55 +000092 r'!.*\[remote rejected\].*\(error in Gerrit backend\)',
dnj@chromium.orgde219ec2014-07-28 17:39:08 +000093
94 # crbug.com/285832
95 r'remote error: Internal Server Error',
96
97 # crbug.com/294449
98 r'fatal: Couldn\'t find remote ref ',
99
100 # crbug.com/220543
101 r'git fetch_pack: expected ACK/NAK, got',
102
103 # crbug.com/189455
104 r'protocol error: bad pack header',
105
106 # crbug.com/202807
107 r'The remote end hung up unexpectedly',
108
109 # crbug.com/298189
110 r'TLS packet with unexpected length was received',
111
112 # crbug.com/187444
113 r'RPC failed; result=\d+, HTTP code = \d+',
114
dnj@chromium.orgde219ec2014-07-28 17:39:08 +0000115 # crbug.com/388876
116 r'Connection timed out',
dnj@chromium.org45cddd62014-11-06 19:36:42 +0000117
118 # crbug.com/430343
119 # TODO(dnj): Resync with Chromite.
120 r'The requested URL returned error: 5\d+',
Arikonb3a21482016-07-22 10:12:24 -0700121
122 r'Connection reset by peer',
123
124 r'Unable to look up',
125
126 r'Couldn\'t resolve host',
dnj@chromium.orgde219ec2014-07-28 17:39:08 +0000127)
128
129GIT_TRANSIENT_ERRORS_RE = re.compile('|'.join(GIT_TRANSIENT_ERRORS),
130 re.IGNORECASE)
131
raphael.kubo.da.costa@intel.com58d05b02015-06-24 08:54:41 +0000132# git's for-each-ref command first supported the upstream:track token in its
133# format string in version 1.9.0, but some usages were broken until 2.3.0.
134# See git commit b6160d95 for more information.
135MIN_UPSTREAM_TRACK_GIT_VERSION = (2, 3)
dnj@chromium.orgde219ec2014-07-28 17:39:08 +0000136
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000137class BadCommitRefException(Exception):
138 def __init__(self, refs):
139 msg = ('one of %s does not seem to be a valid commitref.' %
140 str(refs))
141 super(BadCommitRefException, self).__init__(msg)
142
143
144def memoize_one(**kwargs):
145 """Memoizes a single-argument pure function.
146
147 Values of None are not cached.
148
149 Kwargs:
150 threadsafe (bool) - REQUIRED. Specifies whether to use locking around
151 cache manipulation functions. This is a kwarg so that users of memoize_one
152 are forced to explicitly and verbosely pick True or False.
153
154 Adds three methods to the decorated function:
155 * get(key, default=None) - Gets the value for this key from the cache.
156 * set(key, value) - Sets the value for this key from the cache.
157 * clear() - Drops the entire contents of the cache. Useful for unittests.
158 * update(other) - Updates the contents of the cache from another dict.
159 """
160 assert 'threadsafe' in kwargs, 'Must specify threadsafe={True,False}'
161 threadsafe = kwargs['threadsafe']
162
163 if threadsafe:
164 def withlock(lock, f):
165 def inner(*args, **kwargs):
166 with lock:
167 return f(*args, **kwargs)
168 return inner
169 else:
170 def withlock(_lock, f):
171 return f
172
173 def decorator(f):
174 # Instantiate the lock in decorator, in case users of memoize_one do:
175 #
176 # memoizer = memoize_one(threadsafe=True)
177 #
178 # @memoizer
179 # def fn1(val): ...
180 #
181 # @memoizer
182 # def fn2(val): ...
183
184 lock = threading.Lock() if threadsafe else None
185 cache = {}
186 _get = withlock(lock, cache.get)
187 _set = withlock(lock, cache.__setitem__)
188
189 @functools.wraps(f)
190 def inner(arg):
191 ret = _get(arg)
192 if ret is None:
193 ret = f(arg)
194 if ret is not None:
195 _set(arg, ret)
196 return ret
197 inner.get = _get
198 inner.set = _set
199 inner.clear = withlock(lock, cache.clear)
200 inner.update = withlock(lock, cache.update)
201 return inner
202 return decorator
203
204
205def _ScopedPool_initer(orig, orig_args): # pragma: no cover
206 """Initializer method for ScopedPool's subprocesses.
207
208 This helps ScopedPool handle Ctrl-C's correctly.
209 """
210 signal.signal(signal.SIGINT, signal.SIG_IGN)
211 if orig:
212 orig(*orig_args)
213
214
215@contextlib.contextmanager
216def ScopedPool(*args, **kwargs):
217 """Context Manager which returns a multiprocessing.pool instance which
218 correctly deals with thrown exceptions.
219
220 *args - Arguments to multiprocessing.pool
221
222 Kwargs:
223 kind ('threads', 'procs') - The type of underlying coprocess to use.
224 **etc - Arguments to multiprocessing.pool
225 """
226 if kwargs.pop('kind', None) == 'threads':
227 pool = multiprocessing.pool.ThreadPool(*args, **kwargs)
228 else:
229 orig, orig_args = kwargs.get('initializer'), kwargs.get('initargs', ())
230 kwargs['initializer'] = _ScopedPool_initer
231 kwargs['initargs'] = orig, orig_args
232 pool = multiprocessing.pool.Pool(*args, **kwargs)
233
234 try:
235 yield pool
236 pool.close()
237 except:
238 pool.terminate()
239 raise
240 finally:
241 pool.join()
242
243
244class ProgressPrinter(object):
245 """Threaded single-stat status message printer."""
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000246 def __init__(self, fmt, enabled=None, fout=sys.stderr, period=0.5):
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000247 """Create a ProgressPrinter.
248
249 Use it as a context manager which produces a simple 'increment' method:
250
251 with ProgressPrinter('(%%(count)d/%d)' % 1000) as inc:
252 for i in xrange(1000):
253 # do stuff
254 if i % 10 == 0:
255 inc(10)
256
257 Args:
258 fmt - String format with a single '%(count)d' where the counter value
259 should go.
260 enabled (bool) - If this is None, will default to True if
261 logging.getLogger() is set to INFO or more verbose.
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000262 fout (file-like) - The stream to print status messages to.
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000263 period (float) - The time in seconds for the printer thread to wait
264 between printing.
265 """
266 self.fmt = fmt
267 if enabled is None: # pragma: no cover
268 self.enabled = logging.getLogger().isEnabledFor(logging.INFO)
269 else:
270 self.enabled = enabled
271
272 self._count = 0
273 self._dead = False
274 self._dead_cond = threading.Condition()
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000275 self._stream = fout
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000276 self._thread = threading.Thread(target=self._run)
277 self._period = period
278
279 def _emit(self, s):
280 if self.enabled:
281 self._stream.write('\r' + s)
282 self._stream.flush()
283
284 def _run(self):
285 with self._dead_cond:
286 while not self._dead:
287 self._emit(self.fmt % {'count': self._count})
288 self._dead_cond.wait(self._period)
289 self._emit((self.fmt + '\n') % {'count': self._count})
290
291 def inc(self, amount=1):
292 self._count += amount
293
294 def __enter__(self):
295 self._thread.start()
296 return self.inc
297
298 def __exit__(self, _exc_type, _exc_value, _traceback):
299 self._dead = True
300 with self._dead_cond:
301 self._dead_cond.notifyAll()
302 self._thread.join()
303 del self._thread
304
305
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000306def once(function):
307 """@Decorates |function| so that it only performs its action once, no matter
308 how many times the decorated |function| is called."""
Edward Lemur12a537f2019-10-03 21:57:15 +0000309 has_run = [False]
310 def _wrapper(*args, **kwargs):
311 if not has_run[0]:
312 has_run[0] = True
313 function(*args, **kwargs)
314 return _wrapper
315
316
317def unicode_repr(s):
318 result = repr(s)
319 return result[1:] if result.startswith('u') else result
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000320
321
322## Git functions
323
agable7aa2ddd2016-06-21 07:47:00 -0700324def die(message, *args):
Raul Tambrec2f74c12019-03-19 05:55:53 +0000325 print(textwrap.dedent(message % args), file=sys.stderr)
agable7aa2ddd2016-06-21 07:47:00 -0700326 sys.exit(1)
327
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000328
Mark Mentovaif548d082017-03-08 13:32:00 -0500329def blame(filename, revision=None, porcelain=False, abbrev=None, *_args):
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000330 command = ['blame']
331 if porcelain:
332 command.append('-p')
333 if revision is not None:
334 command.append(revision)
Mark Mentovaif548d082017-03-08 13:32:00 -0500335 if abbrev is not None:
336 command.append('--abbrev=%d' % abbrev)
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000337 command.extend(['--', filename])
338 return run(*command)
339
340
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000341def branch_config(branch, option, default=None):
agable7aa2ddd2016-06-21 07:47:00 -0700342 return get_config('branch.%s.%s' % (branch, option), default=default)
iannucci@chromium.org0d9e59c2016-01-09 08:08:41 +0000343
344
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000345def branch_config_map(option):
346 """Return {branch: <|option| value>} for all branches."""
347 try:
348 reg = re.compile(r'^branch\.(.*)\.%s$' % option)
agable7aa2ddd2016-06-21 07:47:00 -0700349 lines = get_config_regexp(reg.pattern)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000350 return {reg.match(k).group(1): v for k, v in (l.split() for l in lines)}
351 except subprocess2.CalledProcessError:
352 return {}
353
354
Francois Dorayd42c6812017-05-30 15:10:20 -0400355def branches(use_limit=True, *args):
akuegel@chromium.org58888e12015-06-09 15:26:37 +0000356 NO_BRANCH = ('* (no branch', '* (detached', '* (HEAD detached')
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +0000357
358 key = 'depot-tools.branch-limit'
agable7aa2ddd2016-06-21 07:47:00 -0700359 limit = get_config_int(key, 20)
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +0000360
361 raw_branches = run('branch', *args).splitlines()
362
363 num = len(raw_branches)
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +0000364
Francois Dorayd42c6812017-05-30 15:10:20 -0400365 if use_limit and num > limit:
agable7aa2ddd2016-06-21 07:47:00 -0700366 die("""\
367 Your git repo has too many branches (%d/%d) for this tool to work well.
368
369 You may adjust this limit by running:
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +0000370 git config %s <new_limit>
agable7aa2ddd2016-06-21 07:47:00 -0700371
372 You may also try cleaning up your old branches by running:
373 git cl archive
374 """, num, limit, key)
iannucci@chromium.org3f23cdf2014-04-15 20:02:44 +0000375
376 for line in raw_branches:
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +0000377 if line.startswith(NO_BRANCH):
378 continue
379 yield line.split()[-1]
380
381
agable7aa2ddd2016-06-21 07:47:00 -0700382def get_config(option, default=None):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000383 try:
384 return run('config', '--get', option) or default
385 except subprocess2.CalledProcessError:
386 return default
387
388
agable7aa2ddd2016-06-21 07:47:00 -0700389def get_config_int(option, default=0):
390 assert isinstance(default, int)
391 try:
392 return int(get_config(option, default))
393 except ValueError:
394 return default
395
396
397def get_config_list(option):
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +0000398 try:
399 return run('config', '--get-all', option).split()
400 except subprocess2.CalledProcessError:
401 return []
402
403
agable7aa2ddd2016-06-21 07:47:00 -0700404def get_config_regexp(pattern):
405 if IS_WIN: # pragma: no cover
406 # this madness is because we call git.bat which calls git.exe which calls
407 # bash.exe (or something to that effect). Each layer divides the number of
408 # ^'s by 2.
409 pattern = pattern.replace('^', '^' * 8)
410 return run('config', '--get-regexp', pattern).splitlines()
411
412
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +0000413def current_branch():
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000414 try:
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000415 return run('rev-parse', '--abbrev-ref', 'HEAD')
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000416 except subprocess2.CalledProcessError:
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000417 return None
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000418
419
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000420def del_branch_config(branch, option, scope='local'):
421 del_config('branch.%s.%s' % (branch, option), scope=scope)
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000422
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000423
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000424def del_config(option, scope='local'):
425 try:
426 run('config', '--' + scope, '--unset', option)
427 except subprocess2.CalledProcessError:
428 pass
429
430
mgiuca@chromium.org01d2cde2016-02-05 03:25:41 +0000431def diff(oldrev, newrev, *args):
432 return run('diff', oldrev, newrev, *args)
433
434
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000435def freeze():
436 took_action = False
agable02b3c982016-06-22 07:51:22 -0700437 key = 'depot-tools.freeze-size-limit'
438 MB = 2**20
439 limit_mb = get_config_int(key, 100)
440 untracked_bytes = 0
441
iannuccieaca0332016-08-03 16:46:50 -0700442 root_path = repo_root()
443
Robert Iannucci4e87f5b2023-07-13 19:51:33 +0000444 # unindexed tracks all the files which are unindexed but we want to add to
445 # the `FREEZE.unindexed` commit.
446 unindexed = []
447
448 # will be set to true if there are any indexed files to commit.
449 have_indexed_files = False
450
agable02b3c982016-06-22 07:51:22 -0700451 for f, s in status():
452 if is_unmerged(s):
453 die("Cannot freeze unmerged changes!")
Robert Iannucci4e87f5b2023-07-13 19:51:33 +0000454 if s.lstat not in ' ?':
455 # This covers all changes to indexed files.
456 # lstat = ' ' means that the file is tracked and modified, but wasn't
457 # added yet.
458 # lstat = '?' means that the file is untracked.
459 have_indexed_files = True
460 else:
461 unindexed.append(f.encode('utf-8'))
462 if s.lstat == '?' and limit_mb > 0:
463 untracked_bytes += os.lstat(os.path.join(root_path, f)).st_size
464
Bruce Dawson4bff3fd2018-01-04 14:44:23 -0800465 if limit_mb > 0 and untracked_bytes > limit_mb * MB:
466 die("""\
467 You appear to have too much untracked+unignored data in your git
468 checkout: %.1f / %d MB.
agable02b3c982016-06-22 07:51:22 -0700469
Bruce Dawson4bff3fd2018-01-04 14:44:23 -0800470 Run `git status` to see what it is.
agable02b3c982016-06-22 07:51:22 -0700471
Bruce Dawson4bff3fd2018-01-04 14:44:23 -0800472 In addition to making many git commands slower, this will prevent
473 depot_tools from freezing your in-progress changes.
agable02b3c982016-06-22 07:51:22 -0700474
Bruce Dawson4bff3fd2018-01-04 14:44:23 -0800475 You should add untracked data that you want to ignore to your repo's
476 .git/info/exclude
477 file. See `git help ignore` for the format of this file.
agable02b3c982016-06-22 07:51:22 -0700478
Quinten Yearsley925cedb2020-04-13 17:49:39 +0000479 If this data is intended as part of your commit, you may adjust the
Bruce Dawson4bff3fd2018-01-04 14:44:23 -0800480 freeze limit by running:
481 git config %s <new_limit>
482 Where <new_limit> is an integer threshold in megabytes.""",
483 untracked_bytes / (MB * 1.0), limit_mb, key)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000484
Robert Iannucci4e87f5b2023-07-13 19:51:33 +0000485 if have_indexed_files:
486 try:
487 run('commit', '--no-verify', '-m', f'{FREEZE}.indexed')
488 took_action = True
489 except subprocess2.CalledProcessError:
490 pass
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000491
agable96e179b2016-06-24 10:32:51 -0700492 add_errors = False
Robert Iannucci4e87f5b2023-07-13 19:51:33 +0000493 if unindexed:
494 try:
495 run('add',
496 '--pathspec-from-file',
497 '-',
498 '--ignore-errors',
499 indata=b'\n'.join(unindexed))
500 except subprocess2.CalledProcessError:
501 add_errors = True
agable96e179b2016-06-24 10:32:51 -0700502
Robert Iannucci4e87f5b2023-07-13 19:51:33 +0000503 try:
504 run('commit', '--no-verify', '-m', f'{FREEZE}.unindexed')
505 took_action = True
506 except subprocess2.CalledProcessError:
507 pass
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000508
agable96e179b2016-06-24 10:32:51 -0700509 ret = []
510 if add_errors:
511 ret.append('Failed to index some unindexed files.')
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000512 if not took_action:
agable96e179b2016-06-24 10:32:51 -0700513 ret.append('Nothing to freeze.')
514 return ' '.join(ret) or None
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000515
516
Gavin Mak2cbe95c2023-03-06 22:39:56 +0000517def get_branch_tree(use_limit=False):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000518 """Get the dictionary of {branch: parent}, compatible with topo_iter.
519
520 Returns a tuple of (skipped, <branch_tree dict>) where skipped is a set of
521 branches without upstream branches defined.
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000522 """
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000523 skipped = set()
524 branch_tree = {}
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000525
Gavin Mak2cbe95c2023-03-06 22:39:56 +0000526 for branch in branches(use_limit=use_limit):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000527 parent = upstream(branch)
528 if not parent:
529 skipped.add(branch)
530 continue
531 branch_tree[branch] = parent
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000532
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000533 return skipped, branch_tree
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000534
535
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000536def get_or_create_merge_base(branch, parent=None):
537 """Finds the configured merge base for branch.
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000538
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000539 If parent is supplied, it's used instead of calling upstream(branch).
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000540 """
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000541 base = branch_config(branch, 'base')
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000542 base_upstream = branch_config(branch, 'base-upstream')
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000543 parent = parent or upstream(branch)
sbc@chromium.org79706062015-01-14 21:18:12 +0000544 if parent is None or branch is None:
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000545 return None
Josip Sokcevica3d1aaf2021-07-16 18:26:45 +0000546 actual_merge_base = run('merge-base', parent, branch)
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000547
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000548 if base_upstream != parent:
549 base = None
550 base_upstream = None
551
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000552 def is_ancestor(a, b):
553 return run_with_retcode('merge-base', '--is-ancestor', a, b) == 0
554
clemensh@chromium.orgc3fe99d2016-04-19 08:39:55 +0000555 if base and base != actual_merge_base:
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000556 if not is_ancestor(base, branch):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000557 logging.debug('Found WRONG pre-set merge-base for %s: %s', branch, base)
558 base = None
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000559 elif is_ancestor(base, actual_merge_base):
560 logging.debug('Found OLD pre-set merge-base for %s: %s', branch, base)
561 base = None
562 else:
563 logging.debug('Found pre-set merge-base for %s: %s', branch, base)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000564
565 if not base:
iannucci@chromium.orgedeaa812014-03-26 21:27:47 +0000566 base = actual_merge_base
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000567 manual_merge_base(branch, base, parent)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000568
569 return base
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000570
571
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000572def hash_multi(*reflike):
573 return run('rev-parse', *reflike).splitlines()
iannucci@chromium.org97345eb2014-03-13 07:55:15 +0000574
575
calamity@chromium.org9d2c8802014-09-03 02:04:46 +0000576def hash_one(reflike, short=False):
577 args = ['rev-parse', reflike]
578 if short:
579 args.insert(1, '--short')
580 return run(*args)
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +0000581
582
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000583def in_rebase():
584 git_dir = run('rev-parse', '--git-dir')
585 return (
586 os.path.exists(os.path.join(git_dir, 'rebase-merge')) or
587 os.path.exists(os.path.join(git_dir, 'rebase-apply')))
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +0000588
589
590def intern_f(f, kind='blob'):
591 """Interns a file object into the git object store.
592
593 Args:
594 f (file-like object) - The file-like object to intern
595 kind (git object type) - One of 'blob', 'commit', 'tree', 'tag'.
596
597 Returns the git hash of the interned object (hex encoded).
598 """
599 ret = run('hash-object', '-t', kind, '-w', '--stdin', stdin=f)
600 f.close()
601 return ret
602
603
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000604def is_dormant(branch):
605 # TODO(iannucci): Do an oldness check?
606 return branch_config(branch, 'dormant', 'false') != 'false'
607
608
agable02b3c982016-06-22 07:51:22 -0700609def is_unmerged(stat_value):
610 return (
611 'U' in (stat_value.lstat, stat_value.rstat) or
612 ((stat_value.lstat == stat_value.rstat) and stat_value.lstat in 'AD')
613 )
614
615
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000616def manual_merge_base(branch, base, parent):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000617 set_branch_config(branch, 'base', base)
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000618 set_branch_config(branch, 'base-upstream', parent)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000619
620
621def mktree(treedict):
622 """Makes a git tree object and returns its hash.
623
624 See |tree()| for the values of mode, type, and ref.
625
626 Args:
627 treedict - { name: (mode, type, ref) }
628 """
629 with tempfile.TemporaryFile() as f:
Edward Lemur12a537f2019-10-03 21:57:15 +0000630 for name, (mode, typ, ref) in treedict.items():
Edward Lemur71681bf2019-10-09 23:46:20 +0000631 f.write(('%s %s %s\t%s\0' % (mode, typ, ref, name)).encode('utf-8'))
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000632 f.seek(0)
633 return run('mktree', '-z', stdin=f)
634
635
636def parse_commitrefs(*commitrefs):
637 """Returns binary encoded commit hashes for one or more commitrefs.
638
639 A commitref is anything which can resolve to a commit. Popular examples:
640 * 'HEAD'
Josip Sokcevic9c0dc302020-11-20 18:41:25 +0000641 * 'origin/main'
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000642 * 'cool_branch~2'
643 """
644 try:
Edward Lemur12a537f2019-10-03 21:57:15 +0000645 return [binascii.unhexlify(h) for h in hash_multi(*commitrefs)]
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000646 except subprocess2.CalledProcessError:
647 raise BadCommitRefException(commitrefs)
648
649
sbc@chromium.org384039b2014-10-13 21:01:00 +0000650RebaseRet = collections.namedtuple('RebaseRet', 'success stdout stderr')
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000651
652
Robert Iannuccid3acb162021-05-04 21:37:40 +0000653def rebase(parent, start, branch, abort=False, allow_gc=False):
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000654 """Rebases |start|..|branch| onto the branch |parent|.
655
Robert Iannuccid3acb162021-05-04 21:37:40 +0000656 Sets 'gc.auto=0' for the duration of this call to prevent the rebase from
657 running a potentially slow garbage collection cycle.
658
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000659 Args:
660 parent - The new parent ref for the rebased commits.
661 start - The commit to start from
662 branch - The branch to rebase
663 abort - If True, will call git-rebase --abort in the event that the rebase
664 doesn't complete successfully.
Robert Iannuccid3acb162021-05-04 21:37:40 +0000665 allow_gc - If True, sets "-c gc.auto=1" on the rebase call, rather than
666 "-c gc.auto=0". Usually if you're doing a series of rebases,
667 you'll only want to run a single gc pass at the end of all the
668 rebase activity.
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000669
670 Returns a namedtuple with fields:
671 success - a boolean indicating that the rebase command completed
672 successfully.
673 message - if the rebase failed, this contains the stdout of the failed
674 rebase.
675 """
676 try:
Robert Iannuccid3acb162021-05-04 21:37:40 +0000677 args = [
678 '-c', 'gc.auto={}'.format('1' if allow_gc else '0'),
679 'rebase',
680 ]
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000681 if TEST_MODE:
Robert Iannuccid3acb162021-05-04 21:37:40 +0000682 args.append('--committer-date-is-author-date')
683 args += [
684 '--onto', parent, start, branch,
685 ]
686 run(*args)
sbc@chromium.org384039b2014-10-13 21:01:00 +0000687 return RebaseRet(True, '', '')
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000688 except subprocess2.CalledProcessError as cpe:
689 if abort:
iannucci@chromium.orgdabb78b2015-06-11 23:17:28 +0000690 run_with_retcode('rebase', '--abort') # ignore failure
Josip Sokcevic72f991f2020-04-23 18:53:30 +0000691 return RebaseRet(False, cpe.stdout.decode('utf-8', 'replace'),
692 cpe.stderr.decode('utf-8', 'replace'))
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000693
694
695def remove_merge_base(branch):
696 del_branch_config(branch, 'base')
iannucci@chromium.org10fbe872014-05-16 22:31:13 +0000697 del_branch_config(branch, 'base-upstream')
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000698
699
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000700def repo_root():
701 """Returns the absolute path to the repository root."""
702 return run('rev-parse', '--show-toplevel')
703
704
Jeffrey Yasskin6b52dc22019-12-06 18:32:21 +0000705def upstream_default():
706 """Returns the default branch name of the origin repository."""
707 try:
Josip Sokcevic06423732021-03-31 19:04:42 +0000708 ret = run('rev-parse', '--abbrev-ref', 'origin/HEAD')
709 # Detect if the repository migrated to main branch
710 if ret == 'origin/master':
711 try:
712 ret = run('rev-parse', '--abbrev-ref', 'origin/main')
713 run('remote', 'set-head', '-a', 'origin')
714 ret = run('rev-parse', '--abbrev-ref', 'origin/HEAD')
715 except subprocess2.CalledProcessError:
716 pass
717 return ret
Jeffrey Yasskin6b52dc22019-12-06 18:32:21 +0000718 except subprocess2.CalledProcessError:
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000719 return 'origin/main'
Jeffrey Yasskin6b52dc22019-12-06 18:32:21 +0000720
721
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000722def root():
Jeffrey Yasskin6b52dc22019-12-06 18:32:21 +0000723 return get_config('depot-tools.upstream', upstream_default())
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000724
725
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000726@contextlib.contextmanager
727def less(): # pragma: no cover
728 """Runs 'less' as context manager yielding its stdin as a PIPE.
729
730 Automatically checks if sys.stdout is a non-TTY stream. If so, it avoids
731 running less and just yields sys.stdout.
Edward Lemur0d462e92020-01-08 20:11:31 +0000732
733 The returned PIPE is opened on binary mode.
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000734 """
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +0000735 if not setup_color.IS_TTY:
Edward Lemur5e94b802019-11-26 21:44:08 +0000736 # On Python 3, sys.stdout doesn't accept bytes, and sys.stdout.buffer must
737 # be used.
738 yield getattr(sys.stdout, 'buffer', sys.stdout)
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000739 return
740
741 # Run with the same options that git uses (see setup_pager in git repo).
742 # -F: Automatically quit if the output is less than one screen.
743 # -R: Don't escape ANSI color codes.
744 # -X: Don't clear the screen before starting.
745 cmd = ('less', '-FRX')
746 try:
747 proc = subprocess2.Popen(cmd, stdin=subprocess2.PIPE)
748 yield proc.stdin
749 finally:
Edward Lemurb800fde2020-01-10 23:04:44 +0000750 try:
751 proc.stdin.close()
752 except BrokenPipeError:
753 # BrokenPipeError is raised if proc has already completed,
754 pass
mgiuca@chromium.org81937562016-02-03 08:00:53 +0000755 proc.wait()
756
757
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000758def run(*cmd, **kwargs):
759 """The same as run_with_stderr, except it only returns stdout."""
760 return run_with_stderr(*cmd, **kwargs)[0]
761
762
agable@chromium.orgd629fb42014-10-01 09:40:10 +0000763def run_with_retcode(*cmd, **kwargs):
764 """Run a command but only return the status code."""
765 try:
766 run(*cmd, **kwargs)
767 return 0
768 except subprocess2.CalledProcessError as cpe:
769 return cpe.returncode
770
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000771def run_stream(*cmd, **kwargs):
772 """Runs a git command. Returns stdout as a PIPE (file-like object).
773
774 stderr is dropped to avoid races if the process outputs to both stdout and
775 stderr.
776 """
Edward Lesmescf06cad2020-12-14 22:03:23 +0000777 kwargs.setdefault('stderr', subprocess2.DEVNULL)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000778 kwargs.setdefault('stdout', subprocess2.PIPE)
iannucci@chromium.org0d9e59c2016-01-09 08:08:41 +0000779 kwargs.setdefault('shell', False)
iannucci@chromium.org21980022014-04-11 04:51:49 +0000780 cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000781 proc = subprocess2.Popen(cmd, **kwargs)
782 return proc.stdout
783
784
tandrii@chromium.org6c143102015-06-11 19:21:02 +0000785@contextlib.contextmanager
786def run_stream_with_retcode(*cmd, **kwargs):
787 """Runs a git command as context manager yielding stdout as a PIPE.
788
789 stderr is dropped to avoid races if the process outputs to both stdout and
790 stderr.
791
792 Raises subprocess2.CalledProcessError on nonzero return code.
793 """
Edward Lesmescf06cad2020-12-14 22:03:23 +0000794 kwargs.setdefault('stderr', subprocess2.DEVNULL)
tandrii@chromium.org6c143102015-06-11 19:21:02 +0000795 kwargs.setdefault('stdout', subprocess2.PIPE)
iannucci@chromium.org0d9e59c2016-01-09 08:08:41 +0000796 kwargs.setdefault('shell', False)
tandrii@chromium.org6c143102015-06-11 19:21:02 +0000797 cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
798 try:
799 proc = subprocess2.Popen(cmd, **kwargs)
800 yield proc.stdout
801 finally:
802 retcode = proc.wait()
803 if retcode != 0:
804 raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(),
Josip Sokcevic72f991f2020-04-23 18:53:30 +0000805 b'', b'')
tandrii@chromium.org6c143102015-06-11 19:21:02 +0000806
807
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000808def run_with_stderr(*cmd, **kwargs):
809 """Runs a git command.
810
811 Returns (stdout, stderr) as a pair of strings.
812
813 kwargs
814 autostrip (bool) - Strip the output. Defaults to True.
815 indata (str) - Specifies stdin data for the process.
816 """
817 kwargs.setdefault('stdin', subprocess2.PIPE)
818 kwargs.setdefault('stdout', subprocess2.PIPE)
819 kwargs.setdefault('stderr', subprocess2.PIPE)
iannucci@chromium.org0d9e59c2016-01-09 08:08:41 +0000820 kwargs.setdefault('shell', False)
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000821 autostrip = kwargs.pop('autostrip', True)
822 indata = kwargs.pop('indata', None)
Edward Lemur12a537f2019-10-03 21:57:15 +0000823 decode = kwargs.pop('decode', True)
Orr Bernsteinb7e16d22023-07-14 11:00:55 +0000824 accepted_retcodes = kwargs.pop('accepted_retcodes', [0])
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000825
iannucci@chromium.org21980022014-04-11 04:51:49 +0000826 cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000827 proc = subprocess2.Popen(cmd, **kwargs)
828 ret, err = proc.communicate(indata)
829 retcode = proc.wait()
Orr Bernsteinb7e16d22023-07-14 11:00:55 +0000830 if retcode not in accepted_retcodes:
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000831 raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err)
832
833 if autostrip:
Edward Lemur12a537f2019-10-03 21:57:15 +0000834 ret = (ret or b'').strip()
835 err = (err or b'').strip()
836
837 if decode:
838 ret = ret.decode('utf-8', 'replace')
839 err = err.decode('utf-8', 'replace')
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000840
841 return ret, err
842
843
844def set_branch_config(branch, option, value, scope='local'):
845 set_config('branch.%s.%s' % (branch, option), value, scope=scope)
846
847
848def set_config(option, value, scope='local'):
849 run('config', '--' + scope, option, value)
850
agable@chromium.orgd629fb42014-10-01 09:40:10 +0000851
sbc@chromium.org71437c02015-04-09 19:29:40 +0000852def get_dirty_files():
853 # Make sure index is up-to-date before running diff-index.
854 run_with_retcode('update-index', '--refresh', '-q')
Eli Ribble54434e72019-05-24 00:41:15 +0000855 return run('diff-index', '--ignore-submodules', '--name-status', 'HEAD')
sbc@chromium.org71437c02015-04-09 19:29:40 +0000856
857
858def is_dirty_git_tree(cmd):
iannuccie38699b2016-08-15 17:32:31 -0700859 w = lambda s: sys.stderr.write(s+"\n")
860
sbc@chromium.org71437c02015-04-09 19:29:40 +0000861 dirty = get_dirty_files()
862 if dirty:
Josip Sokcevicfcf9fc42022-09-27 21:59:01 +0000863 w('Cannot %s with a dirty tree. Commit%s or stash your changes first.' %
864 (cmd, '' if cmd == 'upload' else ', freeze'))
iannuccie38699b2016-08-15 17:32:31 -0700865 w('Uncommitted files: (git diff-index --name-status HEAD)')
866 w(dirty[:4096])
sbc@chromium.org71437c02015-04-09 19:29:40 +0000867 if len(dirty) > 4096: # pragma: no cover
iannuccie38699b2016-08-15 17:32:31 -0700868 w('... (run "git diff-index --name-status HEAD" to see full output).')
sbc@chromium.org71437c02015-04-09 19:29:40 +0000869 return True
870 return False
871
872
agable02b3c982016-06-22 07:51:22 -0700873def status():
874 """Returns a parsed version of git-status.
875
876 Returns a generator of (current_name, (lstat, rstat, src)) pairs where:
877 * current_name is the name of the file
878 * lstat is the left status code letter from git-status
879 * rstat is the left status code letter from git-status
880 * src is the current name of the file, or the original name of the file
881 if lstat == 'R'
882 """
883 stat_entry = collections.namedtuple('stat_entry', 'lstat rstat src')
884
885 def tokenizer(stream):
Raul Tambrec2f74c12019-03-19 05:55:53 +0000886 acc = BytesIO()
agable02b3c982016-06-22 07:51:22 -0700887 c = None
Edward Lemur12a537f2019-10-03 21:57:15 +0000888 while c != b'':
agable02b3c982016-06-22 07:51:22 -0700889 c = stream.read(1)
Edward Lemur12a537f2019-10-03 21:57:15 +0000890 if c in (None, b'', b'\0'):
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000891 if len(acc.getvalue()) > 0:
agable02b3c982016-06-22 07:51:22 -0700892 yield acc.getvalue()
Raul Tambrec2f74c12019-03-19 05:55:53 +0000893 acc = BytesIO()
agable02b3c982016-06-22 07:51:22 -0700894 else:
895 acc.write(c)
896
897 def parser(tokens):
898 while True:
Edward Lemur12a537f2019-10-03 21:57:15 +0000899 try:
900 status_dest = next(tokens).decode('utf-8')
901 except StopIteration:
902 return
agable02b3c982016-06-22 07:51:22 -0700903 stat, dest = status_dest[:2], status_dest[3:]
904 lstat, rstat = stat
905 if lstat == 'R':
Edward Lemur12a537f2019-10-03 21:57:15 +0000906 src = next(tokens).decode('utf-8')
agable02b3c982016-06-22 07:51:22 -0700907 else:
908 src = dest
909 yield (dest, stat_entry(lstat, rstat, src))
910
911 return parser(tokenizer(run_stream('status', '-z', bufsize=-1)))
912
913
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000914def squash_current_branch(header=None, merge_base=None):
Alan Cutter00017822016-12-20 17:39:59 +1100915 header = header or 'git squash commit for %s.' % current_branch()
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000916 merge_base = merge_base or get_or_create_merge_base(current_branch())
917 log_msg = header + '\n'
918 if log_msg:
919 log_msg += '\n'
920 log_msg += run('log', '--reverse', '--format=%H%n%B', '%s..HEAD' % merge_base)
921 run('reset', '--soft', merge_base)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000922
923 if not get_dirty_files():
924 # Sometimes the squash can result in the same tree, meaning that there is
925 # nothing to commit at this point.
Raul Tambrec2f74c12019-03-19 05:55:53 +0000926 print('Nothing to commit; squashed branch is empty')
sbc@chromium.org71437c02015-04-09 19:29:40 +0000927 return False
Edward Lemur71681bf2019-10-09 23:46:20 +0000928 run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg.encode('utf-8'))
sbc@chromium.org71437c02015-04-09 19:29:40 +0000929 return True
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000930
931
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +0000932def tags(*args):
933 return run('tag', *args).splitlines()
934
935
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000936def thaw():
937 took_action = False
Bruce Dawson4082f882023-05-15 17:14:17 +0000938 with run_stream('rev-list', 'HEAD') as stream:
939 for sha in stream:
940 sha = sha.strip().decode('utf-8')
941 msg = run('show', '--format=%f%b', '-s', 'HEAD')
942 match = FREEZE_MATCHER.match(msg)
943 if not match:
944 if not took_action:
945 return 'Nothing to thaw.'
946 break
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000947
Bruce Dawson4082f882023-05-15 17:14:17 +0000948 run('reset', '--' + FREEZE_SECTIONS[match.group(1)], sha)
949 took_action = True
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000950
951
952def topo_iter(branch_tree, top_down=True):
953 """Generates (branch, parent) in topographical order for a branch tree.
954
955 Given a tree:
956
957 A1
958 B1 B2
959 C1 C2 C3
960 D1
961
962 branch_tree would look like: {
963 'D1': 'C3',
964 'C3': 'B2',
965 'B2': 'A1',
966 'C1': 'B1',
967 'C2': 'B1',
968 'B1': 'A1',
969 }
970
971 It is OK to have multiple 'root' nodes in your graph.
972
973 if top_down is True, items are yielded from A->D. Otherwise they're yielded
974 from D->A. Within a layer the branches will be yielded in sorted order.
975 """
976 branch_tree = branch_tree.copy()
977
978 # TODO(iannucci): There is probably a more efficient way to do these.
979 if top_down:
980 while branch_tree:
Edward Lemur12a537f2019-10-03 21:57:15 +0000981 this_pass = [(b, p) for b, p in branch_tree.items()
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000982 if p not in branch_tree]
983 assert this_pass, "Branch tree has cycles: %r" % branch_tree
984 for branch, parent in sorted(this_pass):
985 yield branch, parent
986 del branch_tree[branch]
987 else:
988 parent_to_branches = collections.defaultdict(set)
Edward Lemur12a537f2019-10-03 21:57:15 +0000989 for branch, parent in branch_tree.items():
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000990 parent_to_branches[parent].add(branch)
991
992 while branch_tree:
Edward Lemur12a537f2019-10-03 21:57:15 +0000993 this_pass = [(b, p) for b, p in branch_tree.items()
iannucci@chromium.orgc050a5b2014-03-26 06:18:50 +0000994 if not parent_to_branches[b]]
995 assert this_pass, "Branch tree has cycles: %r" % branch_tree
996 for branch, parent in sorted(this_pass):
997 yield branch, parent
998 parent_to_branches[parent].discard(branch)
999 del branch_tree[branch]
1000
1001
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +00001002def tree(treeref, recurse=False):
1003 """Returns a dict representation of a git tree object.
1004
1005 Args:
1006 treeref (str) - a git ref which resolves to a tree (commits count as trees).
qyearsley12fa6ff2016-08-24 09:18:40 -07001007 recurse (bool) - include all of the tree's descendants too. File names will
iannucci@chromium.orgaa74cf62013-11-19 20:00:49 +00001008 take the form of 'some/path/to/file'.
1009
1010 Return format:
1011 { 'file_name': (mode, type, ref) }
1012
1013 mode is an integer where:
1014 * 0040000 - Directory
1015 * 0100644 - Regular non-executable file
1016 * 0100664 - Regular non-executable group-writeable file
1017 * 0100755 - Regular executable file
1018 * 0120000 - Symbolic link
1019 * 0160000 - Gitlink
1020
1021 type is a string where it's one of 'blob', 'commit', 'tree', 'tag'.
1022
1023 ref is the hex encoded hash of the entry.
1024 """
1025 ret = {}
1026 opts = ['ls-tree', '--full-tree']
1027 if recurse:
1028 opts.append('-r')
1029 opts.append(treeref)
1030 try:
1031 for line in run(*opts).splitlines():
1032 mode, typ, ref, name = line.split(None, 3)
1033 ret[name] = (mode, typ, ref)
1034 except subprocess2.CalledProcessError:
1035 return None
1036 return ret
1037
1038
Mun Yong Jang781e71e2017-10-25 15:46:20 -07001039def get_remote_url(remote='origin'):
1040 try:
1041 return run('config', 'remote.%s.url' % remote)
1042 except subprocess2.CalledProcessError:
1043 return None
1044
1045
iannucci@chromium.org8bc9b5c2014-03-12 01:36:18 +00001046def upstream(branch):
1047 try:
1048 return run('rev-parse', '--abbrev-ref', '--symbolic-full-name',
1049 branch+'@{upstream}')
1050 except subprocess2.CalledProcessError:
1051 return None
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001052
agable@chromium.orgd629fb42014-10-01 09:40:10 +00001053
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001054def get_git_version():
1055 """Returns a tuple that contains the numeric components of the current git
1056 version."""
1057 version_string = run('--version')
1058 version_match = re.search(r'(\d+.)+(\d+)', version_string)
1059 version = version_match.group() if version_match else ''
1060
1061 return tuple(int(x) for x in version.split('.'))
1062
1063
calamity@chromium.org745ffa62014-09-08 01:03:19 +00001064def get_branches_info(include_tracking_status):
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001065 format_string = (
1066 '--format=%(refname:short):%(objectname:short):%(upstream:short):')
1067
1068 # This is not covered by the depot_tools CQ which only has git version 1.8.
calamity@chromium.org745ffa62014-09-08 01:03:19 +00001069 if (include_tracking_status and
1070 get_git_version() >= MIN_UPSTREAM_TRACK_GIT_VERSION): # pragma: no cover
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001071 format_string += '%(upstream:track)'
1072
1073 info_map = {}
1074 data = run('for-each-ref', format_string, 'refs/heads')
calamity@chromium.org745ffa62014-09-08 01:03:19 +00001075 BranchesInfo = collections.namedtuple(
Gavin Mak8d7201b2020-09-17 19:21:38 +00001076 'BranchesInfo', 'hash upstream commits behind')
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001077 for line in data.splitlines():
1078 (branch, branch_hash, upstream_branch, tracking_status) = line.split(':')
1079
Gavin Mak8d7201b2020-09-17 19:21:38 +00001080 commits = None
Antonio Sartorie0dff202021-02-18 06:33:50 +00001081 if include_tracking_status:
1082 base = get_or_create_merge_base(branch)
1083 if base:
1084 commits_list = run('rev-list', '--count', branch, '^%s' % base, '--')
1085 commits = int(commits_list) or None
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001086
1087 behind_match = re.search(r'behind (\d+)', tracking_status)
1088 behind = int(behind_match.group(1)) if behind_match else None
1089
calamity@chromium.org745ffa62014-09-08 01:03:19 +00001090 info_map[branch] = BranchesInfo(
Robert Iannuccid3acb162021-05-04 21:37:40 +00001091 hash=branch_hash, upstream=upstream_branch, commits=commits,
Gavin Mak8d7201b2020-09-17 19:21:38 +00001092 behind=behind)
calamity@chromium.org9d2c8802014-09-03 02:04:46 +00001093
1094 # Set None for upstreams which are not branches (e.g empty upstream, remotes
1095 # and deleted upstream branches).
1096 missing_upstreams = {}
1097 for info in info_map.values():
1098 if info.upstream not in info_map and info.upstream not in missing_upstreams:
1099 missing_upstreams[info.upstream] = None
1100
Edward Lemur12a537f2019-10-03 21:57:15 +00001101 result = info_map.copy()
1102 result.update(missing_upstreams)
1103 return result
sammc@chromium.org900a33f2015-09-29 06:57:09 +00001104
1105
1106def make_workdir_common(repository, new_workdir, files_to_symlink,
scottmg@chromium.orgd4218d42015-10-07 23:49:20 +00001107 files_to_copy, symlink=None):
1108 if not symlink:
1109 symlink = os.symlink
sammc@chromium.org900a33f2015-09-29 06:57:09 +00001110 os.makedirs(new_workdir)
1111 for entry in files_to_symlink:
scottmg@chromium.orgd4218d42015-10-07 23:49:20 +00001112 clone_file(repository, new_workdir, entry, symlink)
sammc@chromium.org900a33f2015-09-29 06:57:09 +00001113 for entry in files_to_copy:
1114 clone_file(repository, new_workdir, entry, shutil.copy)
1115
1116
1117def make_workdir(repository, new_workdir):
1118 GIT_DIRECTORY_WHITELIST = [
1119 'config',
1120 'info',
1121 'hooks',
1122 'logs/refs',
1123 'objects',
1124 'packed-refs',
1125 'refs',
1126 'remotes',
1127 'rr-cache',
Richard He42033b22020-05-22 03:03:45 +00001128 'shallow',
sammc@chromium.org900a33f2015-09-29 06:57:09 +00001129 ]
1130 make_workdir_common(repository, new_workdir, GIT_DIRECTORY_WHITELIST,
1131 ['HEAD'])
1132
1133
1134def clone_file(repository, new_workdir, link, operation):
1135 if not os.path.exists(os.path.join(repository, link)):
1136 return
1137 link_dir = os.path.dirname(os.path.join(new_workdir, link))
1138 if not os.path.exists(link_dir):
1139 os.makedirs(link_dir)
Henrique Ferreirofd4ad242018-01-10 12:19:18 +01001140 src = os.path.join(repository, link)
1141 if os.path.islink(src):
Henrique Ferreiroaea45d22018-02-19 09:48:36 +01001142 src = os.path.realpath(src)
Henrique Ferreirofd4ad242018-01-10 12:19:18 +01001143 operation(src, os.path.join(new_workdir, link))