Edward Lemur | 1f3bafb | 2019-10-08 17:56:33 +0000 | [diff] [blame] | 1 | #!/usr/bin/env vpython |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 2 | # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 6 | # Copyright (C) 2008 Evan Martin <martine@danga.com> |
| 7 | |
Andrii Shyshkalov | 03da150 | 2018-10-15 03:42:34 +0000 | [diff] [blame] | 8 | """A git-command for integrating reviews on Gerrit.""" |
maruel@chromium.org | 725f1c3 | 2011-04-01 20:24:54 +0000 | [diff] [blame] | 9 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 10 | from __future__ import print_function |
| 11 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 12 | from distutils.version import LooseVersion |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 13 | from multiprocessing.pool import ThreadPool |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 14 | import base64 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 15 | import collections |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 16 | import datetime |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 17 | import fnmatch |
Edward Lemur | 202c559 | 2019-10-21 22:44:52 +0000 | [diff] [blame] | 18 | import httplib2 |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 19 | import itertools |
maruel@chromium.org | 4f6852c | 2012-04-20 20:39:20 +0000 | [diff] [blame] | 20 | import json |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 21 | import logging |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 22 | import multiprocessing |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 23 | import optparse |
| 24 | import os |
| 25 | import re |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 26 | import shutil |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 27 | import stat |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 28 | import sys |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 29 | import tempfile |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 30 | import textwrap |
Edward Lemur | fec80c4 | 2018-11-01 23:14:14 +0000 | [diff] [blame] | 31 | import time |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 32 | import uuid |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 33 | import webbrowser |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 34 | import zlib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 35 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 36 | from third_party import colorama |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 37 | import auth |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 38 | import clang_format |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 39 | import dart_format |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 40 | import fix_encoding |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 41 | import gclient_utils |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 42 | import gerrit_util |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 43 | import git_common |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 44 | import git_footers |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 45 | import metrics |
Edward Lesmes | 93277a7 | 2018-10-18 22:04:26 +0000 | [diff] [blame] | 46 | import metrics_utils |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 47 | import owners |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 48 | import owners_finder |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 49 | import presubmit_support |
| 50 | import scm |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 51 | import setup_color |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 52 | import split_cl |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 53 | import subcommand |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 54 | import subprocess2 |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 55 | import watchlists |
| 56 | |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 57 | from third_party import six |
| 58 | from six.moves import urllib |
| 59 | |
| 60 | |
| 61 | if sys.version_info.major == 3: |
| 62 | basestring = (str,) # pylint: disable=redefined-builtin |
| 63 | |
Edward Lemur | b983024 | 2019-10-30 22:19:20 +0000 | [diff] [blame] | 64 | |
tandrii | 7400cf0 | 2016-06-21 08:48:07 -0700 | [diff] [blame] | 65 | __version__ = '2.0' |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 66 | |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 67 | # Traces for git push will be stored in a traces directory inside the |
| 68 | # depot_tools checkout. |
| 69 | DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__)) |
| 70 | TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces') |
| 71 | |
| 72 | # When collecting traces, Git hashes will be reduced to 6 characters to reduce |
| 73 | # the size after compression. |
| 74 | GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I) |
| 75 | # Used to redact the cookies from the gitcookies file. |
| 76 | GITCOOKIES_REDACT_RE = re.compile(r'1/.*') |
| 77 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 78 | MAX_ATTEMPTS = 3 |
| 79 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 80 | # The maximum number of traces we will keep. Multiplied by 3 since we store |
| 81 | # 3 files per trace. |
| 82 | MAX_TRACES = 3 * 10 |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 83 | # Message to be displayed to the user to inform where to find the traces for a |
| 84 | # git-cl upload execution. |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 85 | TRACES_MESSAGE = ( |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 86 | '\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 87 | 'The traces of this git-cl execution have been recorded at:\n' |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 88 | ' %(trace_name)s-traces.zip\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 89 | 'Copies of your gitcookies file and git config have been recorded at:\n' |
| 90 | ' %(trace_name)s-git-info.zip\n') |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 91 | # Format of the message to be stored as part of the traces to give developers a |
| 92 | # better context when they go through traces. |
| 93 | TRACES_README_FORMAT = ( |
| 94 | 'Date: %(now)s\n' |
| 95 | '\n' |
| 96 | 'Change: https://%(gerrit_host)s/q/%(change_id)s\n' |
| 97 | 'Title: %(title)s\n' |
| 98 | '\n' |
| 99 | '%(description)s\n' |
| 100 | '\n' |
| 101 | 'Execution time: %(execution_time)s\n' |
| 102 | 'Exit code: %(exit_code)s\n') + TRACES_MESSAGE |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 103 | |
tandrii | 9d2c7a3 | 2016-06-22 03:42:45 -0700 | [diff] [blame] | 104 | COMMIT_BOT_EMAIL = 'commit-bot@chromium.org' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 105 | POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land' |
Henrique Ferreiro | ff24962 | 2019-11-28 23:19:29 +0000 | [diff] [blame] | 106 | DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup' |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 107 | REFS_THAT_ALIAS_TO_OTHER_REFS = { |
| 108 | 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master', |
| 109 | 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master', |
| 110 | } |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 111 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 112 | # Valid extensions for files we want to lint. |
| 113 | DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" |
| 114 | DEFAULT_LINT_IGNORE_REGEX = r"$^" |
| 115 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 116 | # File name for yapf style config files. |
| 117 | YAPF_CONFIG_FILENAME = '.style.yapf' |
| 118 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 119 | # Shortcut since it quickly becomes repetitive. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 120 | Fore = colorama.Fore |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 121 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 122 | # Initialized in main() |
| 123 | settings = None |
| 124 | |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 125 | # Used by tests/git_cl_test.py to add extra logging. |
| 126 | # Inside the weirdly failing test, add this: |
| 127 | # >>> self.mock(git_cl, '_IS_BEING_TESTED', True) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 128 | # And scroll up to see the stack trace printed. |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 129 | _IS_BEING_TESTED = False |
| 130 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 131 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 132 | def DieWithError(message, change_desc=None): |
| 133 | if change_desc: |
| 134 | SaveDescriptionBackup(change_desc) |
| 135 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 136 | print(message, file=sys.stderr) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 137 | sys.exit(1) |
| 138 | |
| 139 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 140 | def SaveDescriptionBackup(change_desc): |
Henrique Ferreiro | 5ae4817 | 2019-11-29 16:14:42 +0000 | [diff] [blame] | 141 | backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE) |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 142 | print('\nsaving CL description to %s\n' % backup_path) |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 143 | with open(backup_path, 'w') as backup_file: |
| 144 | backup_file.write(change_desc.description) |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 145 | |
| 146 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 147 | def GetNoGitPagerEnv(): |
| 148 | env = os.environ.copy() |
| 149 | # 'cat' is a magical git string that disables pagers on all platforms. |
| 150 | env['GIT_PAGER'] = 'cat' |
| 151 | return env |
| 152 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 153 | |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 154 | def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 155 | try: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 156 | stdout = subprocess2.check_output(args, shell=shell, **kwargs) |
| 157 | return stdout.decode('utf-8', 'replace') |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 158 | except subprocess2.CalledProcessError as e: |
| 159 | logging.debug('Failed running %s', args) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 160 | if not error_ok: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 161 | DieWithError( |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 162 | 'Command "%s" failed.\n%s' % ( |
| 163 | ' '.join(args), error_message or e.stdout or '')) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 164 | return e.stdout.decode('utf-8', 'replace') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 165 | |
| 166 | |
| 167 | def RunGit(args, **kwargs): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 168 | """Returns stdout.""" |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 169 | return RunCommand(['git'] + args, **kwargs) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 170 | |
| 171 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 172 | def RunGitWithCode(args, suppress_stderr=False): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 173 | """Returns return code and stdout.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 174 | if suppress_stderr: |
| 175 | stderr = subprocess2.VOID |
| 176 | else: |
| 177 | stderr = sys.stderr |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 178 | try: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 179 | (out, _), code = subprocess2.communicate(['git'] + args, |
| 180 | env=GetNoGitPagerEnv(), |
| 181 | stdout=subprocess2.PIPE, |
| 182 | stderr=stderr) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 183 | return code, out.decode('utf-8', 'replace') |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 184 | except subprocess2.CalledProcessError as e: |
Yoshisato Yanagisawa | 81e3ff5 | 2017-09-26 15:33:34 +0900 | [diff] [blame] | 185 | logging.debug('Failed running %s', ['git'] + args) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 186 | return e.returncode, e.stdout.decode('utf-8', 'replace') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 187 | |
| 188 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 189 | def RunGitSilent(args): |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 190 | """Returns stdout, suppresses stderr and ignores the return code.""" |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 191 | return RunGitWithCode(args, suppress_stderr=True)[1] |
| 192 | |
| 193 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 194 | def IsGitVersionAtLeast(min_version): |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 195 | prefix = 'git version ' |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 196 | version = RunGit(['--version']).strip() |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 197 | return (version.startswith(prefix) and |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 198 | LooseVersion(version[len(prefix):]) >= LooseVersion(min_version)) |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 199 | |
| 200 | |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 201 | def BranchExists(branch): |
| 202 | """Return True if specified branch exists.""" |
| 203 | code, _ = RunGitWithCode(['rev-parse', '--verify', branch], |
| 204 | suppress_stderr=True) |
| 205 | return not code |
| 206 | |
| 207 | |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 208 | def time_sleep(seconds): |
| 209 | # Use this so that it can be mocked in tests without interfering with python |
| 210 | # system machinery. |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 211 | return time.sleep(seconds) |
| 212 | |
| 213 | |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 214 | def time_time(): |
| 215 | # Use this so that it can be mocked in tests without interfering with python |
| 216 | # system machinery. |
| 217 | return time.time() |
| 218 | |
| 219 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 220 | def datetime_now(): |
| 221 | # Use this so that it can be mocked in tests without interfering with python |
| 222 | # system machinery. |
| 223 | return datetime.datetime.now() |
| 224 | |
| 225 | |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 226 | def ask_for_data(prompt): |
| 227 | try: |
| 228 | return raw_input(prompt) |
| 229 | except KeyboardInterrupt: |
| 230 | # Hide the exception. |
| 231 | sys.exit(1) |
| 232 | |
| 233 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 234 | def confirm_or_exit(prefix='', action='confirm'): |
| 235 | """Asks user to press enter to continue or press Ctrl+C to abort.""" |
| 236 | if not prefix or prefix.endswith('\n'): |
| 237 | mid = 'Press' |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 238 | elif prefix.endswith('.') or prefix.endswith('?'): |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 239 | mid = ' Press' |
| 240 | elif prefix.endswith(' '): |
| 241 | mid = 'press' |
| 242 | else: |
| 243 | mid = ' press' |
| 244 | ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action)) |
| 245 | |
| 246 | |
| 247 | def ask_for_explicit_yes(prompt): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 248 | """Returns whether user typed 'y' or 'yes' to confirm the given prompt.""" |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 249 | result = ask_for_data(prompt + ' [Yes/No]: ').lower() |
| 250 | while True: |
| 251 | if 'yes'.startswith(result): |
| 252 | return True |
| 253 | if 'no'.startswith(result): |
| 254 | return False |
| 255 | result = ask_for_data('Please, type yes or no: ').lower() |
| 256 | |
| 257 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 258 | def _git_branch_config_key(branch, key): |
| 259 | """Helper method to return Git config key for a branch.""" |
| 260 | assert branch, 'branch name is required to set git config for it' |
| 261 | return 'branch.%s.%s' % (branch, key) |
| 262 | |
| 263 | |
| 264 | def _git_get_branch_config_value(key, default=None, value_type=str, |
| 265 | branch=False): |
| 266 | """Returns git config value of given or current branch if any. |
| 267 | |
| 268 | Returns default in all other cases. |
| 269 | """ |
| 270 | assert value_type in (int, str, bool) |
| 271 | if branch is False: # Distinguishing default arg value from None. |
| 272 | branch = GetCurrentBranch() |
| 273 | |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 274 | if not branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 275 | return default |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 276 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 277 | args = ['config'] |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 278 | if value_type == bool: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 279 | args.append('--bool') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 280 | # `git config` also has --int, but apparently git config suffers from integer |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 281 | # overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 282 | args.append(_git_branch_config_key(branch, key)) |
| 283 | code, out = RunGitWithCode(args) |
| 284 | if code == 0: |
| 285 | value = out.strip() |
| 286 | if value_type == int: |
| 287 | return int(value) |
| 288 | if value_type == bool: |
| 289 | return bool(value.lower() == 'true') |
| 290 | return value |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 291 | return default |
| 292 | |
| 293 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 294 | def _git_set_branch_config_value(key, value, branch=None, **kwargs): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 295 | """Sets or unsets the git branch config value. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 296 | |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 297 | If value is None, the key will be unset, otherwise it will be set. |
| 298 | If no branch is given, the currently checked out branch is used. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 299 | """ |
| 300 | if not branch: |
| 301 | branch = GetCurrentBranch() |
| 302 | assert branch, 'a branch name OR currently checked out branch is required' |
| 303 | args = ['config'] |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 304 | # Check for boolean first, because bool is int, but int is not bool. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 305 | if value is None: |
| 306 | args.append('--unset') |
| 307 | elif isinstance(value, bool): |
| 308 | args.append('--bool') |
| 309 | value = str(value).lower() |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 310 | else: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 311 | # `git config` also has --int, but apparently git config suffers from |
| 312 | # integer overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 313 | value = str(value) |
| 314 | args.append(_git_branch_config_key(branch, key)) |
| 315 | if value is not None: |
| 316 | args.append(value) |
| 317 | RunGit(args, **kwargs) |
| 318 | |
| 319 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 320 | def _get_properties_from_options(options): |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 321 | prop_list = getattr(options, 'properties', []) |
| 322 | properties = dict(x.split('=', 1) for x in prop_list) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 323 | for key, val in properties.items(): |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 324 | try: |
| 325 | properties[key] = json.loads(val) |
| 326 | except ValueError: |
| 327 | pass # If a value couldn't be evaluated, treat it as a string. |
| 328 | return properties |
| 329 | |
| 330 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 331 | # TODO(crbug.com/976104): Remove this function once git-cl try-results has |
| 332 | # migrated to use buildbucket v2 |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 333 | def _buildbucket_retry(operation_name, http, *args, **kwargs): |
| 334 | """Retries requests to buildbucket service and returns parsed json content.""" |
| 335 | try_count = 0 |
| 336 | while True: |
| 337 | response, content = http.request(*args, **kwargs) |
| 338 | try: |
| 339 | content_json = json.loads(content) |
| 340 | except ValueError: |
| 341 | content_json = None |
| 342 | |
| 343 | # Buildbucket could return an error even if status==200. |
| 344 | if content_json and content_json.get('error'): |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 345 | error = content_json.get('error') |
| 346 | if error.get('code') == 403: |
| 347 | raise BuildbucketResponseException( |
| 348 | 'Access denied: %s' % error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 349 | msg = 'Error in response. Reason: %s. Message: %s.' % ( |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 350 | error.get('reason', ''), error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 351 | raise BuildbucketResponseException(msg) |
| 352 | |
| 353 | if response.status == 200: |
Nodir Turakulov | 23d75d2 | 2018-06-04 12:37:32 -0700 | [diff] [blame] | 354 | if content_json is None: |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 355 | raise BuildbucketResponseException( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 356 | 'Buildbucket returned invalid JSON content: %s.\n' |
Nodir Turakulov | 9ac5979 | 2018-06-04 12:34:14 -0700 | [diff] [blame] | 357 | 'Please file bugs at http://crbug.com, ' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 358 | 'component "Infra>Platform>Buildbucket".' % |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 359 | content) |
| 360 | return content_json |
| 361 | if response.status < 500 or try_count >= 2: |
| 362 | raise httplib2.HttpLib2Error(content) |
| 363 | |
| 364 | # status >= 500 means transient failures. |
| 365 | logging.debug('Transient errors when %s. Will retry.', operation_name) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 366 | time_sleep(0.5 + (1.5 * try_count)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 367 | try_count += 1 |
| 368 | assert False, 'unreachable' |
| 369 | |
| 370 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 371 | def _call_buildbucket(http, buildbucket_host, method, request): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 372 | """Calls a buildbucket v2 method and returns the parsed json response.""" |
| 373 | headers = { |
| 374 | 'Accept': 'application/json', |
| 375 | 'Content-Type': 'application/json', |
| 376 | } |
| 377 | request = json.dumps(request) |
| 378 | url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method) |
| 379 | |
| 380 | logging.info('POST %s with %s' % (url, request)) |
| 381 | |
| 382 | attempts = 1 |
| 383 | time_to_sleep = 1 |
| 384 | while True: |
| 385 | response, content = http.request(url, 'POST', body=request, headers=headers) |
| 386 | if response.status == 200: |
| 387 | return json.loads(content[4:]) |
| 388 | if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500: |
| 389 | msg = '%s error when calling POST %s with %s: %s' % ( |
| 390 | response.status, url, request, content) |
| 391 | raise BuildbucketResponseException(msg) |
| 392 | logging.debug( |
| 393 | '%s error when calling POST %s with %s. ' |
| 394 | 'Sleeping for %d seconds and retrying...' % ( |
| 395 | response.status, url, request, time_to_sleep)) |
| 396 | time.sleep(time_to_sleep) |
| 397 | time_to_sleep *= 2 |
| 398 | attempts += 1 |
| 399 | |
| 400 | assert False, 'unreachable' |
| 401 | |
| 402 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 403 | def _get_bucket_map(changelist, options, option_parser): |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 404 | """Returns a dict mapping bucket names to builders and tests, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 405 | for triggering tryjobs. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 406 | """ |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 407 | # If no bots are listed, we try to get a set of builders and tests based |
| 408 | # on GetPreferredTryMasters functions in PRESUBMIT.py files. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 409 | if not options.bot: |
| 410 | change = changelist.GetChange( |
| 411 | changelist.GetCommonAncestorWithUpstream(), None) |
qyearsley | 136b49f | 2016-10-31 09:02:26 -0700 | [diff] [blame] | 412 | # Get try masters from PRESUBMIT.py files. |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 413 | masters = presubmit_support.DoGetTryMasters( |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 414 | change=change, |
| 415 | changed_files=change.LocalPaths(), |
| 416 | repository_root=settings.GetRoot(), |
| 417 | default_presubmit=None, |
| 418 | project=None, |
| 419 | verbose=options.verbose, |
| 420 | output_stream=sys.stdout) |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 421 | if masters is None: |
| 422 | return None |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 423 | return {m: b for m, b in masters.items()} |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 424 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 425 | if options.bucket: |
| 426 | return {options.bucket: {b: [] for b in options.bot}} |
Andrii Shyshkalov | 7542437 | 2019-08-30 22:48:15 +0000 | [diff] [blame] | 427 | option_parser.error( |
Edward Lemur | 5ef16a3 | 2019-11-11 21:13:25 +0000 | [diff] [blame] | 428 | 'Please specify the bucket, e.g. "-B chromium/try".') |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 429 | |
| 430 | |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 431 | def _parse_bucket(raw_bucket): |
| 432 | legacy = True |
| 433 | project = bucket = None |
| 434 | if '/' in raw_bucket: |
| 435 | legacy = False |
| 436 | project, bucket = raw_bucket.split('/', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 437 | # Assume luci.<project>.<bucket>. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 438 | elif raw_bucket.startswith('luci.'): |
| 439 | project, bucket = raw_bucket[len('luci.'):].split('.', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 440 | # Otherwise, assume prefix is also the project name. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 441 | elif '.' in raw_bucket: |
| 442 | project = raw_bucket.split('.')[0] |
| 443 | bucket = raw_bucket |
| 444 | # Legacy buckets. |
| 445 | if legacy: |
| 446 | print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket)) |
| 447 | return project, bucket |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 448 | |
| 449 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 450 | def _trigger_try_jobs(changelist, buckets, options, patchset): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 451 | """Sends a request to Buildbucket to trigger tryjobs for a changelist. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 452 | |
| 453 | Args: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 454 | changelist: Changelist that the tryjobs are associated with. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 455 | buckets: A nested dict mapping bucket names to builders to tests. |
| 456 | options: Command-line options. |
| 457 | """ |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 458 | print('Scheduling jobs on:') |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 459 | for bucket, builders_and_tests in sorted(buckets.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 460 | print('Bucket:', bucket) |
| 461 | print('\n'.join( |
| 462 | ' %s: %s' % (builder, tests) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 463 | for builder, tests in sorted(builders_and_tests.items()))) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 464 | print('To see results here, run: git cl try-results') |
| 465 | print('To see results in browser, run: git cl web') |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 466 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 467 | requests = _make_try_job_schedule_requests( |
| 468 | changelist, buckets, options, patchset) |
| 469 | if not requests: |
| 470 | return |
| 471 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 472 | http = auth.Authenticator().authorize(httplib2.Http()) |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 473 | http.force_exception_to_status_code = True |
| 474 | |
| 475 | batch_request = {'requests': requests} |
| 476 | batch_response = _call_buildbucket( |
| 477 | http, options.buildbucket_host, 'Batch', batch_request) |
| 478 | |
| 479 | errors = [ |
| 480 | ' ' + response['error']['message'] |
| 481 | for response in batch_response.get('responses', []) |
| 482 | if 'error' in response |
| 483 | ] |
| 484 | if errors: |
| 485 | raise BuildbucketResponseException( |
| 486 | 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors)) |
| 487 | |
| 488 | |
| 489 | def _make_try_job_schedule_requests(changelist, buckets, options, patchset): |
Edward Lemur | f0faf48 | 2019-09-25 20:40:17 +0000 | [diff] [blame] | 490 | gerrit_changes = [changelist.GetGerritChange(patchset)] |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 491 | shared_properties = {'category': getattr(options, 'category', 'git_cl_try')} |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 492 | if getattr(options, 'clobber', False): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 493 | shared_properties['clobber'] = True |
| 494 | shared_properties.update(_get_properties_from_options(options) or {}) |
| 495 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 496 | shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}] |
| 497 | if options.retry_failed: |
| 498 | shared_tags.append({'key': 'retry_failed', |
| 499 | 'value': '1'}) |
| 500 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 501 | requests = [] |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 502 | for raw_bucket, builders_and_tests in sorted(buckets.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 503 | project, bucket = _parse_bucket(raw_bucket) |
| 504 | if not project or not bucket: |
| 505 | print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket) |
| 506 | continue |
| 507 | |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 508 | for builder, tests in sorted(builders_and_tests.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 509 | properties = shared_properties.copy() |
| 510 | if 'presubmit' in builder.lower(): |
| 511 | properties['dry_run'] = 'true' |
| 512 | if tests: |
| 513 | properties['testfilter'] = tests |
| 514 | |
| 515 | requests.append({ |
| 516 | 'scheduleBuild': { |
| 517 | 'requestId': str(uuid.uuid4()), |
| 518 | 'builder': { |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 519 | 'project': getattr(options, 'project', None) or project, |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 520 | 'bucket': bucket, |
| 521 | 'builder': builder, |
| 522 | }, |
| 523 | 'gerritChanges': gerrit_changes, |
| 524 | 'properties': properties, |
| 525 | 'tags': [ |
| 526 | {'key': 'builder', 'value': builder}, |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 527 | ] + shared_tags, |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 528 | } |
| 529 | }) |
Anthony Polito | 1a5fe23 | 2020-01-24 23:17:52 +0000 | [diff] [blame] | 530 | |
| 531 | if options.revision: |
| 532 | requests[-1]['scheduleBuild']['gitilesCommit'] = { |
| 533 | 'host': gerrit_changes[0]['host'], |
| 534 | 'project': gerrit_changes[0]['project'], |
| 535 | 'id': options.revision |
| 536 | } |
| 537 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 538 | return requests |
kjellander@chromium.org | 4442454 | 2015-06-02 18:35:29 +0000 | [diff] [blame] | 539 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 540 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 541 | def fetch_try_jobs(changelist, buildbucket_host, patchset=None): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 542 | """Fetches tryjobs from buildbucket. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 543 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 544 | Returns list of buildbucket.v2.Build with the try jobs for the changelist. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 545 | """ |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 546 | fields = ['id', 'builder', 'status', 'createTime', 'tags'] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 547 | request = { |
| 548 | 'predicate': { |
| 549 | 'gerritChanges': [changelist.GetGerritChange(patchset)], |
| 550 | }, |
| 551 | 'fields': ','.join('builds.*.' + field for field in fields), |
| 552 | } |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 553 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 554 | authenticator = auth.Authenticator() |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 555 | if authenticator.has_cached_credentials(): |
| 556 | http = authenticator.authorize(httplib2.Http()) |
| 557 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 558 | print('Warning: Some results might be missing because %s' % |
| 559 | # Get the message on how to login. |
Edward Lemur | ba5bc99 | 2019-09-23 22:59:17 +0000 | [diff] [blame] | 560 | (auth.LoginRequiredError().message,)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 561 | http = httplib2.Http() |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 562 | http.force_exception_to_status_code = True |
| 563 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 564 | response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request) |
| 565 | return response.get('builds', []) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 566 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 567 | def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None): |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 568 | """Fetches builds from the latest patchset that has builds (within |
| 569 | the last few patchsets). |
| 570 | |
| 571 | Args: |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 572 | changelist (Changelist): The CL to fetch builds for |
| 573 | buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com" |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 574 | lastest_patchset(int|NoneType): the patchset to start fetching builds from. |
| 575 | If None (default), starts with the latest available patchset. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 576 | Returns: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 577 | A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build, |
| 578 | and patchset is the patchset number where those builds came from. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 579 | """ |
| 580 | assert buildbucket_host |
| 581 | assert changelist.GetIssue(), 'CL must be uploaded first' |
| 582 | assert changelist.GetCodereviewServer(), 'CL must be uploaded first' |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 583 | if latest_patchset is None: |
| 584 | assert changelist.GetMostRecentPatchset() |
| 585 | ps = changelist.GetMostRecentPatchset() |
| 586 | else: |
| 587 | assert latest_patchset > 0, latest_patchset |
| 588 | ps = latest_patchset |
| 589 | |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 590 | min_ps = max(1, ps - 5) |
| 591 | while ps >= min_ps: |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 592 | builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 593 | if len(builds): |
| 594 | return builds, ps |
| 595 | ps -= 1 |
| 596 | return [], 0 |
| 597 | |
| 598 | |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 599 | def _filter_failed_for_retry(all_builds): |
| 600 | """Returns a list of buckets/builders that are worth retrying. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 601 | |
| 602 | Args: |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 603 | all_builds (list): Builds, in the format returned by fetch_try_jobs, |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 604 | i.e. a list of buildbucket.v2.Builds which includes status and builder |
| 605 | info. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 606 | |
| 607 | Returns: |
| 608 | A dict of bucket to builder to tests (empty list). This is the same format |
| 609 | accepted by _trigger_try_jobs and returned by _get_bucket_map. |
| 610 | """ |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 611 | |
| 612 | def _builder_of(build): |
| 613 | builder = build['builder'] |
| 614 | return (builder['project'], builder['bucket'], builder['builder']) |
| 615 | |
| 616 | res = collections.defaultdict(dict) |
| 617 | ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime'])) |
| 618 | for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of): |
| 619 | # If builder had several builds, retry only if the last one failed. |
| 620 | # This is a bit different from CQ, which would re-use *any* SUCCESS-full |
| 621 | # build, but in case of retrying failed jobs retrying a flaky one makes |
| 622 | # sense. |
| 623 | builds = list(builds) |
| 624 | if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'): |
| 625 | continue |
| 626 | if any(t['key'] == 'cq_experimental' and t['value'] == 'true' |
| 627 | for t in builds[-1]['tags']): |
| 628 | # Don't retry experimental build previously triggered by CQ. |
| 629 | continue |
| 630 | if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds): |
| 631 | # Don't retry if any are running. |
| 632 | continue |
| 633 | res[proj + '/' + buck][bldr] = [] |
| 634 | return res |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 635 | |
| 636 | |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 637 | def print_try_jobs(options, builds): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 638 | """Prints nicely result of fetch_try_jobs.""" |
| 639 | if not builds: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 640 | print('No tryjobs scheduled.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 641 | return |
| 642 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 643 | longest_builder = max(len(b['builder']['builder']) for b in builds) |
| 644 | name_fmt = '{builder:<%d}' % longest_builder |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 645 | if options.print_master: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 646 | longest_bucket = max(len(b['builder']['bucket']) for b in builds) |
| 647 | name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 648 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 649 | builds_by_status = {} |
| 650 | for b in builds: |
| 651 | builds_by_status.setdefault(b['status'], []).append({ |
| 652 | 'id': b['id'], |
| 653 | 'name': name_fmt.format( |
| 654 | builder=b['builder']['builder'], bucket=b['builder']['bucket']), |
| 655 | }) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 656 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 657 | sort_key = lambda b: (b['name'], b['id']) |
| 658 | |
| 659 | def print_builds(title, builds, fmt=None, color=None): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 660 | """Pop matching builds from `builds` dict and print them.""" |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 661 | if not builds: |
| 662 | return |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 663 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 664 | fmt = fmt or '{name} https://ci.chromium.org/b/{id}' |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 665 | if not options.color or color is None: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 666 | colorize = lambda x: x |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 667 | else: |
| 668 | colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET) |
| 669 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 670 | print(colorize(title)) |
| 671 | for b in sorted(builds, key=sort_key): |
| 672 | print(' ', colorize(fmt.format(**b))) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 673 | |
| 674 | total = len(builds) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 675 | print_builds( |
| 676 | 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN) |
| 677 | print_builds( |
| 678 | 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []), |
| 679 | color=Fore.MAGENTA) |
| 680 | print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED) |
| 681 | print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}', |
| 682 | color=Fore.MAGENTA) |
| 683 | print_builds('Started:', builds_by_status.pop('STARTED', [])) |
| 684 | print_builds( |
| 685 | 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 686 | # The last section is just in case buildbucket API changes OR there is a bug. |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 687 | print_builds( |
| 688 | 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 689 | print('Total: %d tryjobs' % total) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 690 | |
| 691 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 692 | def _ComputeDiffLineRanges(files, upstream_commit): |
| 693 | """Gets the changed line ranges for each file since upstream_commit. |
| 694 | |
| 695 | Parses a git diff on provided files and returns a dict that maps a file name |
| 696 | to an ordered list of range tuples in the form (start_line, count). |
| 697 | Ranges are in the same format as a git diff. |
| 698 | """ |
| 699 | # If files is empty then diff_output will be a full diff. |
| 700 | if len(files) == 0: |
| 701 | return {} |
| 702 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 703 | # Take the git diff and find the line ranges where there are changes. |
Jamie Madill | 3671a6a | 2019-10-24 15:13:21 +0000 | [diff] [blame] | 704 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 705 | diff_output = RunGit(diff_cmd) |
| 706 | |
| 707 | pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)' |
| 708 | # 2 capture groups |
| 709 | # 0 == fname of diff file |
| 710 | # 1 == 'diff_start,diff_count' or 'diff_start' |
| 711 | # will match each of |
| 712 | # diff --git a/foo.foo b/foo.py |
| 713 | # @@ -12,2 +14,3 @@ |
| 714 | # @@ -12,2 +17 @@ |
| 715 | # running re.findall on the above string with pattern will give |
| 716 | # [('foo.py', ''), ('', '14,3'), ('', '17')] |
| 717 | |
| 718 | curr_file = None |
| 719 | line_diffs = {} |
| 720 | for match in re.findall(pattern, diff_output, flags=re.MULTILINE): |
| 721 | if match[0] != '': |
| 722 | # Will match the second filename in diff --git a/a.py b/b.py. |
| 723 | curr_file = match[0] |
| 724 | line_diffs[curr_file] = [] |
| 725 | else: |
| 726 | # Matches +14,3 |
| 727 | if ',' in match[1]: |
| 728 | diff_start, diff_count = match[1].split(',') |
| 729 | else: |
| 730 | # Single line changes are of the form +12 instead of +12,1. |
| 731 | diff_start = match[1] |
| 732 | diff_count = 1 |
| 733 | |
| 734 | diff_start = int(diff_start) |
| 735 | diff_count = int(diff_count) |
| 736 | |
| 737 | # If diff_count == 0 this is a removal we can ignore. |
| 738 | line_diffs[curr_file].append((diff_start, diff_count)) |
| 739 | |
| 740 | return line_diffs |
| 741 | |
| 742 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 743 | def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None): |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 744 | """Checks if a yapf file is in any parent directory of fpath until top_dir. |
| 745 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 746 | Recursively checks parent directories to find yapf file and if no yapf file |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 747 | is found returns None. Uses yapf_config_cache as a cache for previously found |
| 748 | configs. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 749 | """ |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 750 | fpath = os.path.abspath(fpath) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 751 | # Return result if we've already computed it. |
| 752 | if fpath in yapf_config_cache: |
| 753 | return yapf_config_cache[fpath] |
| 754 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 755 | parent_dir = os.path.dirname(fpath) |
| 756 | if os.path.isfile(fpath): |
| 757 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 758 | else: |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 759 | # Otherwise fpath is a directory |
| 760 | yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME) |
| 761 | if os.path.isfile(yapf_file): |
| 762 | ret = yapf_file |
| 763 | elif fpath == top_dir or parent_dir == fpath: |
| 764 | # If we're at the top level directory, or if we're at root |
| 765 | # there is no provided style. |
| 766 | ret = None |
| 767 | else: |
| 768 | # Otherwise recurse on the current directory. |
| 769 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 770 | yapf_config_cache[fpath] = ret |
| 771 | return ret |
| 772 | |
| 773 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 774 | def _GetYapfIgnorePatterns(top_dir): |
| 775 | """Returns all patterns in the .yapfignore file. |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 776 | |
| 777 | yapf is supposed to handle the ignoring of files listed in .yapfignore itself, |
| 778 | but this functionality appears to break when explicitly passing files to |
| 779 | yapf for formatting. According to |
| 780 | https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore, |
| 781 | the .yapfignore file should be in the directory that yapf is invoked from, |
| 782 | which we assume to be the top level directory in this case. |
| 783 | |
| 784 | Args: |
| 785 | top_dir: The top level directory for the repository being formatted. |
| 786 | |
| 787 | Returns: |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 788 | A set of all fnmatch patterns to be ignored. |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 789 | """ |
| 790 | yapfignore_file = os.path.join(top_dir, '.yapfignore') |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 791 | ignore_patterns = set() |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 792 | if not os.path.exists(yapfignore_file): |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 793 | return ignore_patterns |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 794 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 795 | with open(yapfignore_file) as f: |
| 796 | for line in f.readlines(): |
| 797 | stripped_line = line.strip() |
| 798 | # Comments and blank lines should be ignored. |
| 799 | if stripped_line.startswith('#') or stripped_line == '': |
| 800 | continue |
| 801 | ignore_patterns.add(stripped_line) |
| 802 | return ignore_patterns |
| 803 | |
| 804 | |
| 805 | def _FilterYapfIgnoredFiles(filepaths, patterns): |
| 806 | """Filters out any filepaths that match any of the given patterns. |
| 807 | |
| 808 | Args: |
| 809 | filepaths: An iterable of strings containing filepaths to filter. |
| 810 | patterns: An iterable of strings containing fnmatch patterns to filter on. |
| 811 | |
| 812 | Returns: |
| 813 | A list of strings containing all the elements of |filepaths| that did not |
| 814 | match any of the patterns in |patterns|. |
| 815 | """ |
| 816 | # Not inlined so that tests can use the same implementation. |
| 817 | return [f for f in filepaths |
| 818 | if not any(fnmatch.fnmatch(f, p) for p in patterns)] |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 819 | |
| 820 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 821 | def print_stats(args): |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 822 | """Prints statistics about the change to the user.""" |
| 823 | # --no-ext-diff is broken in some versions of Git, so try to work around |
| 824 | # this by overriding the environment (but there is still a problem if the |
| 825 | # git config key "diff.external" is used). |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 826 | env = GetNoGitPagerEnv() |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 827 | if 'GIT_EXTERNAL_DIFF' in env: |
| 828 | del env['GIT_EXTERNAL_DIFF'] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 829 | |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 830 | return subprocess2.call( |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 831 | ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args, |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 832 | env=env) |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 833 | |
| 834 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 835 | class BuildbucketResponseException(Exception): |
| 836 | pass |
| 837 | |
| 838 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 839 | class Settings(object): |
| 840 | def __init__(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 841 | self.cc = None |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 842 | self.root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 843 | self.tree_status_url = None |
| 844 | self.viewvc_url = None |
| 845 | self.updated = False |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 846 | self.is_gerrit = None |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 847 | self.squash_gerrit_uploads = None |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 848 | self.gerrit_skip_ensure_authenticated = None |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 849 | self.git_editor = None |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 850 | self.format_full_by_default = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 851 | |
| 852 | def LazyUpdateIfNeeded(self): |
| 853 | """Updates the settings from a codereview.settings file, if available.""" |
| 854 | if not self.updated: |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 855 | # The only value that actually changes the behavior is |
| 856 | # autoupdate = "false". Everything else means "true". |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 857 | autoupdate = RunGit(['config', 'rietveld.autoupdate'], |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 858 | error_ok=True |
| 859 | ).strip().lower() |
| 860 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 861 | cr_settings_file = FindCodereviewSettingsFile() |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 862 | if autoupdate != 'false' and cr_settings_file: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 863 | LoadCodereviewSettingsFromFile(cr_settings_file) |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 864 | cr_settings_file.close() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 865 | self.updated = True |
| 866 | |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 867 | @staticmethod |
| 868 | def GetRelativeRoot(): |
| 869 | return RunGit(['rev-parse', '--show-cdup']).strip() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 870 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 871 | def GetRoot(self): |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 872 | if self.root is None: |
| 873 | self.root = os.path.abspath(self.GetRelativeRoot()) |
| 874 | return self.root |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 875 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 876 | def GetTreeStatusUrl(self, error_ok=False): |
| 877 | if not self.tree_status_url: |
| 878 | error_message = ('You must configure your tree status URL by running ' |
| 879 | '"git cl config".') |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 880 | self.tree_status_url = self._GetConfig( |
| 881 | 'rietveld.tree-status-url', error_ok=error_ok, |
| 882 | error_message=error_message) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 883 | return self.tree_status_url |
| 884 | |
| 885 | def GetViewVCUrl(self): |
| 886 | if not self.viewvc_url: |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 887 | self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 888 | return self.viewvc_url |
| 889 | |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 890 | def GetBugPrefix(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 891 | return self._GetConfig('rietveld.bug-prefix', error_ok=True) |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 892 | |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 893 | def GetRunPostUploadHook(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 894 | run_post_upload_hook = self._GetConfig( |
| 895 | 'rietveld.run-post-upload-hook', error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 896 | return run_post_upload_hook == "True" |
| 897 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 898 | def GetDefaultCCList(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 899 | return self._GetConfig('rietveld.cc', error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 900 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 901 | def GetIsGerrit(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 902 | """Returns True if this repo is associated with Gerrit.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 903 | if self.is_gerrit is None: |
Aaron Gable | 9b46527 | 2017-05-12 10:53:51 -0700 | [diff] [blame] | 904 | self.is_gerrit = ( |
| 905 | self._GetConfig('gerrit.host', error_ok=True).lower() == 'true') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 906 | return self.is_gerrit |
| 907 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 908 | def GetSquashGerritUploads(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 909 | """Returns True if uploads to Gerrit should be squashed by default.""" |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 910 | if self.squash_gerrit_uploads is None: |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 911 | self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride() |
| 912 | if self.squash_gerrit_uploads is None: |
| 913 | # Default is squash now (http://crbug.com/611892#c23). |
| 914 | self.squash_gerrit_uploads = not ( |
| 915 | RunGit(['config', '--bool', 'gerrit.squash-uploads'], |
| 916 | error_ok=True).strip() == 'false') |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 917 | return self.squash_gerrit_uploads |
| 918 | |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 919 | def GetSquashGerritUploadsOverride(self): |
| 920 | """Return True or False if codereview.settings should be overridden. |
| 921 | |
| 922 | Returns None if no override has been defined. |
| 923 | """ |
| 924 | # See also http://crbug.com/611892#c23 |
| 925 | result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'], |
| 926 | error_ok=True).strip() |
| 927 | if result == 'true': |
| 928 | return True |
| 929 | if result == 'false': |
| 930 | return False |
| 931 | return None |
| 932 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 933 | def GetGerritSkipEnsureAuthenticated(self): |
| 934 | """Return True if EnsureAuthenticated should not be done for Gerrit |
| 935 | uploads.""" |
| 936 | if self.gerrit_skip_ensure_authenticated is None: |
| 937 | self.gerrit_skip_ensure_authenticated = ( |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 938 | RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'], |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 939 | error_ok=True).strip() == 'true') |
| 940 | return self.gerrit_skip_ensure_authenticated |
| 941 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 942 | def GetGitEditor(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 943 | """Returns the editor specified in the git config, or None if none is.""" |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 944 | if self.git_editor is None: |
Raul Tambre | 5a52587 | 2019-02-12 19:08:08 +0000 | [diff] [blame] | 945 | # Git requires single quotes for paths with spaces. We need to replace |
| 946 | # them with double quotes for Windows to treat such paths as a single |
| 947 | # path. |
| 948 | self.git_editor = self._GetConfig( |
| 949 | 'core.editor', error_ok=True).replace('\'', '"') |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 950 | return self.git_editor or None |
| 951 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 952 | def GetLintRegex(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 953 | return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 954 | DEFAULT_LINT_REGEX) |
| 955 | |
| 956 | def GetLintIgnoreRegex(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 957 | return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 958 | DEFAULT_LINT_IGNORE_REGEX) |
| 959 | |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 960 | def GetFormatFullByDefault(self): |
| 961 | if self.format_full_by_default is None: |
| 962 | result = ( |
| 963 | RunGit(['config', '--bool', 'rietveld.format-full-by-default'], |
| 964 | error_ok=True).strip()) |
| 965 | self.format_full_by_default = (result == 'true') |
| 966 | return self.format_full_by_default |
| 967 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 968 | def _GetConfig(self, param, **kwargs): |
| 969 | self.LazyUpdateIfNeeded() |
| 970 | return RunGit(['config', param], **kwargs).strip() |
| 971 | |
| 972 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 973 | def ShortBranchName(branch): |
| 974 | """Convert a name like 'refs/heads/foo' to just 'foo'.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 975 | return branch.replace('refs/heads/', '', 1) |
| 976 | |
| 977 | |
| 978 | def GetCurrentBranchRef(): |
| 979 | """Returns branch ref (e.g., refs/heads/master) or None.""" |
| 980 | return RunGit(['symbolic-ref', 'HEAD'], |
| 981 | stderr=subprocess2.VOID, error_ok=True).strip() or None |
| 982 | |
| 983 | |
| 984 | def GetCurrentBranch(): |
| 985 | """Returns current branch or None. |
| 986 | |
| 987 | For refs/heads/* branches, returns just last part. For others, full ref. |
| 988 | """ |
| 989 | branchref = GetCurrentBranchRef() |
| 990 | if branchref: |
| 991 | return ShortBranchName(branchref) |
| 992 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 993 | |
| 994 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 995 | class _CQState(object): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 996 | """Enum for states of CL with respect to CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 997 | NONE = 'none' |
| 998 | DRY_RUN = 'dry_run' |
| 999 | COMMIT = 'commit' |
| 1000 | |
| 1001 | ALL_STATES = [NONE, DRY_RUN, COMMIT] |
| 1002 | |
| 1003 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1004 | class _ParsedIssueNumberArgument(object): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1005 | def __init__(self, issue=None, patchset=None, hostname=None): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1006 | self.issue = issue |
| 1007 | self.patchset = patchset |
| 1008 | self.hostname = hostname |
| 1009 | |
| 1010 | @property |
| 1011 | def valid(self): |
| 1012 | return self.issue is not None |
| 1013 | |
| 1014 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1015 | def ParseIssueNumberArgument(arg): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1016 | """Parses the issue argument and returns _ParsedIssueNumberArgument.""" |
| 1017 | fail_result = _ParsedIssueNumberArgument() |
| 1018 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 1019 | if isinstance(arg, int): |
| 1020 | return _ParsedIssueNumberArgument(issue=arg) |
| 1021 | if not isinstance(arg, basestring): |
| 1022 | return fail_result |
| 1023 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1024 | if arg.isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1025 | return _ParsedIssueNumberArgument(issue=int(arg)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1026 | if not arg.startswith('http'): |
| 1027 | return fail_result |
Aaron Gable | aee6c85 | 2017-06-26 12:49:01 -0700 | [diff] [blame] | 1028 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1029 | url = gclient_utils.UpgradeToHttps(arg) |
| 1030 | try: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1031 | parsed_url = urllib.parse.urlparse(url) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1032 | except ValueError: |
| 1033 | return fail_result |
Andrii Shyshkalov | 28d840e | 2017-04-10 15:45:09 +0200 | [diff] [blame] | 1034 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 1035 | # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]] |
| 1036 | # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]] |
| 1037 | # Short urls like https://domain/<issue_number> can be used, but don't allow |
| 1038 | # specifying the patchset (you'd 404), but we allow that here. |
| 1039 | if parsed_url.path == '/': |
| 1040 | part = parsed_url.fragment |
| 1041 | else: |
| 1042 | part = parsed_url.path |
| 1043 | |
| 1044 | match = re.match( |
| 1045 | r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part) |
| 1046 | if not match: |
| 1047 | return fail_result |
| 1048 | |
| 1049 | issue = int(match.group('issue')) |
| 1050 | patchset = match.group('patchset') |
| 1051 | return _ParsedIssueNumberArgument( |
| 1052 | issue=issue, |
| 1053 | patchset=int(patchset) if patchset else None, |
| 1054 | hostname=parsed_url.netloc) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1055 | |
| 1056 | |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 1057 | def _create_description_from_log(args): |
| 1058 | """Pulls out the commit log to use as a base for the CL description.""" |
| 1059 | log_args = [] |
| 1060 | if len(args) == 1 and not args[0].endswith('.'): |
| 1061 | log_args = [args[0] + '..'] |
| 1062 | elif len(args) == 1 and args[0].endswith('...'): |
| 1063 | log_args = [args[0][:-1]] |
| 1064 | elif len(args) == 2: |
| 1065 | log_args = [args[0] + '..' + args[1]] |
| 1066 | else: |
| 1067 | log_args = args[:] # Hope for the best! |
| 1068 | return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args) |
| 1069 | |
| 1070 | |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1071 | class GerritChangeNotExists(Exception): |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1072 | def __init__(self, issue, url): |
| 1073 | self.issue = issue |
| 1074 | self.url = url |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1075 | super(GerritChangeNotExists, self).__init__() |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1076 | |
| 1077 | def __str__(self): |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1078 | return 'change %s at %s does not exist or you have no access to it' % ( |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1079 | self.issue, self.url) |
| 1080 | |
| 1081 | |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 1082 | _CommentSummary = collections.namedtuple( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1083 | '_CommentSummary', ['date', 'message', 'sender', 'autogenerated', |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 1084 | # TODO(tandrii): these two aren't known in Gerrit. |
| 1085 | 'approval', 'disapproval']) |
| 1086 | |
| 1087 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1088 | class Changelist(object): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1089 | """Changelist works with one changelist in local branch. |
| 1090 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 1091 | Notes: |
| 1092 | * Not safe for concurrent multi-{thread,process} use. |
| 1093 | * Caches values from current branch. Therefore, re-use after branch change |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1094 | with great care. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1095 | """ |
| 1096 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1097 | def __init__(self, branchref=None, issue=None, codereview_host=None): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1098 | """Create a new ChangeList instance. |
| 1099 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1100 | **kwargs will be passed directly to Gerrit implementation. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1101 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1102 | # Poke settings so we get the "configure your server" message if necessary. |
maruel@chromium.org | 379d07a | 2011-11-30 14:58:10 +0000 | [diff] [blame] | 1103 | global settings |
| 1104 | if not settings: |
| 1105 | # Happens when git_cl.py is used as a utility library. |
| 1106 | settings = Settings() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1107 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1108 | self.branchref = branchref |
| 1109 | if self.branchref: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 1110 | assert branchref.startswith('refs/heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1111 | self.branch = ShortBranchName(self.branchref) |
| 1112 | else: |
| 1113 | self.branch = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1114 | self.upstream_branch = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1115 | self.lookedup_issue = False |
| 1116 | self.issue = issue or None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1117 | self.has_description = False |
| 1118 | self.description = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1119 | self.lookedup_patchset = False |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1120 | self.patchset = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1121 | self.cc = None |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1122 | self.more_cc = [] |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1123 | self._remote = None |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1124 | self._cached_remote_url = (False, None) # (is_cached, value) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1125 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1126 | # Lazily cached values. |
| 1127 | self._gerrit_host = None # e.g. chromium-review.googlesource.com |
| 1128 | self._gerrit_server = None # e.g. https://chromium-review.googlesource.com |
| 1129 | # Map from change number (issue) to its detail cache. |
| 1130 | self._detail_cache = {} |
| 1131 | |
| 1132 | if codereview_host is not None: |
| 1133 | assert not codereview_host.startswith('https://'), codereview_host |
| 1134 | self._gerrit_host = codereview_host |
| 1135 | self._gerrit_server = 'https://%s' % codereview_host |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1136 | |
| 1137 | def GetCCList(self): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1138 | """Returns the users cc'd on this CL. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1139 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1140 | The return value is a string suitable for passing to git cl with the --cc |
| 1141 | flag. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1142 | """ |
| 1143 | if self.cc is None: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1144 | base_cc = settings.GetDefaultCCList() |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1145 | more_cc = ','.join(self.more_cc) |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1146 | self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' |
| 1147 | return self.cc |
| 1148 | |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1149 | def GetCCListWithoutDefault(self): |
| 1150 | """Return the users cc'd on this CL excluding default ones.""" |
| 1151 | if self.cc is None: |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1152 | self.cc = ','.join(self.more_cc) |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1153 | return self.cc |
| 1154 | |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1155 | def ExtendCC(self, more_cc): |
| 1156 | """Extends the list of users to cc on this CL based on the changed files.""" |
| 1157 | self.more_cc.extend(more_cc) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1158 | |
| 1159 | def GetBranch(self): |
| 1160 | """Returns the short branch name, e.g. 'master'.""" |
| 1161 | if not self.branch: |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1162 | branchref = GetCurrentBranchRef() |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 1163 | if not branchref: |
| 1164 | return None |
| 1165 | self.branchref = branchref |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1166 | self.branch = ShortBranchName(self.branchref) |
| 1167 | return self.branch |
| 1168 | |
| 1169 | def GetBranchRef(self): |
| 1170 | """Returns the full branch name, e.g. 'refs/heads/master'.""" |
| 1171 | self.GetBranch() # Poke the lazy loader. |
| 1172 | return self.branchref |
| 1173 | |
tandrii@chromium.org | 534f67a | 2016-04-07 18:47:05 +0000 | [diff] [blame] | 1174 | def ClearBranch(self): |
| 1175 | """Clears cached branch data of this object.""" |
| 1176 | self.branch = self.branchref = None |
| 1177 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1178 | def _GitGetBranchConfigValue(self, key, default=None, **kwargs): |
| 1179 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1180 | kwargs['branch'] = self.GetBranch() |
| 1181 | return _git_get_branch_config_value(key, default, **kwargs) |
| 1182 | |
| 1183 | def _GitSetBranchConfigValue(self, key, value, **kwargs): |
| 1184 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1185 | assert self.GetBranch(), ( |
| 1186 | 'this CL must have an associated branch to %sset %s%s' % |
| 1187 | ('un' if value is None else '', |
| 1188 | key, |
| 1189 | '' if value is None else ' to %r' % value)) |
| 1190 | kwargs['branch'] = self.GetBranch() |
| 1191 | return _git_set_branch_config_value(key, value, **kwargs) |
| 1192 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1193 | @staticmethod |
| 1194 | def FetchUpstreamTuple(branch): |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1195 | """Returns a tuple containing remote and remote ref, |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1196 | e.g. 'origin', 'refs/heads/master' |
| 1197 | """ |
| 1198 | remote = '.' |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1199 | upstream_branch = _git_get_branch_config_value('merge', branch=branch) |
| 1200 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1201 | if upstream_branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1202 | remote = _git_get_branch_config_value('remote', branch=branch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1203 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 1204 | upstream_branch = RunGit(['config', 'rietveld.upstream-branch'], |
| 1205 | error_ok=True).strip() |
| 1206 | if upstream_branch: |
| 1207 | remote = RunGit(['config', 'rietveld.upstream-remote']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1208 | else: |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1209 | # Else, try to guess the origin remote. |
| 1210 | remote_branches = RunGit(['branch', '-r']).split() |
| 1211 | if 'origin/master' in remote_branches: |
| 1212 | # Fall back on origin/master if it exits. |
| 1213 | remote = 'origin' |
| 1214 | upstream_branch = 'refs/heads/master' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1215 | else: |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1216 | DieWithError( |
| 1217 | 'Unable to determine default branch to diff against.\n' |
| 1218 | 'Either pass complete "git diff"-style arguments, like\n' |
| 1219 | ' git cl upload origin/master\n' |
| 1220 | 'or verify this branch is set up to track another \n' |
| 1221 | '(via the --track argument to "git checkout -b ...").') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1222 | |
| 1223 | return remote, upstream_branch |
| 1224 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1225 | def GetCommonAncestorWithUpstream(self): |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1226 | upstream_branch = self.GetUpstreamBranch() |
| 1227 | if not BranchExists(upstream_branch): |
| 1228 | DieWithError('The upstream for the current branch (%s) does not exist ' |
| 1229 | 'anymore.\nPlease fix it and try again.' % self.GetBranch()) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 1230 | return git_common.get_or_create_merge_base(self.GetBranch(), |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1231 | upstream_branch) |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1232 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1233 | def GetUpstreamBranch(self): |
| 1234 | if self.upstream_branch is None: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1235 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Raul Tambre | fe1dbe1 | 2019-05-02 04:43:57 +0000 | [diff] [blame] | 1236 | if remote != '.': |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1237 | upstream_branch = upstream_branch.replace('refs/heads/', |
| 1238 | 'refs/remotes/%s/' % remote) |
| 1239 | upstream_branch = upstream_branch.replace('refs/branch-heads/', |
| 1240 | 'refs/remotes/branch-heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1241 | self.upstream_branch = upstream_branch |
| 1242 | return self.upstream_branch |
| 1243 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1244 | def GetRemoteBranch(self): |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1245 | if not self._remote: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1246 | remote, branch = None, self.GetBranch() |
| 1247 | seen_branches = set() |
| 1248 | while branch not in seen_branches: |
| 1249 | seen_branches.add(branch) |
| 1250 | remote, branch = self.FetchUpstreamTuple(branch) |
| 1251 | branch = ShortBranchName(branch) |
| 1252 | if remote != '.' or branch.startswith('refs/remotes'): |
| 1253 | break |
| 1254 | else: |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1255 | remotes = RunGit(['remote'], error_ok=True).split() |
| 1256 | if len(remotes) == 1: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1257 | remote, = remotes |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1258 | elif 'origin' in remotes: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1259 | remote = 'origin' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1260 | logging.warn('Could not determine which remote this change is ' |
| 1261 | 'associated with, so defaulting to "%s".' % self._remote) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1262 | else: |
| 1263 | logging.warn('Could not determine which remote this change is ' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1264 | 'associated with.') |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1265 | branch = 'HEAD' |
| 1266 | if branch.startswith('refs/remotes'): |
| 1267 | self._remote = (remote, branch) |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1268 | elif branch.startswith('refs/branch-heads/'): |
| 1269 | self._remote = (remote, branch.replace('refs/', 'refs/remotes/')) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1270 | else: |
| 1271 | self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch)) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1272 | return self._remote |
| 1273 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1274 | def GitSanityChecks(self, upstream_git_obj): |
| 1275 | """Checks git repo status and ensures diff is from local commits.""" |
| 1276 | |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1277 | if upstream_git_obj is None: |
| 1278 | if self.GetBranch() is None: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1279 | print('ERROR: Unable to determine current branch (detached HEAD?)', |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1280 | file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1281 | else: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1282 | print('ERROR: No upstream branch.', file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1283 | return False |
| 1284 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1285 | # Verify the commit we're diffing against is in our current branch. |
| 1286 | upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip() |
| 1287 | common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip() |
| 1288 | if upstream_sha != common_ancestor: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1289 | print('ERROR: %s is not in the current branch. You may need to rebase ' |
| 1290 | 'your tracking branch' % upstream_sha, file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1291 | return False |
| 1292 | |
| 1293 | # List the commits inside the diff, and verify they are all local. |
| 1294 | commits_in_diff = RunGit( |
| 1295 | ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines() |
| 1296 | code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch']) |
| 1297 | remote_branch = remote_branch.strip() |
| 1298 | if code != 0: |
| 1299 | _, remote_branch = self.GetRemoteBranch() |
| 1300 | |
| 1301 | commits_in_remote = RunGit( |
| 1302 | ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines() |
| 1303 | |
| 1304 | common_commits = set(commits_in_diff) & set(commits_in_remote) |
| 1305 | if common_commits: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1306 | print('ERROR: Your diff contains %d commits already in %s.\n' |
| 1307 | 'Run "git log --oneline %s..HEAD" to get a list of commits in ' |
| 1308 | 'the diff. If you are using a custom git flow, you can override' |
| 1309 | ' the reference used for this check with "git config ' |
| 1310 | 'gitcl.remotebranch <git-ref>".' % ( |
| 1311 | len(common_commits), remote_branch, upstream_git_obj), |
| 1312 | file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1313 | return False |
| 1314 | return True |
| 1315 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1316 | def GetGitBaseUrlFromConfig(self): |
sheyang@chromium.org | a656e70 | 2014-05-15 20:43:05 +0000 | [diff] [blame] | 1317 | """Return the configured base URL from branch.<branchname>.baseurl. |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1318 | |
| 1319 | Returns None if it is not set. |
| 1320 | """ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1321 | return self._GitGetBranchConfigValue('base-url') |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1322 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1323 | def GetRemoteUrl(self): |
| 1324 | """Return the configured remote URL, e.g. 'git://example.org/foo.git/'. |
| 1325 | |
| 1326 | Returns None if there is no remote. |
| 1327 | """ |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1328 | is_cached, value = self._cached_remote_url |
| 1329 | if is_cached: |
| 1330 | return value |
| 1331 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1332 | remote, _ = self.GetRemoteBranch() |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1333 | url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip() |
| 1334 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1335 | # Check if the remote url can be parsed as an URL. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1336 | host = urllib.parse.urlparse(url).netloc |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1337 | if host: |
| 1338 | self._cached_remote_url = (True, url) |
| 1339 | return url |
| 1340 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1341 | # If it cannot be parsed as an url, assume it is a local directory, |
| 1342 | # probably a git cache. |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1343 | logging.warning('"%s" doesn\'t appear to point to a git host. ' |
| 1344 | 'Interpreting it as a local directory.', url) |
| 1345 | if not os.path.isdir(url): |
| 1346 | logging.error( |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1347 | 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", ' |
| 1348 | 'but it doesn\'t exist.', |
| 1349 | {'remote': remote, 'branch': self.GetBranch(), 'url': url}) |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1350 | return None |
| 1351 | |
| 1352 | cache_path = url |
| 1353 | url = RunGit(['config', 'remote.%s.url' % remote], |
| 1354 | error_ok=True, |
| 1355 | cwd=url).strip() |
| 1356 | |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1357 | host = urllib.parse.urlparse(url).netloc |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1358 | if not host: |
| 1359 | logging.error( |
| 1360 | 'Remote "%(remote)s" for branch "%(branch)s" points to ' |
| 1361 | '"%(cache_path)s", but it is misconfigured.\n' |
| 1362 | '"%(cache_path)s" must be a git repo and must have a remote named ' |
| 1363 | '"%(remote)s" pointing to the git host.', { |
| 1364 | 'remote': remote, |
| 1365 | 'cache_path': cache_path, |
| 1366 | 'branch': self.GetBranch()}) |
| 1367 | return None |
| 1368 | |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1369 | self._cached_remote_url = (True, url) |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1370 | return url |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1371 | |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1372 | def GetIssue(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1373 | """Returns the issue number as a int or None if not set.""" |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1374 | if self.issue is None and not self.lookedup_issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1375 | self.issue = self._GitGetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1376 | self.IssueConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1377 | self.lookedup_issue = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1378 | return self.issue |
| 1379 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1380 | def GetIssueURL(self): |
| 1381 | """Get the URL for a particular issue.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1382 | issue = self.GetIssue() |
| 1383 | if not issue: |
dbeam@chromium.org | 015fd3d | 2013-06-18 19:02:50 +0000 | [diff] [blame] | 1384 | return None |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1385 | return '%s/%s' % (self.GetCodereviewServer(), issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1386 | |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1387 | def GetLocalDescription(self, upstream_branch): |
| 1388 | """Return the log messages of all commits up to the branch point.""" |
| 1389 | args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)] |
| 1390 | return RunGitWithCode(args)[1].strip() |
| 1391 | |
Andrii Shyshkalov | 3186301 | 2017-02-08 11:35:12 +0100 | [diff] [blame] | 1392 | def GetDescription(self, pretty=False, force=False): |
| 1393 | if not self.has_description or force: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1394 | if self.GetIssue(): |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1395 | self.description = self.FetchDescription(force=force) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1396 | self.has_description = True |
| 1397 | if pretty: |
Asanka Herath | 7c61dcb | 2016-12-14 13:01:58 -0500 | [diff] [blame] | 1398 | # Set width to 72 columns + 2 space indent. |
| 1399 | wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1400 | wrapper.initial_indent = wrapper.subsequent_indent = ' ' |
Asanka Herath | 7c61dcb | 2016-12-14 13:01:58 -0500 | [diff] [blame] | 1401 | lines = self.description.splitlines() |
| 1402 | return '\n'.join([wrapper.fill(line) for line in lines]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1403 | return self.description |
| 1404 | |
| 1405 | def GetPatchset(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1406 | """Returns the patchset number as a int or None if not set.""" |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1407 | if self.patchset is None and not self.lookedup_patchset: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1408 | self.patchset = self._GitGetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1409 | self.PatchsetConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1410 | self.lookedup_patchset = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1411 | return self.patchset |
| 1412 | |
| 1413 | def SetPatchset(self, patchset): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1414 | """Set this branch's patchset. If patchset=0, clears the patchset.""" |
| 1415 | assert self.GetBranch() |
| 1416 | if not patchset: |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1417 | self.patchset = None |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1418 | else: |
| 1419 | self.patchset = int(patchset) |
| 1420 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1421 | self.PatchsetConfigKey(), self.patchset) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1422 | |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 1423 | def SetIssue(self, issue=None): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1424 | """Set this branch's issue. If issue isn't given, clears the issue.""" |
| 1425 | assert self.GetBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1426 | if issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1427 | issue = int(issue) |
| 1428 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1429 | self.IssueConfigKey(), issue) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1430 | self.issue = issue |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1431 | codereview_server = self.GetCodereviewServer() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1432 | if codereview_server: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1433 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1434 | self.CodereviewServerConfigKey(), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1435 | codereview_server) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1436 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1437 | # Reset all of these just to be clean. |
| 1438 | reset_suffixes = [ |
| 1439 | 'last-upload-hash', |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1440 | self.IssueConfigKey(), |
| 1441 | self.PatchsetConfigKey(), |
| 1442 | self.CodereviewServerConfigKey(), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1443 | ] + self._PostUnsetIssueProperties() |
| 1444 | for prop in reset_suffixes: |
| 1445 | self._GitSetBranchConfigValue(prop, None, error_ok=True) |
Aaron Gable | ca01e2c | 2017-07-19 11:16:02 -0700 | [diff] [blame] | 1446 | msg = RunGit(['log', '-1', '--format=%B']).strip() |
| 1447 | if msg and git_footers.get_footer_change_id(msg): |
| 1448 | print('WARNING: The change patched into this branch has a Change-Id. ' |
| 1449 | 'Removing it.') |
| 1450 | RunGit(['commit', '--amend', '-m', |
| 1451 | git_footers.remove_footer(msg, 'Change-Id')]) |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1452 | self.lookedup_issue = True |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1453 | self.issue = None |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1454 | self.patchset = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1455 | |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1456 | def GetChange(self, upstream_branch): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1457 | if not self.GitSanityChecks(upstream_branch): |
| 1458 | DieWithError('\nGit sanity check failure') |
| 1459 | |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1460 | root = settings.GetRoot() |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1461 | # We use the sha1 of HEAD as a name of this change. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1462 | name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip() |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1463 | try: |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1464 | files = scm.GIT.CaptureStatus(root, upstream_branch) |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1465 | except subprocess2.CalledProcessError: |
| 1466 | DieWithError( |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1467 | ('\nFailed to diff against upstream branch %s\n\n' |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1468 | 'This branch probably doesn\'t exist anymore. To reset the\n' |
| 1469 | 'tracking branch, please run\n' |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 1470 | ' git branch --set-upstream-to origin/master %s\n' |
| 1471 | 'or replace origin/master with the relevant branch') % |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1472 | (upstream_branch, self.GetBranch())) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1473 | |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1474 | issue = self.GetIssue() |
| 1475 | patchset = self.GetPatchset() |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1476 | if issue: |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1477 | description = self.GetDescription() |
| 1478 | else: |
| 1479 | # If the change was never uploaded, use the log messages of all commits |
| 1480 | # up to the branch point, as git cl upload will prefill the description |
| 1481 | # with these log messages. |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1482 | description = self.GetLocalDescription(upstream_branch) |
maruel@chromium.org | 03b3bdc | 2011-06-14 13:04:12 +0000 | [diff] [blame] | 1483 | |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1484 | author = RunGit(['config', 'user.email']).strip() or None |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 1485 | return presubmit_support.GitChange( |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1486 | name, |
| 1487 | description, |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1488 | root, |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1489 | files, |
| 1490 | issue, |
| 1491 | patchset, |
agable@chromium.org | ea84ef1 | 2014-04-30 19:55:12 +0000 | [diff] [blame] | 1492 | author, |
| 1493 | upstream=upstream_branch) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1494 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1495 | def UpdateDescription(self, description, force=False): |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1496 | self.UpdateDescriptionRemote(description, force=force) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1497 | self.description = description |
Andrii Shyshkalov | 8305115 | 2017-02-07 23:47:29 +0100 | [diff] [blame] | 1498 | self.has_description = True |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1499 | |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 1500 | |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 1501 | |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1502 | def RunHook(self, committing, may_prompt, verbose, change, parallel): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1503 | """Calls sys.exit() if the hook fails; returns a HookResults otherwise.""" |
| 1504 | try: |
Edward Lemur | 2c48f24 | 2019-06-04 16:14:09 +0000 | [diff] [blame] | 1505 | start = time_time() |
| 1506 | result = presubmit_support.DoPresubmitChecks(change, committing, |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1507 | verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin, |
| 1508 | default_presubmit=None, may_prompt=may_prompt, |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1509 | gerrit_obj=self.GetGerritObjForPresubmit(), |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1510 | parallel=parallel) |
Edward Lemur | 2c48f24 | 2019-06-04 16:14:09 +0000 | [diff] [blame] | 1511 | metrics.collector.add_repeated('sub_commands', { |
| 1512 | 'command': 'presubmit', |
| 1513 | 'execution_time': time_time() - start, |
| 1514 | 'exit_code': 0 if result.should_continue() else 1, |
| 1515 | }) |
| 1516 | return result |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 1517 | except presubmit_support.PresubmitFailure as e: |
Aaron Gable | 5d5f22c | 2018-02-02 09:12:41 -0800 | [diff] [blame] | 1518 | DieWithError('%s\nMaybe your depot_tools is out of date?' % e) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1519 | |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1520 | def CMDUpload(self, options, git_diff_args, orig_args): |
| 1521 | """Uploads a change to codereview.""" |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1522 | custom_cl_base = None |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1523 | if git_diff_args: |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1524 | custom_cl_base = base_branch = git_diff_args[0] |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1525 | else: |
| 1526 | if self.GetBranch() is None: |
| 1527 | DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') |
| 1528 | |
| 1529 | # Default to diffing against common ancestor of upstream branch |
| 1530 | base_branch = self.GetCommonAncestorWithUpstream() |
| 1531 | git_diff_args = [base_branch, 'HEAD'] |
| 1532 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1533 | # Fast best-effort checks to abort before running potentially expensive |
| 1534 | # hooks if uploading is likely to fail anyway. Passing these checks does |
| 1535 | # not guarantee that uploading will not fail. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1536 | self.EnsureAuthenticated(force=options.force) |
| 1537 | self.EnsureCanUploadPatchset(force=options.force) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1538 | |
| 1539 | # Apply watchlists on upload. |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 1540 | change = self.GetChange(base_branch) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1541 | watchlist = watchlists.Watchlists(change.RepositoryRoot()) |
| 1542 | files = [f.LocalPath() for f in change.AffectedFiles()] |
| 1543 | if not options.bypass_watchlists: |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1544 | self.ExtendCC(watchlist.GetWatchersForPaths(files)) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1545 | |
| 1546 | if not options.bypass_hooks: |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1547 | if options.reviewers or options.tbrs or options.add_owners_to: |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1548 | # Set the reviewer list now so that presubmit checks can access it. |
| 1549 | change_description = ChangeDescription(change.FullDescriptionText()) |
| 1550 | change_description.update_reviewers(options.reviewers, |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1551 | options.tbrs, |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 1552 | options.add_owners_to, |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1553 | change) |
| 1554 | change.SetDescriptionText(change_description.description) |
| 1555 | hook_results = self.RunHook(committing=False, |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1556 | may_prompt=not options.force, |
| 1557 | verbose=options.verbose, |
| 1558 | change=change, parallel=options.parallel) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1559 | if not hook_results.should_continue(): |
| 1560 | return 1 |
| 1561 | if not options.reviewers and hook_results.reviewers: |
| 1562 | options.reviewers = hook_results.reviewers.split(',') |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1563 | self.ExtendCC(hook_results.more_cc) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1564 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 1565 | print_stats(git_diff_args) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1566 | ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1567 | if not ret: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1568 | _git_set_branch_config_value('last-upload-hash', |
| 1569 | RunGit(['rev-parse', 'HEAD']).strip()) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1570 | # Run post upload hooks, if specified. |
| 1571 | if settings.GetRunPostUploadHook(): |
| 1572 | presubmit_support.DoPostUploadExecuter( |
| 1573 | change, |
Edward Lemur | 016a087 | 2020-02-04 22:13:28 +0000 | [diff] [blame] | 1574 | self.GetGerritObjForPresubmit(), |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1575 | settings.GetRoot(), |
| 1576 | options.verbose, |
| 1577 | sys.stdout) |
| 1578 | |
| 1579 | # Upload all dependencies if specified. |
| 1580 | if options.dependencies: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1581 | print() |
| 1582 | print('--dependencies has been specified.') |
| 1583 | print('All dependent local branches will be re-uploaded.') |
| 1584 | print() |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1585 | # Remove the dependencies flag from args so that we do not end up in a |
| 1586 | # loop. |
| 1587 | orig_args.remove('--dependencies') |
| 1588 | ret = upload_branch_deps(self, orig_args) |
| 1589 | return ret |
| 1590 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1591 | def SetCQState(self, new_state): |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1592 | """Updates the CQ state for the latest patchset. |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1593 | |
| 1594 | Issue must have been already uploaded and known. |
| 1595 | """ |
| 1596 | assert new_state in _CQState.ALL_STATES |
| 1597 | assert self.GetIssue() |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1598 | try: |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1599 | vote_map = { |
| 1600 | _CQState.NONE: 0, |
| 1601 | _CQState.DRY_RUN: 1, |
| 1602 | _CQState.COMMIT: 2, |
| 1603 | } |
| 1604 | labels = {'Commit-Queue': vote_map[new_state]} |
| 1605 | notify = False if new_state == _CQState.DRY_RUN else None |
| 1606 | gerrit_util.SetReview( |
| 1607 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1608 | labels=labels, notify=notify) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1609 | return 0 |
| 1610 | except KeyboardInterrupt: |
| 1611 | raise |
| 1612 | except: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1613 | print('WARNING: Failed to %s.\n' |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1614 | 'Either:\n' |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1615 | ' * Your project has no CQ,\n' |
| 1616 | ' * You don\'t have permission to change the CQ state,\n' |
| 1617 | ' * There\'s a bug in this code (see stack trace below).\n' |
| 1618 | 'Consider specifying which bots to trigger manually or asking your ' |
| 1619 | 'project owners for permissions or contacting Chrome Infra at:\n' |
| 1620 | 'https://www.chromium.org/infra\n\n' % |
| 1621 | ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ')) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1622 | # Still raise exception so that stack trace is printed. |
| 1623 | raise |
| 1624 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1625 | def _GetGerritHost(self): |
| 1626 | # Lazy load of configs. |
| 1627 | self.GetCodereviewServer() |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1628 | if self._gerrit_host and '.' not in self._gerrit_host: |
| 1629 | # Abbreviated domain like "chromium" instead of chromium.googlesource.com. |
| 1630 | # This happens for internal stuff http://crbug.com/614312. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1631 | parsed = urllib.parse.urlparse(self.GetRemoteUrl()) |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1632 | if parsed.scheme == 'sso': |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1633 | print('WARNING: using non-https URLs for remote is likely broken\n' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1634 | ' Your current remote is: %s' % self.GetRemoteUrl()) |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1635 | self._gerrit_host = '%s.googlesource.com' % self._gerrit_host |
| 1636 | self._gerrit_server = 'https://%s' % self._gerrit_host |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1637 | return self._gerrit_host |
| 1638 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1639 | def _GetGitHost(self): |
| 1640 | """Returns git host to be used when uploading change to Gerrit.""" |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1641 | remote_url = self.GetRemoteUrl() |
| 1642 | if not remote_url: |
| 1643 | return None |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1644 | return urllib.parse.urlparse(remote_url).netloc |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1645 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1646 | def GetCodereviewServer(self): |
| 1647 | if not self._gerrit_server: |
| 1648 | # If we're on a branch then get the server potentially associated |
| 1649 | # with that branch. |
| 1650 | if self.GetIssue(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1651 | self._gerrit_server = self._GitGetBranchConfigValue( |
| 1652 | self.CodereviewServerConfigKey()) |
| 1653 | if self._gerrit_server: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1654 | self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1655 | if not self._gerrit_server: |
| 1656 | # We assume repo to be hosted on Gerrit, and hence Gerrit server |
| 1657 | # has "-review" suffix for lowest level subdomain. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1658 | parts = self._GetGitHost().split('.') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1659 | parts[0] = parts[0] + '-review' |
| 1660 | self._gerrit_host = '.'.join(parts) |
| 1661 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 1662 | return self._gerrit_server |
| 1663 | |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1664 | def _GetGerritProject(self): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1665 | """Returns Gerrit project name based on remote git URL.""" |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1666 | remote_url = self.GetRemoteUrl() |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1667 | if remote_url is None: |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1668 | logging.warning('can\'t detect Gerrit project.') |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1669 | return None |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1670 | project = urllib.parse.urlparse(remote_url).path.strip('/') |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1671 | if project.endswith('.git'): |
| 1672 | project = project[:-len('.git')] |
Andrii Shyshkalov | 1e82867 | 2018-08-23 22:34:37 +0000 | [diff] [blame] | 1673 | # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with |
| 1674 | # 'a/' prefix, because 'a/' prefix is used to force authentication in |
| 1675 | # gitiles/git-over-https protocol. E.g., |
| 1676 | # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project |
| 1677 | # as |
| 1678 | # https://chromium.googlesource.com/v8/v8 |
| 1679 | if project.startswith('a/'): |
| 1680 | project = project[len('a/'):] |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1681 | return project |
| 1682 | |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1683 | def _GerritChangeIdentifier(self): |
| 1684 | """Handy method for gerrit_util.ChangeIdentifier for a given CL. |
| 1685 | |
| 1686 | Not to be confused by value of "Change-Id:" footer. |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1687 | If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC. |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1688 | """ |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1689 | project = self._GetGerritProject() |
| 1690 | if project: |
| 1691 | return gerrit_util.ChangeIdentifier(project, self.GetIssue()) |
| 1692 | # Fall back on still unique, but less efficient change number. |
| 1693 | return str(self.GetIssue()) |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1694 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1695 | @classmethod |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1696 | def IssueConfigKey(cls): |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1697 | return 'gerritissue' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1698 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1699 | @classmethod |
| 1700 | def PatchsetConfigKey(cls): |
| 1701 | return 'gerritpatchset' |
| 1702 | |
| 1703 | @classmethod |
| 1704 | def CodereviewServerConfigKey(cls): |
| 1705 | return 'gerritserver' |
| 1706 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 1707 | def EnsureAuthenticated(self, force, refresh=None): |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1708 | """Best effort check that user is authenticated with Gerrit server.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1709 | if settings.GetGerritSkipEnsureAuthenticated(): |
| 1710 | # For projects with unusual authentication schemes. |
| 1711 | # See http://crbug.com/603378. |
| 1712 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1713 | |
| 1714 | # Check presence of cookies only if using cookies-based auth method. |
| 1715 | cookie_auth = gerrit_util.Authenticator.get() |
| 1716 | if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1717 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1718 | |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1719 | remote_url = self.GetRemoteUrl() |
| 1720 | if remote_url is None: |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1721 | logging.warning('invalid remote') |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1722 | return |
| 1723 | if urllib.parse.urlparse(remote_url).scheme != 'https': |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1724 | logging.warning('Ignoring branch %(branch)s with non-https remote ' |
| 1725 | '%(remote)s', { |
| 1726 | 'branch': self.branch, |
| 1727 | 'remote': self.GetRemoteUrl() |
| 1728 | }) |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1729 | return |
| 1730 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1731 | # Lazy-loader to identify Gerrit and Git hosts. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1732 | self.GetCodereviewServer() |
| 1733 | git_host = self._GetGitHost() |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1734 | assert self._gerrit_server and self._gerrit_host and git_host |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1735 | |
| 1736 | gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host) |
| 1737 | git_auth = cookie_auth.get_auth_header(git_host) |
| 1738 | if gerrit_auth and git_auth: |
| 1739 | if gerrit_auth == git_auth: |
| 1740 | return |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1741 | all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com') |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1742 | print( |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1743 | 'WARNING: You have different credentials for Gerrit and git hosts:\n' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1744 | ' %s\n' |
| 1745 | ' %s\n' |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1746 | ' Consider running the following command:\n' |
| 1747 | ' git cl creds-check\n' |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1748 | ' %s\n' |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1749 | ' %s' % |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1750 | (git_host, self._gerrit_host, |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1751 | ('Hint: delete creds for .googlesource.com' if all_gsrc else ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1752 | cookie_auth.get_new_password_message(git_host))) |
| 1753 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1754 | confirm_or_exit('If you know what you are doing', action='continue') |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1755 | return |
| 1756 | else: |
| 1757 | missing = ( |
Anna Henningsen | 4e89144 | 2017-07-06 21:40:58 +0200 | [diff] [blame] | 1758 | ([] if gerrit_auth else [self._gerrit_host]) + |
| 1759 | ([] if git_auth else [git_host])) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1760 | DieWithError('Credentials for the following hosts are required:\n' |
| 1761 | ' %s\n' |
| 1762 | 'These are read from %s (or legacy %s)\n' |
| 1763 | '%s' % ( |
| 1764 | '\n '.join(missing), |
| 1765 | cookie_auth.get_gitcookies_path(), |
| 1766 | cookie_auth.get_netrc_path(), |
| 1767 | cookie_auth.get_new_password_message(git_host))) |
| 1768 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1769 | def EnsureCanUploadPatchset(self, force): |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1770 | if not self.GetIssue(): |
| 1771 | return |
| 1772 | |
| 1773 | # Warm change details cache now to avoid RPCs later, reducing latency for |
| 1774 | # developers. |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1775 | self._GetChangeDetail( |
Andrii Shyshkalov | c4a7356 | 2018-09-25 18:40:17 +0000 | [diff] [blame] | 1776 | ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']) |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1777 | |
| 1778 | status = self._GetChangeDetail()['status'] |
| 1779 | if status in ('MERGED', 'ABANDONED'): |
| 1780 | DieWithError('Change %s has been %s, new uploads are not allowed' % |
| 1781 | (self.GetIssueURL(), |
| 1782 | 'submitted' if status == 'MERGED' else 'abandoned')) |
| 1783 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1784 | # TODO(vadimsh): For some reason the chunk of code below was skipped if |
| 1785 | # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'. |
| 1786 | # Apparently this check is not very important? Otherwise get_auth_email |
| 1787 | # could have been added to other implementations of Authenticator. |
| 1788 | cookies_auth = gerrit_util.Authenticator.get() |
| 1789 | if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator): |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1790 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1791 | |
| 1792 | cookies_user = cookies_auth.get_auth_email(self._GetGerritHost()) |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1793 | if self.GetIssueOwner() == cookies_user: |
| 1794 | return |
| 1795 | logging.debug('change %s owner is %s, cookies user is %s', |
| 1796 | self.GetIssue(), self.GetIssueOwner(), cookies_user) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1797 | # Maybe user has linked accounts or something like that, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1798 | # so ask what Gerrit thinks of this user. |
| 1799 | details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self') |
| 1800 | if details['email'] == self.GetIssueOwner(): |
| 1801 | return |
| 1802 | if not force: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1803 | print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit ' |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1804 | 'as %s.\n' |
| 1805 | 'Uploading may fail due to lack of permissions.' % |
| 1806 | (self.GetIssue(), self.GetIssueOwner(), details['email'])) |
| 1807 | confirm_or_exit(action='upload') |
| 1808 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1809 | def _PostUnsetIssueProperties(self): |
| 1810 | """Which branch-specific properties to erase when unsetting issue.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1811 | return ['gerritsquashhash'] |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1812 | |
tandrii@chromium.org | 37b07a7 | 2016-04-29 16:42:28 +0000 | [diff] [blame] | 1813 | def GetGerritObjForPresubmit(self): |
| 1814 | return presubmit_support.GerritAccessor(self._GetGerritHost()) |
| 1815 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1816 | def GetStatus(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1817 | """Applies a rough heuristic to give a simple summary of an issue's review |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1818 | or CQ status, assuming adherence to a common workflow. |
| 1819 | |
| 1820 | Returns None if no issue for this branch, or one of the following keywords: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1821 | * 'error' - error from review tool (including deleted issues) |
| 1822 | * 'unsent' - no reviewers added |
| 1823 | * 'waiting' - waiting for review |
| 1824 | * 'reply' - waiting for uploader to reply to review |
| 1825 | * 'lgtm' - Code-Review label has been set |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 1826 | * 'dry-run' - dry-running in the CQ |
| 1827 | * 'commit' - in the CQ |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1828 | * 'closed' - successfully submitted or abandoned |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1829 | """ |
| 1830 | if not self.GetIssue(): |
| 1831 | return None |
| 1832 | |
| 1833 | try: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1834 | data = self._GetChangeDetail([ |
| 1835 | 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE']) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1836 | except GerritChangeNotExists: |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1837 | return 'error' |
| 1838 | |
tandrii@chromium.org | 5e1bf38 | 2016-05-17 08:43:24 +0000 | [diff] [blame] | 1839 | if data['status'] in ('ABANDONED', 'MERGED'): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1840 | return 'closed' |
| 1841 | |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 1842 | cq_label = data['labels'].get('Commit-Queue', {}) |
| 1843 | max_cq_vote = 0 |
| 1844 | for vote in cq_label.get('all', []): |
| 1845 | max_cq_vote = max(max_cq_vote, vote.get('value', 0)) |
| 1846 | if max_cq_vote == 2: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1847 | return 'commit' |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 1848 | if max_cq_vote == 1: |
| 1849 | return 'dry-run' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1850 | |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1851 | if data['labels'].get('Code-Review', {}).get('approved'): |
| 1852 | return 'lgtm' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1853 | |
| 1854 | if not data.get('reviewers', {}).get('REVIEWER', []): |
| 1855 | return 'unsent' |
| 1856 | |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1857 | owner = data['owner'].get('_account_id') |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1858 | messages = sorted(data.get('messages', []), key=lambda m: m.get('date')) |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1859 | last_message_author = messages.pop().get('author', {}) |
| 1860 | while last_message_author: |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1861 | if last_message_author.get('email') == COMMIT_BOT_EMAIL: |
| 1862 | # Ignore replies from CQ. |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1863 | last_message_author = messages.pop().get('author', {}) |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1864 | continue |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1865 | if last_message_author.get('_account_id') == owner: |
| 1866 | # Most recent message was by owner. |
| 1867 | return 'waiting' |
| 1868 | else: |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1869 | # Some reply from non-owner. |
| 1870 | return 'reply' |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1871 | |
| 1872 | # Somehow there are no messages even though there are reviewers. |
| 1873 | return 'unsent' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1874 | |
| 1875 | def GetMostRecentPatchset(self): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1876 | data = self._GetChangeDetail(['CURRENT_REVISION']) |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 1877 | patchset = data['revisions'][data['current_revision']]['_number'] |
| 1878 | self.SetPatchset(patchset) |
| 1879 | return patchset |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1880 | |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 1881 | def FetchDescription(self, force=False): |
| 1882 | data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'], |
| 1883 | no_cache=force) |
tandrii@chromium.org | 2d3da63 | 2016-04-25 19:23:27 +0000 | [diff] [blame] | 1884 | current_rev = data['current_revision'] |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1885 | return data['revisions'][current_rev]['commit']['message'] |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1886 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1887 | def UpdateDescriptionRemote(self, description, force=False): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1888 | if gerrit_util.HasPendingChangeEdit( |
| 1889 | self._GetGerritHost(), self._GerritChangeIdentifier()): |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1890 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1891 | confirm_or_exit( |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1892 | 'The description cannot be modified while the issue has a pending ' |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1893 | 'unpublished edit. Either publish the edit in the Gerrit web UI ' |
| 1894 | 'or delete it.\n\n', action='delete the unpublished edit') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1895 | |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1896 | gerrit_util.DeletePendingChangeEdit( |
| 1897 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
| 1898 | gerrit_util.SetCommitMessage( |
| 1899 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1900 | description, notify='NONE') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1901 | |
Aaron Gable | 636b13f | 2017-07-14 10:42:48 -0700 | [diff] [blame] | 1902 | def AddComment(self, message, publish=None): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1903 | gerrit_util.SetReview( |
| 1904 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1905 | msg=message, ready=publish) |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 1906 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1907 | def GetCommentsSummary(self, readable=True): |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 1908 | # DETAILED_ACCOUNTS is to get emails in accounts. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1909 | # CURRENT_REVISION is included to get the latest patchset so that |
| 1910 | # only the robot comments from the latest patchset can be shown. |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1911 | messages = self._GetChangeDetail( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1912 | options=['MESSAGES', 'DETAILED_ACCOUNTS', |
| 1913 | 'CURRENT_REVISION']).get('messages', []) |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1914 | file_comments = gerrit_util.GetChangeComments( |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1915 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1916 | robot_file_comments = gerrit_util.GetChangeRobotComments( |
| 1917 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
| 1918 | |
| 1919 | # Add the robot comments onto the list of comments, but only |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 1920 | # keep those that are from the latest patchset. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1921 | latest_patch_set = self.GetMostRecentPatchset() |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 1922 | for path, robot_comments in robot_file_comments.items(): |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1923 | line_comments = file_comments.setdefault(path, []) |
| 1924 | line_comments.extend( |
| 1925 | [c for c in robot_comments if c['patch_set'] == latest_patch_set]) |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1926 | |
| 1927 | # Build dictionary of file comments for easy access and sorting later. |
| 1928 | # {author+date: {path: {patchset: {line: url+message}}}} |
| 1929 | comments = collections.defaultdict( |
| 1930 | lambda: collections.defaultdict(lambda: collections.defaultdict(dict))) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 1931 | for path, line_comments in file_comments.items(): |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1932 | for comment in line_comments: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1933 | tag = comment.get('tag', '') |
| 1934 | if tag.startswith('autogenerated') and 'robot_id' not in comment: |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1935 | continue |
| 1936 | key = (comment['author']['email'], comment['updated']) |
| 1937 | if comment.get('side', 'REVISION') == 'PARENT': |
| 1938 | patchset = 'Base' |
| 1939 | else: |
| 1940 | patchset = 'PS%d' % comment['patch_set'] |
| 1941 | line = comment.get('line', 0) |
| 1942 | url = ('https://%s/c/%s/%s/%s#%s%s' % |
| 1943 | (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path, |
| 1944 | 'b' if comment.get('side') == 'PARENT' else '', |
| 1945 | str(line) if line else '')) |
| 1946 | comments[key][path][patchset][line] = (url, comment['message']) |
| 1947 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1948 | summaries = [] |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1949 | for msg in messages: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1950 | summary = self._BuildCommentSummary(msg, comments, readable) |
| 1951 | if summary: |
| 1952 | summaries.append(summary) |
| 1953 | return summaries |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1954 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1955 | @staticmethod |
| 1956 | def _BuildCommentSummary(msg, comments, readable): |
| 1957 | key = (msg['author']['email'], msg['date']) |
| 1958 | # Don't bother showing autogenerated messages that don't have associated |
| 1959 | # file or line comments. this will filter out most autogenerated |
| 1960 | # messages, but will keep robot comments like those from Tricium. |
| 1961 | is_autogenerated = msg.get('tag', '').startswith('autogenerated') |
| 1962 | if is_autogenerated and not comments.get(key): |
| 1963 | return None |
| 1964 | message = msg['message'] |
| 1965 | # Gerrit spits out nanoseconds. |
| 1966 | assert len(msg['date'].split('.')[-1]) == 9 |
| 1967 | date = datetime.datetime.strptime(msg['date'][:-3], |
| 1968 | '%Y-%m-%d %H:%M:%S.%f') |
| 1969 | if key in comments: |
| 1970 | message += '\n' |
| 1971 | for path, patchsets in sorted(comments.get(key, {}).items()): |
| 1972 | if readable: |
| 1973 | message += '\n%s' % path |
| 1974 | for patchset, lines in sorted(patchsets.items()): |
| 1975 | for line, (url, content) in sorted(lines.items()): |
| 1976 | if line: |
| 1977 | line_str = 'Line %d' % line |
| 1978 | path_str = '%s:%d:' % (path, line) |
| 1979 | else: |
| 1980 | line_str = 'File comment' |
| 1981 | path_str = '%s:0:' % path |
| 1982 | if readable: |
| 1983 | message += '\n %s, %s: %s' % (patchset, line_str, url) |
| 1984 | message += '\n %s\n' % content |
| 1985 | else: |
| 1986 | message += '\n%s ' % path_str |
| 1987 | message += '\n%s\n' % content |
| 1988 | |
| 1989 | return _CommentSummary( |
| 1990 | date=date, |
| 1991 | message=message, |
| 1992 | sender=msg['author']['email'], |
| 1993 | autogenerated=is_autogenerated, |
| 1994 | # These could be inferred from the text messages and correlated with |
| 1995 | # Code-Review label maximum, however this is not reliable. |
| 1996 | # Leaving as is until the need arises. |
| 1997 | approval=False, |
| 1998 | disapproval=False, |
| 1999 | ) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 2000 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2001 | def CloseIssue(self): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2002 | gerrit_util.AbandonChange( |
| 2003 | self._GetGerritHost(), self._GerritChangeIdentifier(), msg='') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2004 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2005 | def SubmitIssue(self, wait_for_merge=True): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2006 | gerrit_util.SubmitChange( |
| 2007 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 2008 | wait_for_merge=wait_for_merge) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2009 | |
Andrii Shyshkalov | b721460 | 2018-08-22 23:20:26 +0000 | [diff] [blame] | 2010 | def _GetChangeDetail(self, options=None, no_cache=False): |
| 2011 | """Returns details of associated Gerrit change and caching results. |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2012 | |
| 2013 | If fresh data is needed, set no_cache=True which will clear cache and |
| 2014 | thus new data will be fetched from Gerrit. |
| 2015 | """ |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2016 | options = options or [] |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2017 | assert self.GetIssue(), 'issue is required to query Gerrit' |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2018 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 2019 | # Optimization to avoid multiple RPCs: |
| 2020 | if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and |
| 2021 | 'CURRENT_COMMIT' not in options): |
| 2022 | options.append('CURRENT_COMMIT') |
| 2023 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2024 | # Normalize issue and options for consistent keys in cache. |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2025 | cache_key = str(self.GetIssue()) |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2026 | options = [o.upper() for o in options] |
| 2027 | |
| 2028 | # Check in cache first unless no_cache is True. |
| 2029 | if no_cache: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2030 | self._detail_cache.pop(cache_key, None) |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2031 | else: |
| 2032 | options_set = frozenset(options) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2033 | for cached_options_set, data in self._detail_cache.get(cache_key, []): |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2034 | # Assumption: data fetched before with extra options is suitable |
| 2035 | # for return for a smaller set of options. |
| 2036 | # For example, if we cached data for |
| 2037 | # options=[CURRENT_REVISION, DETAILED_FOOTERS] |
| 2038 | # and request is for options=[CURRENT_REVISION], |
| 2039 | # THEN we can return prior cached data. |
| 2040 | if options_set.issubset(cached_options_set): |
| 2041 | return data |
| 2042 | |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2043 | try: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2044 | data = gerrit_util.GetChangeDetail( |
| 2045 | self._GetGerritHost(), self._GerritChangeIdentifier(), options) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2046 | except gerrit_util.GerritError as e: |
| 2047 | if e.http_status == 404: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2048 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2049 | raise |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2050 | |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2051 | self._detail_cache.setdefault(cache_key, []).append( |
| 2052 | (frozenset(options), data)) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2053 | return data |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2054 | |
Andrii Shyshkalov | cc5f17e | 2018-08-22 23:35:59 +0000 | [diff] [blame] | 2055 | def _GetChangeCommit(self): |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2056 | assert self.GetIssue(), 'issue must be set to query Gerrit' |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2057 | try: |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2058 | data = gerrit_util.GetChangeCommit( |
| 2059 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2060 | except gerrit_util.GerritError as e: |
| 2061 | if e.http_status == 404: |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2062 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2063 | raise |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2064 | return data |
| 2065 | |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2066 | def _IsCqConfigured(self): |
| 2067 | detail = self._GetChangeDetail(['LABELS']) |
Andrii Shyshkalov | 8effa4d | 2020-01-21 13:23:36 +0000 | [diff] [blame] | 2068 | return u'Commit-Queue' in detail.get('labels', {}) |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2069 | |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 2070 | def CMDLand(self, force, bypass_hooks, verbose, parallel): |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2071 | if git_common.is_dirty_git_tree('land'): |
| 2072 | return 1 |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2073 | |
tandrii | d60367b | 2016-06-22 05:25:12 -0700 | [diff] [blame] | 2074 | detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS']) |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2075 | if not force and self._IsCqConfigured(): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 2076 | confirm_or_exit('\nIt seems this repository has a CQ, ' |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2077 | 'which can test and land changes for you. ' |
| 2078 | 'Are you sure you wish to bypass it?\n', |
| 2079 | action='bypass CQ') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2080 | differs = True |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2081 | last_upload = self._GitGetBranchConfigValue('gerritsquashhash') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2082 | # Note: git diff outputs nothing if there is no diff. |
| 2083 | if not last_upload or RunGit(['diff', last_upload]).strip(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2084 | print('WARNING: Some changes from local branch haven\'t been uploaded.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2085 | else: |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2086 | if detail['current_revision'] == last_upload: |
| 2087 | differs = False |
| 2088 | else: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2089 | print('WARNING: Local branch contents differ from latest uploaded ' |
| 2090 | 'patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2091 | if differs: |
| 2092 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2093 | confirm_or_exit( |
| 2094 | 'Do you want to submit latest Gerrit patchset and bypass hooks?\n', |
| 2095 | action='submit') |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2096 | print('WARNING: Bypassing hooks and submitting latest uploaded patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2097 | elif not bypass_hooks: |
| 2098 | hook_results = self.RunHook( |
| 2099 | committing=True, |
| 2100 | may_prompt=not force, |
| 2101 | verbose=verbose, |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 2102 | change=self.GetChange(self.GetCommonAncestorWithUpstream()), |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 2103 | parallel=parallel) |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2104 | if not hook_results.should_continue(): |
| 2105 | return 1 |
| 2106 | |
| 2107 | self.SubmitIssue(wait_for_merge=True) |
| 2108 | print('Issue %s has been submitted.' % self.GetIssueURL()) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2109 | links = self._GetChangeCommit().get('web_links', []) |
| 2110 | for link in links: |
Aaron Gable | 02cdbb4 | 2016-12-13 16:24:25 -0800 | [diff] [blame] | 2111 | if link.get('name') == 'gitiles' and link.get('url'): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2112 | print('Landed as: %s' % link.get('url')) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2113 | break |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2114 | return 0 |
| 2115 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2116 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2117 | assert parsed_issue_arg.valid |
| 2118 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2119 | self.issue = parsed_issue_arg.issue |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2120 | |
| 2121 | if parsed_issue_arg.hostname: |
| 2122 | self._gerrit_host = parsed_issue_arg.hostname |
| 2123 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 2124 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2125 | try: |
| 2126 | detail = self._GetChangeDetail(['ALL_REVISIONS']) |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2127 | except GerritChangeNotExists as e: |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2128 | DieWithError(str(e)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2129 | |
| 2130 | if not parsed_issue_arg.patchset: |
| 2131 | # Use current revision by default. |
| 2132 | revision_info = detail['revisions'][detail['current_revision']] |
| 2133 | patchset = int(revision_info['_number']) |
| 2134 | else: |
| 2135 | patchset = parsed_issue_arg.patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2136 | for revision_info in detail['revisions'].values(): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2137 | if int(revision_info['_number']) == parsed_issue_arg.patchset: |
| 2138 | break |
| 2139 | else: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2140 | DieWithError('Couldn\'t find patchset %i in change %i' % |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2141 | (parsed_issue_arg.patchset, self.GetIssue())) |
| 2142 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2143 | remote_url = self.GetRemoteUrl() |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2144 | if remote_url.endswith('.git'): |
| 2145 | remote_url = remote_url[:-len('.git')] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2146 | remote_url = remote_url.rstrip('/') |
| 2147 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2148 | fetch_info = revision_info['fetch']['http'] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2149 | fetch_info['url'] = fetch_info['url'].rstrip('/') |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2150 | |
| 2151 | if remote_url != fetch_info['url']: |
| 2152 | DieWithError('Trying to patch a change from %s but this repo appears ' |
| 2153 | 'to be %s.' % (fetch_info['url'], remote_url)) |
| 2154 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2155 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2156 | |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2157 | if force: |
| 2158 | RunGit(['reset', '--hard', 'FETCH_HEAD']) |
| 2159 | print('Checked out commit for change %i patchset %i locally' % |
| 2160 | (parsed_issue_arg.issue, patchset)) |
Stefan Zager | 2d5f039 | 2017-10-10 15:17:53 -0700 | [diff] [blame] | 2161 | elif nocommit: |
| 2162 | RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD']) |
| 2163 | print('Patch applied to index.') |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2164 | else: |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2165 | RunGit(['cherry-pick', 'FETCH_HEAD']) |
| 2166 | print('Committed patch for change %i patchset %i locally.' % |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2167 | (parsed_issue_arg.issue, patchset)) |
| 2168 | print('Note: this created a local commit which does not have ' |
| 2169 | 'the same hash as the one uploaded for review. This will make ' |
| 2170 | 'uploading changes based on top of this branch difficult.\n' |
| 2171 | 'If you want to do that, use "git cl patch --force" instead.') |
| 2172 | |
Stefan Zager | d08043c | 2017-10-12 12:07:02 -0700 | [diff] [blame] | 2173 | if self.GetBranch(): |
| 2174 | self.SetIssue(parsed_issue_arg.issue) |
| 2175 | self.SetPatchset(patchset) |
| 2176 | fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip() |
| 2177 | self._GitSetBranchConfigValue('last-upload-hash', fetched_hash) |
| 2178 | self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash) |
| 2179 | else: |
| 2180 | print('WARNING: You are in detached HEAD state.\n' |
| 2181 | 'The patch has been applied to your checkout, but you will not be ' |
| 2182 | 'able to upload a new patch set to the gerrit issue.\n' |
| 2183 | 'Try using the \'-b\' option if you would like to work on a ' |
| 2184 | 'branch and/or upload a new patch set.') |
| 2185 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2186 | return 0 |
| 2187 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2188 | def _GerritCommitMsgHookCheck(self, offer_removal): |
| 2189 | hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 2190 | if not os.path.exists(hook): |
| 2191 | return |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2192 | # Crude attempt to distinguish Gerrit Codereview hook from a potentially |
| 2193 | # custom developer-made one. |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2194 | data = gclient_utils.FileRead(hook) |
| 2195 | if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data): |
| 2196 | return |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2197 | print('WARNING: You have Gerrit commit-msg hook installed.\n' |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 2198 | 'It is not necessary for uploading with git cl in squash mode, ' |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2199 | 'and may interfere with it in subtle ways.\n' |
| 2200 | 'We recommend you remove the commit-msg hook.') |
| 2201 | if offer_removal: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2202 | if ask_for_explicit_yes('Do you want to remove it now?'): |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2203 | gclient_utils.rm_file_or_tree(hook) |
| 2204 | print('Gerrit commit-msg hook removed.') |
| 2205 | else: |
| 2206 | print('OK, will keep Gerrit commit-msg hook in place.') |
| 2207 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2208 | def _CleanUpOldTraces(self): |
| 2209 | """Keep only the last |MAX_TRACES| traces.""" |
| 2210 | try: |
| 2211 | traces = sorted([ |
| 2212 | os.path.join(TRACES_DIR, f) |
| 2213 | for f in os.listdir(TRACES_DIR) |
| 2214 | if (os.path.isfile(os.path.join(TRACES_DIR, f)) |
| 2215 | and not f.startswith('tmp')) |
| 2216 | ]) |
| 2217 | traces_to_delete = traces[:-MAX_TRACES] |
| 2218 | for trace in traces_to_delete: |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 2219 | os.remove(trace) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2220 | except OSError: |
| 2221 | print('WARNING: Failed to remove old git traces from\n' |
| 2222 | ' %s' |
| 2223 | 'Consider removing them manually.' % TRACES_DIR) |
Edward Lemur | dc8e23d | 2019-05-07 00:45:48 +0000 | [diff] [blame] | 2224 | |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2225 | def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata): |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2226 | """Zip and write the git push traces stored in traces_dir.""" |
| 2227 | gclient_utils.safe_makedirs(TRACES_DIR) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2228 | traces_zip = trace_name + '-traces' |
| 2229 | traces_readme = trace_name + '-README' |
Michael Moss | e7f0b4c | 2019-05-08 04:36:24 +0000 | [diff] [blame] | 2230 | # Create a temporary dir to store git config and gitcookies in. It will be |
| 2231 | # compressed and stored next to the traces. |
| 2232 | git_info_dir = tempfile.mkdtemp() |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2233 | git_info_zip = trace_name + '-git-info' |
| 2234 | |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2235 | git_push_metadata['now'] = datetime_now().strftime('%c') |
Eric Boren | 67c4820 | 2019-05-30 16:52:51 +0000 | [diff] [blame] | 2236 | if sys.stdin.encoding and sys.stdin.encoding != 'utf-8': |
sangwoo.ko | 7a61433 | 2019-05-22 02:46:19 +0000 | [diff] [blame] | 2237 | git_push_metadata['now'] = git_push_metadata['now'].decode( |
| 2238 | sys.stdin.encoding) |
| 2239 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2240 | git_push_metadata['trace_name'] = trace_name |
| 2241 | gclient_utils.FileWrite( |
| 2242 | traces_readme, TRACES_README_FORMAT % git_push_metadata) |
| 2243 | |
| 2244 | # Keep only the first 6 characters of the git hashes on the packet |
| 2245 | # trace. This greatly decreases size after compression. |
| 2246 | packet_traces = os.path.join(traces_dir, 'trace-packet') |
| 2247 | if os.path.isfile(packet_traces): |
| 2248 | contents = gclient_utils.FileRead(packet_traces) |
| 2249 | gclient_utils.FileWrite( |
| 2250 | packet_traces, GIT_HASH_RE.sub(r'\1', contents)) |
| 2251 | shutil.make_archive(traces_zip, 'zip', traces_dir) |
| 2252 | |
| 2253 | # Collect and compress the git config and gitcookies. |
| 2254 | git_config = RunGit(['config', '-l']) |
| 2255 | gclient_utils.FileWrite( |
| 2256 | os.path.join(git_info_dir, 'git-config'), |
| 2257 | git_config) |
| 2258 | |
| 2259 | cookie_auth = gerrit_util.Authenticator.get() |
| 2260 | if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
| 2261 | gitcookies_path = cookie_auth.get_gitcookies_path() |
| 2262 | if os.path.isfile(gitcookies_path): |
| 2263 | gitcookies = gclient_utils.FileRead(gitcookies_path) |
| 2264 | gclient_utils.FileWrite( |
| 2265 | os.path.join(git_info_dir, 'gitcookies'), |
| 2266 | GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies)) |
| 2267 | shutil.make_archive(git_info_zip, 'zip', git_info_dir) |
| 2268 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2269 | gclient_utils.rmtree(git_info_dir) |
| 2270 | |
| 2271 | def _RunGitPushWithTraces( |
| 2272 | self, change_desc, refspec, refspec_opts, git_push_metadata): |
| 2273 | """Run git push and collect the traces resulting from the execution.""" |
| 2274 | # Create a temporary directory to store traces in. Traces will be compressed |
| 2275 | # and stored in a 'traces' dir inside depot_tools. |
| 2276 | traces_dir = tempfile.mkdtemp() |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2277 | trace_name = os.path.join( |
| 2278 | TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f')) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2279 | |
| 2280 | env = os.environ.copy() |
| 2281 | env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy' |
| 2282 | env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Jonathan Nieder | 9779b14 | 2019-05-29 23:19:29 +0000 | [diff] [blame] | 2283 | env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2284 | env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl') |
| 2285 | env['GIT_TRACE_CURL_NO_DATA'] = '1' |
| 2286 | env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet') |
| 2287 | |
| 2288 | try: |
| 2289 | push_returncode = 0 |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2290 | remote_url = self.GetRemoteUrl() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2291 | before_push = time_time() |
| 2292 | push_stdout = gclient_utils.CheckCallAndFilter( |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2293 | ['git', 'push', remote_url, refspec], |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2294 | env=env, |
| 2295 | print_stdout=True, |
| 2296 | # Flush after every line: useful for seeing progress when running as |
| 2297 | # recipe. |
| 2298 | filter_fn=lambda _: sys.stdout.flush()) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2299 | push_stdout = push_stdout.decode('utf-8', 'replace') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2300 | except subprocess2.CalledProcessError as e: |
| 2301 | push_returncode = e.returncode |
| 2302 | DieWithError('Failed to create a change. Please examine output above ' |
| 2303 | 'for the reason of the failure.\n' |
| 2304 | 'Hint: run command below to diagnose common Git/Gerrit ' |
| 2305 | 'credential problems:\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2306 | ' git cl creds-check\n' |
| 2307 | '\n' |
| 2308 | 'If git-cl is not working correctly, file a bug under the ' |
| 2309 | 'Infra>SDK component including the files below.\n' |
| 2310 | 'Review the files before upload, since they might contain ' |
| 2311 | 'sensitive information.\n' |
| 2312 | 'Set the Restrict-View-Google label so that they are not ' |
| 2313 | 'publicly accessible.\n' |
| 2314 | + TRACES_MESSAGE % {'trace_name': trace_name}, |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2315 | change_desc) |
| 2316 | finally: |
| 2317 | execution_time = time_time() - before_push |
| 2318 | metrics.collector.add_repeated('sub_commands', { |
| 2319 | 'command': 'git push', |
| 2320 | 'execution_time': execution_time, |
| 2321 | 'exit_code': push_returncode, |
| 2322 | 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts), |
| 2323 | }) |
| 2324 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2325 | git_push_metadata['execution_time'] = execution_time |
| 2326 | git_push_metadata['exit_code'] = push_returncode |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2327 | self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2328 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2329 | self._CleanUpOldTraces() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2330 | gclient_utils.rmtree(traces_dir) |
| 2331 | |
| 2332 | return push_stdout |
| 2333 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2334 | def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change): |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2335 | """Upload the current branch to Gerrit.""" |
Mike Frysinger | a989d55 | 2019-08-14 20:51:23 +0000 | [diff] [blame] | 2336 | if options.squash is None: |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 2337 | # Load default for user, repo, squash=true, in this order. |
| 2338 | options.squash = settings.GetSquashGerritUploads() |
tandrii | 26f3e4e | 2016-06-10 08:37:04 -0700 | [diff] [blame] | 2339 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2340 | remote, remote_branch = self.GetRemoteBranch() |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 2341 | branch = GetTargetRef(remote, remote_branch, options.target_branch) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2342 | # This may be None; default fallback value is determined in logic below. |
| 2343 | title = options.title |
| 2344 | |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 2345 | # Extract bug number from branch name. |
| 2346 | bug = options.bug |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2347 | fixed = options.fixed |
| 2348 | match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)', |
| 2349 | self.GetBranch()) |
| 2350 | if not bug and not fixed and match: |
| 2351 | if match.group('type') == 'bug': |
| 2352 | bug = match.group('bugnum') |
| 2353 | else: |
| 2354 | fixed = match.group('bugnum') |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 2355 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2356 | if options.squash: |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2357 | self._GerritCommitMsgHookCheck(offer_removal=not options.force) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2358 | if self.GetIssue(): |
| 2359 | # Try to get the message from a previous upload. |
| 2360 | message = self.GetDescription() |
| 2361 | if not message: |
| 2362 | DieWithError( |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2363 | 'failed to fetch description from current Gerrit change %d\n' |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2364 | '%s' % (self.GetIssue(), self.GetIssueURL())) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2365 | if not title: |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2366 | if options.message: |
Aaron Gable | 7303dcb | 2017-06-07 14:17:32 -0700 | [diff] [blame] | 2367 | # When uploading a subsequent patchset, -m|--message is taken |
| 2368 | # as the patchset title if --title was not provided. |
| 2369 | title = options.message.strip() |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2370 | else: |
| 2371 | default_title = RunGit( |
| 2372 | ['show', '-s', '--format=%s', 'HEAD']).strip() |
Aaron Gable | 7303dcb | 2017-06-07 14:17:32 -0700 | [diff] [blame] | 2373 | if options.force: |
| 2374 | title = default_title |
| 2375 | else: |
| 2376 | title = ask_for_data( |
| 2377 | 'Title for patchset [%s]: ' % default_title) or default_title |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 2378 | |
| 2379 | # User requested to change description |
| 2380 | if options.edit_description: |
| 2381 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
| 2382 | change_desc.prompt() |
| 2383 | message = change_desc.description |
| 2384 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2385 | change_id = self._GetChangeDetail()['change_id'] |
| 2386 | while True: |
| 2387 | footer_change_ids = git_footers.get_footer_change_id(message) |
| 2388 | if footer_change_ids == [change_id]: |
| 2389 | break |
| 2390 | if not footer_change_ids: |
| 2391 | message = git_footers.add_footer_change_id(message, change_id) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2392 | print('WARNING: appended missing Change-Id to change description.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2393 | continue |
| 2394 | # There is already a valid footer but with different or several ids. |
| 2395 | # Doing this automatically is non-trivial as we don't want to lose |
| 2396 | # existing other footers, yet we want to append just 1 desired |
| 2397 | # Change-Id. Thus, just create a new footer, but let user verify the |
| 2398 | # new description. |
| 2399 | message = '%s\n\nChange-Id: %s' % (message, change_id) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2400 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2401 | if not options.force: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2402 | print( |
| 2403 | 'WARNING: change %s has Change-Id footer(s):\n' |
| 2404 | ' %s\n' |
| 2405 | 'but change has Change-Id %s, according to Gerrit.\n' |
| 2406 | 'Please, check the proposed correction to the description, ' |
| 2407 | 'and edit it if necessary but keep the "Change-Id: %s" footer\n' |
| 2408 | % (self.GetIssue(), '\n '.join(footer_change_ids), change_id, |
| 2409 | change_id)) |
| 2410 | confirm_or_exit(action='edit') |
| 2411 | change_desc.prompt() |
| 2412 | |
| 2413 | message = change_desc.description |
| 2414 | if not message: |
| 2415 | DieWithError("Description is empty. Aborting...") |
| 2416 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2417 | # Continue the while loop. |
| 2418 | # Sanity check of this code - we should end up with proper message |
| 2419 | # footer. |
| 2420 | assert [change_id] == git_footers.get_footer_change_id(message) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2421 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2422 | else: # if not self.GetIssue() |
| 2423 | if options.message: |
| 2424 | message = options.message |
| 2425 | else: |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2426 | message = _create_description_from_log(git_diff_args) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2427 | if options.title: |
| 2428 | message = options.title + '\n\n' + message |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2429 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2430 | if not options.force: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2431 | change_desc.prompt() |
| 2432 | |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2433 | # On first upload, patchset title is always this string, while |
| 2434 | # --title flag gets converted to first line of message. |
| 2435 | title = 'Initial upload' |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2436 | if not change_desc.description: |
| 2437 | DieWithError("Description is empty. Aborting...") |
Andrii Shyshkalov | 8c90d03 | 2017-04-19 21:27:26 +0200 | [diff] [blame] | 2438 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2439 | if len(change_ids) > 1: |
| 2440 | DieWithError('too many Change-Id footers, at most 1 allowed.') |
| 2441 | if not change_ids: |
| 2442 | # Generate the Change-Id automatically. |
Andrii Shyshkalov | 8c90d03 | 2017-04-19 21:27:26 +0200 | [diff] [blame] | 2443 | change_desc.set_description(git_footers.add_footer_change_id( |
| 2444 | change_desc.description, |
| 2445 | GenerateGerritChangeId(change_desc.description))) |
| 2446 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2447 | assert len(change_ids) == 1 |
| 2448 | change_id = change_ids[0] |
| 2449 | |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2450 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2451 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2452 | options.add_owners_to, change) |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 2453 | if options.preserve_tryjobs: |
| 2454 | change_desc.set_preserve_tryjobs() |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2455 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2456 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2457 | parent = self._ComputeParent(remote, upstream_branch, custom_cl_base, |
| 2458 | options.force, change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2459 | tree = RunGit(['rev-parse', 'HEAD:']).strip() |
Edward Lesmes | f6a2232 | 2019-11-04 22:14:39 +0000 | [diff] [blame] | 2460 | with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2461 | desc_tempfile.write(change_desc.description.encode('utf-8', 'replace')) |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 2462 | desc_tempfile.close() |
| 2463 | ref_to_push = RunGit(['commit-tree', tree, '-p', parent, |
| 2464 | '-F', desc_tempfile.name]).strip() |
| 2465 | os.remove(desc_tempfile.name) |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2466 | else: # if not options.squash |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2467 | change_desc = ChangeDescription( |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2468 | options.message or _create_description_from_log(git_diff_args)) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2469 | if not change_desc.description: |
| 2470 | DieWithError("Description is empty. Aborting...") |
| 2471 | |
| 2472 | if not git_footers.get_footer_change_id(change_desc.description): |
| 2473 | DownloadGerritHook(False) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2474 | change_desc.set_description( |
| 2475 | self._AddChangeIdToCommitMessage(options, git_diff_args)) |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2476 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2477 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2478 | options.add_owners_to, change) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2479 | ref_to_push = 'HEAD' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2480 | # For no-squash mode, we assume the remote called "origin" is the one we |
| 2481 | # want. It is not worthwhile to support different workflows for |
| 2482 | # no-squash mode. |
| 2483 | parent = 'origin/%s' % branch |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2484 | change_id = git_footers.get_footer_change_id(change_desc.description)[0] |
| 2485 | |
| 2486 | assert change_desc |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 2487 | SaveDescriptionBackup(change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2488 | commits = RunGitSilent(['rev-list', '%s..%s' % (parent, |
| 2489 | ref_to_push)]).splitlines() |
| 2490 | if len(commits) > 1: |
| 2491 | print('WARNING: This will upload %d commits. Run the following command ' |
| 2492 | 'to see which commits will be uploaded: ' % len(commits)) |
| 2493 | print('git log %s..%s' % (parent, ref_to_push)) |
| 2494 | print('You can also use `git squash-branch` to squash these into a ' |
| 2495 | 'single commit.') |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2496 | confirm_or_exit(action='upload') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2497 | |
Aaron Gable | 6dadfbf | 2017-05-09 14:27:58 -0700 | [diff] [blame] | 2498 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2499 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2500 | options.add_owners_to, change) |
| 2501 | |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2502 | reviewers = sorted(change_desc.get_reviewers()) |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2503 | cc = [] |
| 2504 | # Add CCs from WATCHLISTS and rietveld.cc git config unless this is |
| 2505 | # the initial upload, the CL is private, or auto-CCing has ben disabled. |
| 2506 | if not (self.GetIssue() or options.private or options.no_autocc): |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2507 | cc = self.GetCCList().split(',') |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2508 | # Add cc's from the --cc flag. |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2509 | if options.cc: |
| 2510 | cc.extend(options.cc) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2511 | cc = [email.strip() for email in cc if email.strip()] |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2512 | if change_desc.get_cced(): |
| 2513 | cc.extend(change_desc.get_cced()) |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 2514 | if self._GetGerritHost() == 'chromium-review.googlesource.com': |
| 2515 | valid_accounts = set(reviewers + cc) |
| 2516 | # TODO(crbug/877717): relax this for all hosts. |
| 2517 | else: |
| 2518 | valid_accounts = gerrit_util.ValidAccounts( |
| 2519 | self._GetGerritHost(), reviewers + cc) |
Andrii Shyshkalov | f170af4 | 2018-10-30 07:00:44 +0000 | [diff] [blame] | 2520 | logging.info('accounts %s are recognized, %s invalid', |
| 2521 | sorted(valid_accounts), |
| 2522 | set(reviewers + cc).difference(set(valid_accounts))) |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2523 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2524 | # Extra options that can be specified at push time. Doc: |
| 2525 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2526 | refspec_opts = [] |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2527 | |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 2528 | # By default, new changes are started in WIP mode, and subsequent patchsets |
| 2529 | # don't send email. At any time, passing --send-mail will mark the change |
| 2530 | # ready and send email for that particular patch. |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2531 | if options.send_mail: |
| 2532 | refspec_opts.append('ready') |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 2533 | refspec_opts.append('notify=ALL') |
Jamie Madill | 276da0b | 2018-04-27 14:41:20 -0400 | [diff] [blame] | 2534 | elif not self.GetIssue() and options.squash: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2535 | refspec_opts.append('wip') |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2536 | else: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2537 | refspec_opts.append('notify=NONE') |
Aaron Gable | 70f4e24 | 2017-06-26 10:45:59 -0700 | [diff] [blame] | 2538 | |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2539 | # TODO(tandrii): options.message should be posted as a comment |
Aaron Gable | e5adf61 | 2017-07-14 10:43:58 -0700 | [diff] [blame] | 2540 | # if --send-mail is set on non-initial upload as Rietveld used to do it. |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2541 | |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 2542 | if title: |
Nick Carter | 8692b18 | 2017-11-06 16:30:38 -0800 | [diff] [blame] | 2543 | # Punctuation and whitespace in |title| must be percent-encoded. |
| 2544 | refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title)) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2545 | |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2546 | if options.private: |
Aaron Gable | b02daf0 | 2017-05-23 11:53:46 -0700 | [diff] [blame] | 2547 | refspec_opts.append('private') |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2548 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2549 | for r in sorted(reviewers): |
| 2550 | if r in valid_accounts: |
| 2551 | refspec_opts.append('r=%s' % r) |
| 2552 | reviewers.remove(r) |
| 2553 | else: |
| 2554 | # TODO(tandrii): this should probably be a hard failure. |
| 2555 | print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping' |
| 2556 | % r) |
| 2557 | for c in sorted(cc): |
| 2558 | # refspec option will be rejected if cc doesn't correspond to an |
| 2559 | # account, even though REST call to add such arbitrary cc may succeed. |
| 2560 | if c in valid_accounts: |
| 2561 | refspec_opts.append('cc=%s' % c) |
| 2562 | cc.remove(c) |
| 2563 | |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2564 | if options.topic: |
| 2565 | # Documentation on Gerrit topics is here: |
| 2566 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2567 | refspec_opts.append('topic=%s' % options.topic) |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2568 | |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2569 | if options.enable_auto_submit: |
| 2570 | refspec_opts.append('l=Auto-Submit+1') |
| 2571 | if options.use_commit_queue: |
| 2572 | refspec_opts.append('l=Commit-Queue+2') |
| 2573 | elif options.cq_dry_run: |
| 2574 | refspec_opts.append('l=Commit-Queue+1') |
| 2575 | |
| 2576 | if change_desc.get_reviewers(tbr_only=True): |
| 2577 | score = gerrit_util.GetCodeReviewTbrScore( |
| 2578 | self._GetGerritHost(), |
| 2579 | self._GetGerritProject()) |
| 2580 | refspec_opts.append('l=Code-Review+%s' % score) |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 2581 | |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2582 | # Gerrit sorts hashtags, so order is not important. |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2583 | hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags} |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2584 | if not self.GetIssue(): |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2585 | hashtags.update(change_desc.get_hash_tags()) |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2586 | refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)] |
| 2587 | |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2588 | refspec_suffix = '' |
| 2589 | if refspec_opts: |
| 2590 | refspec_suffix = '%' + ','.join(refspec_opts) |
| 2591 | assert ' ' not in refspec_suffix, ( |
| 2592 | 'spaces not allowed in refspec: "%s"' % refspec_suffix) |
| 2593 | refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix) |
| 2594 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2595 | git_push_metadata = { |
| 2596 | 'gerrit_host': self._GetGerritHost(), |
| 2597 | 'title': title or '<untitled>', |
| 2598 | 'change_id': change_id, |
| 2599 | 'description': change_desc.description, |
| 2600 | } |
| 2601 | push_stdout = self._RunGitPushWithTraces( |
| 2602 | change_desc, refspec, refspec_opts, git_push_metadata) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2603 | |
| 2604 | if options.squash: |
Aaron Gable | 289b431 | 2017-09-13 14:06:16 -0700 | [diff] [blame] | 2605 | regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2606 | change_numbers = [m.group(1) |
| 2607 | for m in map(regex.match, push_stdout.splitlines()) |
| 2608 | if m] |
| 2609 | if len(change_numbers) != 1: |
| 2610 | DieWithError( |
| 2611 | ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 2612 | 'Change-Id: %s') % (len(change_numbers), change_id), change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2613 | self.SetIssue(change_numbers[0]) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2614 | self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push) |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2615 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2616 | if self.GetIssue() and (reviewers or cc): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 2617 | # GetIssue() is not set in case of non-squash uploads according to tests. |
| 2618 | # TODO(agable): non-squash uploads in git cl should be removed. |
| 2619 | gerrit_util.AddReviewers( |
| 2620 | self._GetGerritHost(), |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 2621 | self._GerritChangeIdentifier(), |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 2622 | reviewers, cc, |
| 2623 | notify=bool(options.send_mail)) |
Aaron Gable | 6dadfbf | 2017-05-09 14:27:58 -0700 | [diff] [blame] | 2624 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2625 | return 0 |
| 2626 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2627 | def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force, |
| 2628 | change_desc): |
| 2629 | """Computes parent of the generated commit to be uploaded to Gerrit. |
| 2630 | |
| 2631 | Returns revision or a ref name. |
| 2632 | """ |
| 2633 | if custom_cl_base: |
| 2634 | # Try to avoid creating additional unintended CLs when uploading, unless |
| 2635 | # user wants to take this risk. |
| 2636 | local_ref_of_target_remote = self.GetRemoteBranch()[1] |
| 2637 | code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base, |
| 2638 | local_ref_of_target_remote]) |
| 2639 | if code == 1: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2640 | print('\nWARNING: Manually specified base of this CL `%s` ' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2641 | 'doesn\'t seem to belong to target remote branch `%s`.\n\n' |
| 2642 | 'If you proceed with upload, more than 1 CL may be created by ' |
| 2643 | 'Gerrit as a result, in turn confusing or crashing git cl.\n\n' |
| 2644 | 'If you are certain that specified base `%s` has already been ' |
| 2645 | 'uploaded to Gerrit as another CL, you may proceed.\n' % |
| 2646 | (custom_cl_base, local_ref_of_target_remote, custom_cl_base)) |
| 2647 | if not force: |
| 2648 | confirm_or_exit( |
| 2649 | 'Do you take responsibility for cleaning up potential mess ' |
| 2650 | 'resulting from proceeding with upload?', |
| 2651 | action='upload') |
| 2652 | return custom_cl_base |
| 2653 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2654 | if remote != '.': |
| 2655 | return self.GetCommonAncestorWithUpstream() |
| 2656 | |
| 2657 | # If our upstream branch is local, we base our squashed commit on its |
| 2658 | # squashed version. |
| 2659 | upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch) |
| 2660 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2661 | if upstream_branch_name == 'master': |
Aaron Gable | 0bbd1c2 | 2017-05-08 14:37:08 -0700 | [diff] [blame] | 2662 | return self.GetCommonAncestorWithUpstream() |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2663 | |
| 2664 | # Check the squashed hash of the parent. |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2665 | # TODO(tandrii): consider checking parent change in Gerrit and using its |
| 2666 | # hash if tree hash of latest parent revision (patchset) in Gerrit matches |
| 2667 | # the tree hash of the parent branch. The upside is less likely bogus |
| 2668 | # requests to reupload parent change just because it's uploadhash is |
| 2669 | # missing, yet the downside likely exists, too (albeit unknown to me yet). |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2670 | parent = RunGit(['config', |
| 2671 | 'branch.%s.gerritsquashhash' % upstream_branch_name], |
| 2672 | error_ok=True).strip() |
| 2673 | # Verify that the upstream branch has been uploaded too, otherwise |
| 2674 | # Gerrit will create additional CLs when uploading. |
| 2675 | if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) != |
| 2676 | RunGitSilent(['rev-parse', parent + ':'])): |
| 2677 | DieWithError( |
| 2678 | '\nUpload upstream branch %s first.\n' |
| 2679 | 'It is likely that this branch has been rebased since its last ' |
| 2680 | 'upload, so you just need to upload it again.\n' |
| 2681 | '(If you uploaded it with --no-squash, then branch dependencies ' |
| 2682 | 'are not supported, and you should reupload with --squash.)' |
| 2683 | % upstream_branch_name, |
| 2684 | change_desc) |
| 2685 | return parent |
| 2686 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2687 | def _AddChangeIdToCommitMessage(self, options, args): |
| 2688 | """Re-commits using the current message, assumes the commit hook is in |
| 2689 | place. |
| 2690 | """ |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2691 | log_desc = options.message or _create_description_from_log(args) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2692 | git_command = ['commit', '--amend', '-m', log_desc] |
| 2693 | RunGit(git_command) |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2694 | new_log_desc = _create_description_from_log(args) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2695 | if git_footers.get_footer_change_id(new_log_desc): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2696 | print('git-cl: Added Change-Id to commit message.') |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2697 | return new_log_desc |
| 2698 | else: |
tandrii@chromium.org | b067ec5 | 2016-05-31 15:24:44 +0000 | [diff] [blame] | 2699 | DieWithError('ERROR: Gerrit commit-msg hook not installed.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2700 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2701 | def CannotTriggerTryJobReason(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2702 | try: |
| 2703 | data = self._GetChangeDetail() |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2704 | except GerritChangeNotExists: |
| 2705 | return 'Gerrit doesn\'t know about your change %s' % self.GetIssue() |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2706 | |
| 2707 | if data['status'] in ('ABANDONED', 'MERGED'): |
| 2708 | return 'CL %s is closed' % self.GetIssue() |
| 2709 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2710 | def GetGerritChange(self, patchset=None): |
| 2711 | """Returns a buildbucket.v2.GerritChange message for the current issue.""" |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2712 | host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2713 | issue = self.GetIssue() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 2714 | patchset = int(patchset or self.GetPatchset()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2715 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2716 | |
| 2717 | assert host and issue and patchset, 'CL must be uploaded first' |
| 2718 | |
| 2719 | has_patchset = any( |
| 2720 | int(revision_data['_number']) == patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2721 | for revision_data in data['revisions'].values()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2722 | if not has_patchset: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2723 | raise Exception('Patchset %d is not known in Gerrit change %d' % |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2724 | (patchset, self.GetIssue())) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2725 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2726 | return { |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2727 | 'host': host, |
| 2728 | 'change': issue, |
| 2729 | 'project': data['project'], |
| 2730 | 'patchset': patchset, |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2731 | } |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2732 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2733 | def GetIssueOwner(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2734 | return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email'] |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2735 | |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 2736 | def GetReviewers(self): |
| 2737 | details = self._GetChangeDetail(['DETAILED_ACCOUNTS']) |
Mohamed Heikal | 171c074 | 2018-11-09 20:38:51 +0000 | [diff] [blame] | 2738 | return [r['email'] for r in details['reviewers'].get('REVIEWER', [])] |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 2739 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2740 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2741 | def _get_bug_line_values(default_project, bugs): |
| 2742 | """Given default_project and comma separated list of bugs, yields bug line |
| 2743 | values. |
| 2744 | |
| 2745 | Each bug can be either: |
| 2746 | * a number, which is combined with default_project |
| 2747 | * string, which is left as is. |
| 2748 | |
| 2749 | This function may produce more than one line, because bugdroid expects one |
| 2750 | project per line. |
| 2751 | |
| 2752 | >>> list(_get_bug_line_values('v8', '123,chromium:789')) |
| 2753 | ['v8:123', 'chromium:789'] |
| 2754 | """ |
| 2755 | default_bugs = [] |
| 2756 | others = [] |
| 2757 | for bug in bugs.split(','): |
| 2758 | bug = bug.strip() |
| 2759 | if bug: |
| 2760 | try: |
| 2761 | default_bugs.append(int(bug)) |
| 2762 | except ValueError: |
| 2763 | others.append(bug) |
| 2764 | |
| 2765 | if default_bugs: |
| 2766 | default_bugs = ','.join(map(str, default_bugs)) |
| 2767 | if default_project: |
| 2768 | yield '%s:%s' % (default_project, default_bugs) |
| 2769 | else: |
| 2770 | yield default_bugs |
| 2771 | for other in sorted(others): |
| 2772 | # Don't bother finding common prefixes, CLs with >2 bugs are very very rare. |
| 2773 | yield other |
| 2774 | |
| 2775 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2776 | class ChangeDescription(object): |
| 2777 | """Contains a parsed form of the change description.""" |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 2778 | R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$' |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2779 | CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2780 | BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$' |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2781 | FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$' |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 2782 | CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$' |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2783 | STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*' |
| 2784 | BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]' |
Anthony Polito | 02b5af3 | 2019-12-02 19:49:47 +0000 | [diff] [blame] | 2785 | COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])' |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2786 | BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+' |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2787 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2788 | def __init__(self, description, bug=None, fixed=None): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2789 | self._description_lines = (description or '').strip().splitlines() |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2790 | if bug: |
| 2791 | regexp = re.compile(self.BUG_LINE) |
| 2792 | prefix = settings.GetBugPrefix() |
| 2793 | if not any((regexp.match(line) for line in self._description_lines)): |
| 2794 | values = list(_get_bug_line_values(prefix, bug)) |
| 2795 | self.append_footer('Bug: %s' % ', '.join(values)) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2796 | if fixed: |
| 2797 | regexp = re.compile(self.FIXED_LINE) |
| 2798 | prefix = settings.GetBugPrefix() |
| 2799 | if not any((regexp.match(line) for line in self._description_lines)): |
| 2800 | values = list(_get_bug_line_values(prefix, fixed)) |
| 2801 | self.append_footer('Fixed: %s' % ', '.join(values)) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2802 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2803 | @property # www.logilab.org/ticket/89786 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 2804 | def description(self): # pylint: disable=method-hidden |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2805 | return '\n'.join(self._description_lines) |
| 2806 | |
| 2807 | def set_description(self, desc): |
| 2808 | if isinstance(desc, basestring): |
| 2809 | lines = desc.splitlines() |
| 2810 | else: |
| 2811 | lines = [line.rstrip() for line in desc] |
| 2812 | while lines and not lines[0]: |
| 2813 | lines.pop(0) |
| 2814 | while lines and not lines[-1]: |
| 2815 | lines.pop(-1) |
| 2816 | self._description_lines = lines |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2817 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2818 | def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None): |
| 2819 | """Rewrites the R=/TBR= line(s) as a single line each. |
| 2820 | |
| 2821 | Args: |
| 2822 | reviewers (list(str)) - list of additional emails to use for reviewers. |
| 2823 | tbrs (list(str)) - list of additional emails to use for TBRs. |
| 2824 | add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in |
| 2825 | the change that are missing OWNER coverage. If this is not None, you |
| 2826 | must also pass a value for `change`. |
| 2827 | change (Change) - The Change that should be used for OWNERS lookups. |
| 2828 | """ |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2829 | assert isinstance(reviewers, list), reviewers |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2830 | assert isinstance(tbrs, list), tbrs |
| 2831 | |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2832 | assert add_owners_to in (None, 'TBR', 'R'), add_owners_to |
Robert Iannucci | a28592e | 2017-04-18 13:14:49 -0700 | [diff] [blame] | 2833 | assert not add_owners_to or change, add_owners_to |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2834 | |
| 2835 | if not reviewers and not tbrs and not add_owners_to: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2836 | return |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2837 | |
| 2838 | reviewers = set(reviewers) |
| 2839 | tbrs = set(tbrs) |
| 2840 | LOOKUP = { |
| 2841 | 'TBR': tbrs, |
| 2842 | 'R': reviewers, |
| 2843 | } |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2844 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2845 | # Get the set of R= and TBR= lines and remove them from the description. |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2846 | regexp = re.compile(self.R_LINE) |
| 2847 | matches = [regexp.match(line) for line in self._description_lines] |
| 2848 | new_desc = [l for i, l in enumerate(self._description_lines) |
| 2849 | if not matches[i]] |
| 2850 | self.set_description(new_desc) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2851 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2852 | # Construct new unified R= and TBR= lines. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2853 | |
| 2854 | # First, update tbrs/reviewers with names from the R=/TBR= lines (if any). |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2855 | for match in matches: |
| 2856 | if not match: |
| 2857 | continue |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2858 | LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()])) |
| 2859 | |
| 2860 | # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers. |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2861 | if add_owners_to: |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2862 | owners_db = owners.Database(change.RepositoryRoot(), |
Jochen Eisinger | 72606f8 | 2017-04-04 10:44:18 +0200 | [diff] [blame] | 2863 | fopen=file, os_path=os.path) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2864 | missing_files = owners_db.files_not_covered_by(change.LocalPaths(), |
Robert Iannucci | 100aa21 | 2017-04-18 17:28:26 -0700 | [diff] [blame] | 2865 | (tbrs | reviewers)) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2866 | LOOKUP[add_owners_to].update( |
| 2867 | owners_db.reviewers_for(missing_files, change.author_email)) |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2868 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2869 | # If any folks ended up in both groups, remove them from tbrs. |
| 2870 | tbrs -= reviewers |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2871 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2872 | new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None |
| 2873 | new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2874 | |
| 2875 | # Put the new lines in the description where the old first R= line was. |
| 2876 | line_loc = next((i for i, match in enumerate(matches) if match), -1) |
| 2877 | if 0 <= line_loc < len(self._description_lines): |
| 2878 | if new_tbr_line: |
| 2879 | self._description_lines.insert(line_loc, new_tbr_line) |
| 2880 | if new_r_line: |
| 2881 | self._description_lines.insert(line_loc, new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2882 | else: |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2883 | if new_r_line: |
| 2884 | self.append_footer(new_r_line) |
| 2885 | if new_tbr_line: |
| 2886 | self.append_footer(new_tbr_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2887 | |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 2888 | def set_preserve_tryjobs(self): |
| 2889 | """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'.""" |
| 2890 | footers = git_footers.parse_footers(self.description) |
| 2891 | for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []): |
| 2892 | if v.lower() == 'true': |
| 2893 | return |
| 2894 | self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true') |
| 2895 | |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2896 | def prompt(self): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2897 | """Asks the user to update the description.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2898 | self.set_description([ |
| 2899 | '# Enter a description of the change.', |
| 2900 | '# This will be displayed on the codereview site.', |
| 2901 | '# The first line will also be used as the subject of the review.', |
alancutter@chromium.org | bd1073e | 2013-06-01 00:34:38 +0000 | [diff] [blame] | 2902 | '#--------------------This line is 72 characters long' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2903 | '--------------------', |
| 2904 | ] + self._description_lines) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2905 | bug_regexp = re.compile(self.BUG_LINE) |
| 2906 | fixed_regexp = re.compile(self.FIXED_LINE) |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 2907 | prefix = settings.GetBugPrefix() |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2908 | has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l) |
| 2909 | if not any((has_issue(line) for line in self._description_lines)): |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2910 | self.append_footer('Bug: %s' % prefix) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2911 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2912 | content = gclient_utils.RunEditor(self.description, True, |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2913 | git_editor=settings.GetGitEditor()) |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 2914 | if not content: |
| 2915 | DieWithError('Running editor failed') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2916 | lines = content.splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2917 | |
Bruce Dawson | 2377b01 | 2018-01-11 16:46:49 -0800 | [diff] [blame] | 2918 | # Strip off comments and default inserted "Bug:" line. |
| 2919 | clean_lines = [line.rstrip() for line in lines if not |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 2920 | (line.startswith('#') or |
| 2921 | line.rstrip() == "Bug:" or |
| 2922 | line.rstrip() == "Bug: " + prefix)] |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2923 | if not clean_lines: |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 2924 | DieWithError('No CL description, aborting') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2925 | self.set_description(clean_lines) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2926 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2927 | def append_footer(self, line): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2928 | """Adds a footer line to the description. |
| 2929 | |
| 2930 | Differentiates legacy "KEY=xxx" footers (used to be called tags) and |
| 2931 | Gerrit's footers in the form of "Footer-Key: footer any value" and ensures |
| 2932 | that Gerrit footers are always at the end. |
| 2933 | """ |
| 2934 | parsed_footer_line = git_footers.parse_footer(line) |
| 2935 | if parsed_footer_line: |
| 2936 | # Line is a gerrit footer in the form: Footer-Key: any value. |
| 2937 | # Thus, must be appended observing Gerrit footer rules. |
| 2938 | self.set_description( |
| 2939 | git_footers.add_footer(self.description, |
| 2940 | key=parsed_footer_line[0], |
| 2941 | value=parsed_footer_line[1])) |
| 2942 | return |
| 2943 | |
| 2944 | if not self._description_lines: |
| 2945 | self._description_lines.append(line) |
| 2946 | return |
| 2947 | |
| 2948 | top_lines, gerrit_footers, _ = git_footers.split_footers(self.description) |
| 2949 | if gerrit_footers: |
| 2950 | # git_footers.split_footers ensures that there is an empty line before |
| 2951 | # actual (gerrit) footers, if any. We have to keep it that way. |
| 2952 | assert top_lines and top_lines[-1] == '' |
| 2953 | top_lines, separator = top_lines[:-1], top_lines[-1:] |
| 2954 | else: |
| 2955 | separator = [] # No need for separator if there are no gerrit_footers. |
| 2956 | |
| 2957 | prev_line = top_lines[-1] if top_lines else '' |
| 2958 | if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or |
| 2959 | not presubmit_support.Change.TAG_LINE_RE.match(line)): |
| 2960 | top_lines.append('') |
| 2961 | top_lines.append(line) |
| 2962 | self._description_lines = top_lines + separator + gerrit_footers |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2963 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2964 | def get_reviewers(self, tbr_only=False): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2965 | """Retrieves the list of reviewers.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2966 | matches = [re.match(self.R_LINE, line) for line in self._description_lines] |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2967 | reviewers = [match.group(2).strip() |
| 2968 | for match in matches |
| 2969 | if match and (not tbr_only or match.group(1).upper() == 'TBR')] |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2970 | return cleanup_list(reviewers) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2971 | |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2972 | def get_cced(self): |
| 2973 | """Retrieves the list of reviewers.""" |
| 2974 | matches = [re.match(self.CC_LINE, line) for line in self._description_lines] |
| 2975 | cced = [match.group(2).strip() for match in matches if match] |
| 2976 | return cleanup_list(cced) |
| 2977 | |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2978 | def get_hash_tags(self): |
| 2979 | """Extracts and sanitizes a list of Gerrit hashtags.""" |
| 2980 | subject = (self._description_lines or ('',))[0] |
| 2981 | subject = re.sub( |
| 2982 | self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE) |
| 2983 | |
| 2984 | tags = [] |
| 2985 | start = 0 |
| 2986 | bracket_exp = re.compile(self.BRACKET_HASH_TAG) |
| 2987 | while True: |
| 2988 | m = bracket_exp.match(subject, start) |
| 2989 | if not m: |
| 2990 | break |
| 2991 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 2992 | start = m.end() |
| 2993 | |
| 2994 | if not tags: |
| 2995 | # Try "Tag: " prefix. |
| 2996 | m = re.match(self.COLON_SEPARATED_HASH_TAG, subject) |
| 2997 | if m: |
| 2998 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 2999 | return tags |
| 3000 | |
| 3001 | @classmethod |
| 3002 | def sanitize_hash_tag(cls, tag): |
| 3003 | """Returns a sanitized Gerrit hash tag. |
| 3004 | |
| 3005 | A sanitized hashtag can be used as a git push refspec parameter value. |
| 3006 | """ |
| 3007 | return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower() |
| 3008 | |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3009 | def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref): |
| 3010 | """Updates this commit description given the parent. |
| 3011 | |
| 3012 | This is essentially what Gnumbd used to do. |
| 3013 | Consult https://goo.gl/WMmpDe for more details. |
| 3014 | """ |
| 3015 | assert parent_msg # No, orphan branch creation isn't supported. |
| 3016 | assert parent_hash |
| 3017 | assert dest_ref |
| 3018 | parent_footer_map = git_footers.parse_footers(parent_msg) |
| 3019 | # This will also happily parse svn-position, which GnumbD is no longer |
| 3020 | # supporting. While we'd generate correct footers, the verifier plugin |
| 3021 | # installed in Gerrit will block such commit (ie git push below will fail). |
| 3022 | parent_position = git_footers.get_position(parent_footer_map) |
| 3023 | |
| 3024 | # Cherry-picks may have last line obscuring their prior footers, |
| 3025 | # from git_footers perspective. This is also what Gnumbd did. |
| 3026 | cp_line = None |
| 3027 | if (self._description_lines and |
| 3028 | re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])): |
| 3029 | cp_line = self._description_lines.pop() |
| 3030 | |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3031 | top_lines, footer_lines, _ = git_footers.split_footers(self.description) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3032 | |
| 3033 | # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just |
| 3034 | # user interference with actual footers we'd insert below. |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3035 | for i, line in enumerate(footer_lines): |
| 3036 | k, v = git_footers.parse_footer(line) or (None, None) |
| 3037 | if k and k.startswith('Cr-'): |
| 3038 | footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3039 | |
| 3040 | # Add Position and Lineage footers based on the parent. |
Andrii Shyshkalov | b5effa1 | 2016-12-14 19:35:12 +0100 | [diff] [blame] | 3041 | lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', []))) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3042 | if parent_position[0] == dest_ref: |
| 3043 | # Same branch as parent. |
| 3044 | number = int(parent_position[1]) + 1 |
| 3045 | else: |
| 3046 | number = 1 # New branch, and extra lineage. |
| 3047 | lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0], |
| 3048 | int(parent_position[1]))) |
| 3049 | |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3050 | footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number)) |
| 3051 | footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3052 | |
| 3053 | self._description_lines = top_lines |
| 3054 | if cp_line: |
| 3055 | self._description_lines.append(cp_line) |
| 3056 | if self._description_lines[-1] != '': |
| 3057 | self._description_lines.append('') # Ensure footer separator. |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3058 | self._description_lines.extend(footer_lines) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3059 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3060 | |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3061 | def get_approving_reviewers(props, disapproval=False): |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3062 | """Retrieves the reviewers that approved a CL from the issue properties with |
| 3063 | messages. |
| 3064 | |
| 3065 | Note that the list may contain reviewers that are not committer, thus are not |
| 3066 | considered by the CQ. |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3067 | |
| 3068 | If disapproval is True, instead returns reviewers who 'not lgtm'd the CL. |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3069 | """ |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3070 | approval_type = 'disapproval' if disapproval else 'approval' |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3071 | return sorted( |
| 3072 | set( |
| 3073 | message['sender'] |
| 3074 | for message in props['messages'] |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3075 | if message[approval_type] and message['sender'] in props['reviewers'] |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3076 | ) |
| 3077 | ) |
| 3078 | |
| 3079 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3080 | def FindCodereviewSettingsFile(filename='codereview.settings'): |
| 3081 | """Finds the given file starting in the cwd and going up. |
| 3082 | |
| 3083 | Only looks up to the top of the repository unless an |
| 3084 | 'inherit-review-settings-ok' file exists in the root of the repository. |
| 3085 | """ |
| 3086 | inherit_ok_file = 'inherit-review-settings-ok' |
| 3087 | cwd = os.getcwd() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 3088 | root = settings.GetRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3089 | if os.path.isfile(os.path.join(root, inherit_ok_file)): |
| 3090 | root = '/' |
| 3091 | while True: |
| 3092 | if filename in os.listdir(cwd): |
| 3093 | if os.path.isfile(os.path.join(cwd, filename)): |
| 3094 | return open(os.path.join(cwd, filename)) |
| 3095 | if cwd == root: |
| 3096 | break |
| 3097 | cwd = os.path.dirname(cwd) |
| 3098 | |
| 3099 | |
| 3100 | def LoadCodereviewSettingsFromFile(fileobj): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3101 | """Parses a codereview.settings file and updates hooks.""" |
maruel@chromium.org | 99ac1c5 | 2012-01-16 14:52:12 +0000 | [diff] [blame] | 3102 | keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3103 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3104 | def SetProperty(name, setting, unset_error_ok=False): |
| 3105 | fullname = 'rietveld.' + name |
| 3106 | if setting in keyvals: |
| 3107 | RunGit(['config', fullname, keyvals[setting]]) |
| 3108 | else: |
| 3109 | RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) |
| 3110 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 3111 | if not keyvals.get('GERRIT_HOST', False): |
| 3112 | SetProperty('server', 'CODE_REVIEW_SERVER') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3113 | # Only server setting is required. Other settings can be absent. |
| 3114 | # In that case, we ignore errors raised during option deletion attempt. |
| 3115 | SetProperty('cc', 'CC_LIST', unset_error_ok=True) |
| 3116 | SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) |
| 3117 | SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 3118 | SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3119 | SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True) |
| 3120 | SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 3121 | SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK', |
| 3122 | unset_error_ok=True) |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 3123 | SetProperty( |
| 3124 | 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3125 | |
ukai@chromium.org | 7044efc | 2013-11-28 01:51:21 +0000 | [diff] [blame] | 3126 | if 'GERRIT_HOST' in keyvals: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3127 | RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3128 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3129 | if 'GERRIT_SQUASH_UPLOADS' in keyvals: |
tandrii | 8dd81ea | 2016-06-16 13:24:23 -0700 | [diff] [blame] | 3130 | RunGit(['config', 'gerrit.squash-uploads', |
| 3131 | keyvals['GERRIT_SQUASH_UPLOADS']]) |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3132 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3133 | if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals: |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 3134 | RunGit(['config', 'gerrit.skip-ensure-authenticated', |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3135 | keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']]) |
| 3136 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3137 | if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 3138 | # should be of the form |
| 3139 | # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof |
| 3140 | # ORIGIN_URL_CONFIG: http://src.chromium.org/git |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3141 | RunGit(['config', keyvals['PUSH_URL_CONFIG'], |
| 3142 | keyvals['ORIGIN_URL_CONFIG']]) |
| 3143 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3144 | |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3145 | def urlretrieve(source, destination): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3146 | """Downloads a network object to a local file, like urllib.urlretrieve. |
| 3147 | |
| 3148 | This is necessary because urllib is broken for SSL connections via a proxy. |
| 3149 | """ |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3150 | with open(destination, 'w') as f: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3151 | f.write(urllib.request.urlopen(source).read()) |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3152 | |
| 3153 | |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3154 | def hasSheBang(fname): |
| 3155 | """Checks fname is a #! script.""" |
| 3156 | with open(fname) as f: |
| 3157 | return f.read(2).startswith('#!') |
| 3158 | |
| 3159 | |
bpastene@chromium.org | 917f0ff | 2016-04-05 00:45:30 +0000 | [diff] [blame] | 3160 | # TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself. |
| 3161 | def DownloadHooks(*args, **kwargs): |
| 3162 | pass |
| 3163 | |
| 3164 | |
tandrii@chromium.org | 18630d6 | 2016-03-04 12:06:02 +0000 | [diff] [blame] | 3165 | def DownloadGerritHook(force): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3166 | """Downloads and installs a Gerrit commit-msg hook. |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3167 | |
| 3168 | Args: |
| 3169 | force: True to update hooks. False to install hooks if not present. |
| 3170 | """ |
| 3171 | if not settings.GetIsGerrit(): |
| 3172 | return |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3173 | src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg' |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3174 | dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 3175 | if not os.access(dst, os.X_OK): |
| 3176 | if os.path.exists(dst): |
| 3177 | if not force: |
| 3178 | return |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3179 | try: |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3180 | urlretrieve(src, dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3181 | if not hasSheBang(dst): |
| 3182 | DieWithError('Not a script: %s\n' |
| 3183 | 'You need to download from\n%s\n' |
| 3184 | 'into .git/hooks/commit-msg and ' |
| 3185 | 'chmod +x .git/hooks/commit-msg' % (dst, src)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3186 | os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) |
| 3187 | except Exception: |
| 3188 | if os.path.exists(dst): |
| 3189 | os.remove(dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3190 | DieWithError('\nFailed to download hooks.\n' |
| 3191 | 'You need to download from\n%s\n' |
| 3192 | 'into .git/hooks/commit-msg and ' |
| 3193 | 'chmod +x .git/hooks/commit-msg' % src) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3194 | |
| 3195 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3196 | class _GitCookiesChecker(object): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3197 | """Provides facilities for validating and suggesting fixes to .gitcookies.""" |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3198 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3199 | _GOOGLESOURCE = 'googlesource.com' |
| 3200 | |
| 3201 | def __init__(self): |
| 3202 | # Cached list of [host, identity, source], where source is either |
| 3203 | # .gitcookies or .netrc. |
| 3204 | self._all_hosts = None |
| 3205 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3206 | def ensure_configured_gitcookies(self): |
| 3207 | """Runs checks and suggests fixes to make git use .gitcookies from default |
| 3208 | path.""" |
| 3209 | default = gerrit_util.CookiesAuthenticator.get_gitcookies_path() |
| 3210 | configured_path = RunGitSilent( |
| 3211 | ['config', '--global', 'http.cookiefile']).strip() |
Andrii Shyshkalov | 1e250cd | 2017-05-10 15:39:31 +0200 | [diff] [blame] | 3212 | configured_path = os.path.expanduser(configured_path) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3213 | if configured_path: |
| 3214 | self._ensure_default_gitcookies_path(configured_path, default) |
| 3215 | else: |
| 3216 | self._configure_gitcookies_path(default) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3217 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3218 | @staticmethod |
| 3219 | def _ensure_default_gitcookies_path(configured_path, default_path): |
| 3220 | assert configured_path |
| 3221 | if configured_path == default_path: |
| 3222 | print('git is already configured to use your .gitcookies from %s' % |
| 3223 | configured_path) |
| 3224 | return |
| 3225 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3226 | print('WARNING: You have configured custom path to .gitcookies: %s\n' |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3227 | 'Gerrit and other depot_tools expect .gitcookies at %s\n' % |
| 3228 | (configured_path, default_path)) |
| 3229 | |
| 3230 | if not os.path.exists(configured_path): |
| 3231 | print('However, your configured .gitcookies file is missing.') |
| 3232 | confirm_or_exit('Reconfigure git to use default .gitcookies?', |
| 3233 | action='reconfigure') |
| 3234 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3235 | return |
| 3236 | |
| 3237 | if os.path.exists(default_path): |
| 3238 | print('WARNING: default .gitcookies file already exists %s' % |
| 3239 | default_path) |
| 3240 | DieWithError('Please delete %s manually and re-run git cl creds-check' % |
| 3241 | default_path) |
| 3242 | |
| 3243 | confirm_or_exit('Move existing .gitcookies to default location?', |
| 3244 | action='move') |
| 3245 | shutil.move(configured_path, default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3246 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3247 | print('Moved and reconfigured git to use .gitcookies from %s' % |
| 3248 | default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3249 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3250 | @staticmethod |
| 3251 | def _configure_gitcookies_path(default_path): |
| 3252 | netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path() |
| 3253 | if os.path.exists(netrc_path): |
| 3254 | print('You seem to be using outdated .netrc for git credentials: %s' % |
| 3255 | netrc_path) |
| 3256 | print('This tool will guide you through setting up recommended ' |
| 3257 | '.gitcookies store for git credentials.\n' |
| 3258 | '\n' |
| 3259 | 'IMPORTANT: If something goes wrong and you decide to go back, do:\n' |
| 3260 | ' git config --global --unset http.cookiefile\n' |
| 3261 | ' mv %s %s.backup\n\n' % (default_path, default_path)) |
| 3262 | confirm_or_exit(action='setup .gitcookies') |
| 3263 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3264 | print('Configured git to use .gitcookies from %s' % default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3265 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3266 | def get_hosts_with_creds(self, include_netrc=False): |
| 3267 | if self._all_hosts is None: |
| 3268 | a = gerrit_util.CookiesAuthenticator() |
| 3269 | self._all_hosts = [ |
| 3270 | (h, u, s) |
| 3271 | for h, u, s in itertools.chain( |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3272 | ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), |
| 3273 | ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()) |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3274 | ) |
| 3275 | if h.endswith(self._GOOGLESOURCE) |
| 3276 | ] |
| 3277 | |
| 3278 | if include_netrc: |
| 3279 | return self._all_hosts |
| 3280 | return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc'] |
| 3281 | |
| 3282 | def print_current_creds(self, include_netrc=False): |
| 3283 | hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc)) |
| 3284 | if not hosts: |
| 3285 | print('No Git/Gerrit credentials found') |
| 3286 | return |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3287 | lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)] |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3288 | header = [('Host', 'User', 'Which file'), |
| 3289 | ['=' * l for l in lengths]] |
| 3290 | for row in (header + hosts): |
| 3291 | print('\t'.join((('%%+%ds' % l) % s) |
| 3292 | for l, s in zip(lengths, row))) |
| 3293 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3294 | @staticmethod |
| 3295 | def _parse_identity(identity): |
Lei Zhang | d3f769a | 2017-12-15 15:16:14 -0800 | [diff] [blame] | 3296 | """Parses identity "git-<username>.domain" into <username> and domain.""" |
| 3297 | # Special case: usernames that contain ".", which are generally not |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 3298 | # distinguishable from sub-domains. But we do know typical domains: |
| 3299 | if identity.endswith('.chromium.org'): |
| 3300 | domain = 'chromium.org' |
| 3301 | username = identity[:-len('.chromium.org')] |
| 3302 | else: |
| 3303 | username, domain = identity.split('.', 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3304 | if username.startswith('git-'): |
| 3305 | username = username[len('git-'):] |
| 3306 | return username, domain |
| 3307 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3308 | def _canonical_git_googlesource_host(self, host): |
| 3309 | """Normalizes Gerrit hosts (with '-review') to Git host.""" |
| 3310 | assert host.endswith(self._GOOGLESOURCE) |
| 3311 | # Prefix doesn't include '.' at the end. |
| 3312 | prefix = host[:-(1 + len(self._GOOGLESOURCE))] |
| 3313 | if prefix.endswith('-review'): |
| 3314 | prefix = prefix[:-len('-review')] |
| 3315 | return prefix + '.' + self._GOOGLESOURCE |
| 3316 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3317 | def _canonical_gerrit_googlesource_host(self, host): |
| 3318 | git_host = self._canonical_git_googlesource_host(host) |
| 3319 | prefix = git_host.split('.', 1)[0] |
| 3320 | return prefix + '-review.' + self._GOOGLESOURCE |
| 3321 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3322 | def _get_counterpart_host(self, host): |
| 3323 | assert host.endswith(self._GOOGLESOURCE) |
| 3324 | git = self._canonical_git_googlesource_host(host) |
| 3325 | gerrit = self._canonical_gerrit_googlesource_host(git) |
| 3326 | return git if gerrit == host else gerrit |
| 3327 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3328 | def has_generic_host(self): |
| 3329 | """Returns whether generic .googlesource.com has been configured. |
| 3330 | |
| 3331 | Chrome Infra recommends to use explicit ${host}.googlesource.com instead. |
| 3332 | """ |
| 3333 | for host, _, _ in self.get_hosts_with_creds(include_netrc=False): |
| 3334 | if host == '.' + self._GOOGLESOURCE: |
| 3335 | return True |
| 3336 | return False |
| 3337 | |
| 3338 | def _get_git_gerrit_identity_pairs(self): |
| 3339 | """Returns map from canonic host to pair of identities (Git, Gerrit). |
| 3340 | |
| 3341 | One of identities might be None, meaning not configured. |
| 3342 | """ |
| 3343 | host_to_identity_pairs = {} |
| 3344 | for host, identity, _ in self.get_hosts_with_creds(): |
| 3345 | canonical = self._canonical_git_googlesource_host(host) |
| 3346 | pair = host_to_identity_pairs.setdefault(canonical, [None, None]) |
| 3347 | idx = 0 if canonical == host else 1 |
| 3348 | pair[idx] = identity |
| 3349 | return host_to_identity_pairs |
| 3350 | |
| 3351 | def get_partially_configured_hosts(self): |
| 3352 | return set( |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3353 | (host if i1 else self._canonical_gerrit_googlesource_host(host)) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3354 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3355 | if None in (i1, i2) and host != '.' + self._GOOGLESOURCE) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3356 | |
| 3357 | def get_conflicting_hosts(self): |
| 3358 | return set( |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3359 | host |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3360 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3361 | if None not in (i1, i2) and i1 != i2) |
| 3362 | |
| 3363 | def get_duplicated_hosts(self): |
| 3364 | counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds()) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3365 | return set(host for host, count in counters.items() if count > 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3366 | |
| 3367 | _EXPECTED_HOST_IDENTITY_DOMAINS = { |
| 3368 | 'chromium.googlesource.com': 'chromium.org', |
| 3369 | 'chrome-internal.googlesource.com': 'google.com', |
| 3370 | } |
| 3371 | |
| 3372 | def get_hosts_with_wrong_identities(self): |
| 3373 | """Finds hosts which **likely** reference wrong identities. |
| 3374 | |
| 3375 | Note: skips hosts which have conflicting identities for Git and Gerrit. |
| 3376 | """ |
| 3377 | hosts = set() |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3378 | for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items(): |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3379 | pair = self._get_git_gerrit_identity_pairs().get(host) |
| 3380 | if pair and pair[0] == pair[1]: |
| 3381 | _, domain = self._parse_identity(pair[0]) |
| 3382 | if domain != expected: |
| 3383 | hosts.add(host) |
| 3384 | return hosts |
| 3385 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3386 | @staticmethod |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3387 | def _format_hosts(hosts, extra_column_func=None): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3388 | hosts = sorted(hosts) |
| 3389 | assert hosts |
| 3390 | if extra_column_func is None: |
| 3391 | extras = [''] * len(hosts) |
| 3392 | else: |
| 3393 | extras = [extra_column_func(host) for host in hosts] |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3394 | tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras))) |
| 3395 | lines = [] |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3396 | for he in zip(hosts, extras): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3397 | lines.append(tmpl % he) |
| 3398 | return lines |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3399 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3400 | def _find_problems(self): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3401 | if self.has_generic_host(): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3402 | yield ('.googlesource.com wildcard record detected', |
| 3403 | ['Chrome Infrastructure team recommends to list full host names ' |
| 3404 | 'explicitly.'], |
| 3405 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3406 | |
| 3407 | dups = self.get_duplicated_hosts() |
| 3408 | if dups: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3409 | yield ('The following hosts were defined twice', |
| 3410 | self._format_hosts(dups), |
| 3411 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3412 | |
| 3413 | partial = self.get_partially_configured_hosts() |
| 3414 | if partial: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3415 | yield ('Credentials should come in pairs for Git and Gerrit hosts. ' |
| 3416 | 'These hosts are missing', |
| 3417 | self._format_hosts(partial, lambda host: 'but %s defined' % |
| 3418 | self._get_counterpart_host(host)), |
| 3419 | partial) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3420 | |
| 3421 | conflicting = self.get_conflicting_hosts() |
| 3422 | if conflicting: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3423 | yield ('The following Git hosts have differing credentials from their ' |
| 3424 | 'Gerrit counterparts', |
| 3425 | self._format_hosts(conflicting, lambda host: '%s vs %s' % |
| 3426 | tuple(self._get_git_gerrit_identity_pairs()[host])), |
| 3427 | conflicting) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3428 | |
| 3429 | wrong = self.get_hosts_with_wrong_identities() |
| 3430 | if wrong: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3431 | yield ('These hosts likely use wrong identity', |
| 3432 | self._format_hosts(wrong, lambda host: '%s but %s recommended' % |
| 3433 | (self._get_git_gerrit_identity_pairs()[host][0], |
| 3434 | self._EXPECTED_HOST_IDENTITY_DOMAINS[host])), |
| 3435 | wrong) |
| 3436 | |
| 3437 | def find_and_report_problems(self): |
| 3438 | """Returns True if there was at least one problem, else False.""" |
| 3439 | found = False |
| 3440 | bad_hosts = set() |
| 3441 | for title, sublines, hosts in self._find_problems(): |
| 3442 | if not found: |
| 3443 | found = True |
| 3444 | print('\n\n.gitcookies problem report:\n') |
| 3445 | bad_hosts.update(hosts or []) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3446 | print(' %s%s' % (title, (':' if sublines else ''))) |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3447 | if sublines: |
| 3448 | print() |
| 3449 | print(' %s' % '\n '.join(sublines)) |
| 3450 | print() |
| 3451 | |
| 3452 | if bad_hosts: |
| 3453 | assert found |
| 3454 | print(' You can manually remove corresponding lines in your %s file and ' |
| 3455 | 'visit the following URLs with correct account to generate ' |
| 3456 | 'correct credential lines:\n' % |
| 3457 | gerrit_util.CookiesAuthenticator.get_gitcookies_path()) |
| 3458 | print(' %s' % '\n '.join(sorted(set( |
| 3459 | gerrit_util.CookiesAuthenticator().get_new_password_url( |
| 3460 | self._canonical_git_googlesource_host(host)) |
| 3461 | for host in bad_hosts |
| 3462 | )))) |
| 3463 | return found |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3464 | |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3465 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3466 | @metrics.collector.collect_metrics('git cl creds-check') |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3467 | def CMDcreds_check(parser, args): |
| 3468 | """Checks credentials and suggests changes.""" |
| 3469 | _, _ = parser.parse_args(args) |
| 3470 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3471 | # Code below checks .gitcookies. Abort if using something else. |
| 3472 | authn = gerrit_util.Authenticator.get() |
| 3473 | if not isinstance(authn, gerrit_util.CookiesAuthenticator): |
| 3474 | if isinstance(authn, gerrit_util.GceAuthenticator): |
| 3475 | DieWithError( |
| 3476 | 'This command is not designed for GCE, are you on a bot?\n' |
| 3477 | 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 ' |
| 3478 | 'in your env.') |
Aaron Gable | d10ca0e | 2017-09-11 11:24:10 -0700 | [diff] [blame] | 3479 | DieWithError( |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3480 | 'This command is not designed for bot environment. It checks ' |
| 3481 | '~/.gitcookies file not generally used on bots.') |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3482 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3483 | checker = _GitCookiesChecker() |
| 3484 | checker.ensure_configured_gitcookies() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3485 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3486 | print('Your .netrc and .gitcookies have credentials for these hosts:') |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3487 | checker.print_current_creds(include_netrc=True) |
| 3488 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3489 | if not checker.find_and_report_problems(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3490 | print('\nNo problems detected in your .gitcookies file.') |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3491 | return 0 |
| 3492 | return 1 |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3493 | |
| 3494 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3495 | @metrics.collector.collect_metrics('git cl baseurl') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3496 | def CMDbaseurl(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3497 | """Gets or sets base-url for this branch.""" |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3498 | branchref = RunGit(['symbolic-ref', 'HEAD']).strip() |
| 3499 | branch = ShortBranchName(branchref) |
| 3500 | _, args = parser.parse_args(args) |
| 3501 | if not args: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3502 | print('Current base-url:') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3503 | return RunGit(['config', 'branch.%s.base-url' % branch], |
| 3504 | error_ok=False).strip() |
| 3505 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3506 | print('Setting base-url to %s' % args[0]) |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3507 | return RunGit(['config', 'branch.%s.base-url' % branch, args[0]], |
| 3508 | error_ok=False).strip() |
| 3509 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3510 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3511 | def color_for_status(status): |
| 3512 | """Maps a Changelist status to color, for CMDstatus and other tools.""" |
| 3513 | return { |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3514 | 'unsent': Fore.YELLOW, |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3515 | 'waiting': Fore.BLUE, |
| 3516 | 'reply': Fore.YELLOW, |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3517 | 'not lgtm': Fore.RED, |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3518 | 'lgtm': Fore.GREEN, |
| 3519 | 'commit': Fore.MAGENTA, |
| 3520 | 'closed': Fore.CYAN, |
| 3521 | 'error': Fore.WHITE, |
| 3522 | }.get(status, Fore.WHITE) |
| 3523 | |
tandrii@chromium.org | 04ea846 | 2016-04-25 19:51:21 +0000 | [diff] [blame] | 3524 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3525 | def get_cl_statuses(changes, fine_grained, max_processes=None): |
| 3526 | """Returns a blocking iterable of (cl, status) for given branches. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3527 | |
| 3528 | If fine_grained is true, this will fetch CL statuses from the server. |
| 3529 | Otherwise, simply indicate if there's a matching url for the given branches. |
| 3530 | |
| 3531 | If max_processes is specified, it is used as the maximum number of processes |
| 3532 | to spawn to fetch CL status from the server. Otherwise 1 process per branch is |
| 3533 | spawned. |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3534 | |
| 3535 | See GetStatus() for a list of possible statuses. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3536 | """ |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3537 | if not changes: |
| 3538 | raise StopIteration() |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3539 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3540 | if not fine_grained: |
| 3541 | # Fast path which doesn't involve querying codereview servers. |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3542 | # Do not use get_approving_reviewers(), since it requires an HTTP request. |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3543 | for cl in changes: |
| 3544 | yield (cl, 'waiting' if cl.GetIssueURL() else 'error') |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3545 | return |
| 3546 | |
| 3547 | # First, sort out authentication issues. |
| 3548 | logging.debug('ensuring credentials exist') |
| 3549 | for cl in changes: |
| 3550 | cl.EnsureAuthenticated(force=False, refresh=True) |
| 3551 | |
| 3552 | def fetch(cl): |
| 3553 | try: |
| 3554 | return (cl, cl.GetStatus()) |
| 3555 | except: |
| 3556 | # See http://crbug.com/629863. |
Andrii Shyshkalov | 9882423 | 2018-04-19 11:37:15 -0700 | [diff] [blame] | 3557 | logging.exception('failed to fetch status for cl %s:', cl.GetIssue()) |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3558 | raise |
| 3559 | |
| 3560 | threads_count = len(changes) |
| 3561 | if max_processes: |
| 3562 | threads_count = max(1, min(threads_count, max_processes)) |
| 3563 | logging.debug('querying %d CLs using %d threads', len(changes), threads_count) |
| 3564 | |
| 3565 | pool = ThreadPool(threads_count) |
| 3566 | fetched_cls = set() |
| 3567 | try: |
| 3568 | it = pool.imap_unordered(fetch, changes).__iter__() |
| 3569 | while True: |
| 3570 | try: |
| 3571 | cl, status = it.next(timeout=5) |
| 3572 | except multiprocessing.TimeoutError: |
| 3573 | break |
| 3574 | fetched_cls.add(cl) |
| 3575 | yield cl, status |
| 3576 | finally: |
| 3577 | pool.close() |
| 3578 | |
| 3579 | # Add any branches that failed to fetch. |
| 3580 | for cl in set(changes) - fetched_cls: |
| 3581 | yield (cl, 'error') |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3582 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3583 | |
| 3584 | def upload_branch_deps(cl, args): |
| 3585 | """Uploads CLs of local branches that are dependents of the current branch. |
| 3586 | |
| 3587 | If the local branch dependency tree looks like: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3588 | |
| 3589 | test1 -> test2.1 -> test3.1 |
| 3590 | -> test3.2 |
| 3591 | -> test2.2 -> test3.3 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3592 | |
| 3593 | and you run "git cl upload --dependencies" from test1 then "git cl upload" is |
| 3594 | run on the dependent branches in this order: |
| 3595 | test2.1, test3.1, test3.2, test2.2, test3.3 |
| 3596 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3597 | Note: This function does not rebase your local dependent branches. Use it |
| 3598 | when you make a change to the parent branch that will not conflict |
| 3599 | with its dependent branches, and you would like their dependencies |
| 3600 | updated in Rietveld. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3601 | """ |
| 3602 | if git_common.is_dirty_git_tree('upload-branch-deps'): |
| 3603 | return 1 |
| 3604 | |
| 3605 | root_branch = cl.GetBranch() |
| 3606 | if root_branch is None: |
| 3607 | DieWithError('Can\'t find dependent branches from detached HEAD state. ' |
| 3608 | 'Get on a branch!') |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 3609 | if not cl.GetIssue(): |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3610 | DieWithError('Current branch does not have an uploaded CL. We cannot set ' |
| 3611 | 'patchset dependencies without an uploaded CL.') |
| 3612 | |
| 3613 | branches = RunGit(['for-each-ref', |
| 3614 | '--format=%(refname:short) %(upstream:short)', |
| 3615 | 'refs/heads']) |
| 3616 | if not branches: |
| 3617 | print('No local branches found.') |
| 3618 | return 0 |
| 3619 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3620 | # Create a dictionary of all local branches to the branches that are |
| 3621 | # dependent on it. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3622 | tracked_to_dependents = collections.defaultdict(list) |
| 3623 | for b in branches.splitlines(): |
| 3624 | tokens = b.split() |
| 3625 | if len(tokens) == 2: |
| 3626 | branch_name, tracked = tokens |
| 3627 | tracked_to_dependents[tracked].append(branch_name) |
| 3628 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3629 | print() |
| 3630 | print('The dependent local branches of %s are:' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3631 | dependents = [] |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3632 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3633 | def traverse_dependents_preorder(branch, padding=''): |
| 3634 | dependents_to_process = tracked_to_dependents.get(branch, []) |
| 3635 | padding += ' ' |
| 3636 | for dependent in dependents_to_process: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3637 | print('%s%s' % (padding, dependent)) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3638 | dependents.append(dependent) |
| 3639 | traverse_dependents_preorder(dependent, padding) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3640 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3641 | traverse_dependents_preorder(root_branch) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3642 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3643 | |
| 3644 | if not dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3645 | print('There are no dependent local branches for %s' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3646 | return 0 |
| 3647 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 3648 | confirm_or_exit('This command will checkout all dependent branches and run ' |
| 3649 | '"git cl upload".', action='continue') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3650 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3651 | # Record all dependents that failed to upload. |
| 3652 | failures = {} |
| 3653 | # Go through all dependents, checkout the branch and upload. |
| 3654 | try: |
| 3655 | for dependent_branch in dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3656 | print() |
| 3657 | print('--------------------------------------') |
| 3658 | print('Running "git cl upload" from %s:' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3659 | RunGit(['checkout', '-q', dependent_branch]) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3660 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3661 | try: |
| 3662 | if CMDupload(OptionParser(), args) != 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3663 | print('Upload failed for %s!' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3664 | failures[dependent_branch] = 1 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 3665 | except: # pylint: disable=bare-except |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3666 | failures[dependent_branch] = 1 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3667 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3668 | finally: |
| 3669 | # Swap back to the original root branch. |
| 3670 | RunGit(['checkout', '-q', root_branch]) |
| 3671 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3672 | print() |
| 3673 | print('Upload complete for dependent branches!') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3674 | for dependent_branch in dependents: |
| 3675 | upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3676 | print(' %s : %s' % (dependent_branch, upload_status)) |
| 3677 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3678 | |
| 3679 | return 0 |
| 3680 | |
| 3681 | |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3682 | def GetArchiveTagForBranch(issue_num, branch_name, existing_tags): |
| 3683 | """Given a proposed tag name, returns a tag name that is guaranteed to be |
| 3684 | unique. If 'foo' is proposed but already exists, then 'foo-2' is used, |
| 3685 | or 'foo-3', and so on.""" |
| 3686 | |
| 3687 | proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name) |
| 3688 | for suffix_num in itertools.count(1): |
| 3689 | if suffix_num == 1: |
| 3690 | to_check = proposed_tag |
| 3691 | else: |
| 3692 | to_check = '%s-%d' % (proposed_tag, suffix_num) |
| 3693 | |
| 3694 | if to_check not in existing_tags: |
| 3695 | return to_check |
| 3696 | |
| 3697 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3698 | @metrics.collector.collect_metrics('git cl archive') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3699 | def CMDarchive(parser, args): |
| 3700 | """Archives and deletes branches associated with closed changelists.""" |
| 3701 | parser.add_option( |
| 3702 | '-j', '--maxjobs', action='store', type=int, |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3703 | help='The maximum number of jobs to use when retrieving review status.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3704 | parser.add_option( |
| 3705 | '-f', '--force', action='store_true', |
| 3706 | help='Bypasses the confirmation prompt.') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3707 | parser.add_option( |
| 3708 | '-d', '--dry-run', action='store_true', |
| 3709 | help='Skip the branch tagging and removal steps.') |
| 3710 | parser.add_option( |
| 3711 | '-t', '--notags', action='store_true', |
| 3712 | help='Do not tag archived branches. ' |
| 3713 | 'Note: local commit history may be lost.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3714 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3715 | options, args = parser.parse_args(args) |
| 3716 | if args: |
| 3717 | parser.error('Unsupported args: %s' % ' '.join(args)) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3718 | |
| 3719 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3720 | if not branches: |
| 3721 | return 0 |
| 3722 | |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3723 | tags = RunGit(['for-each-ref', '--format=%(refname)', |
| 3724 | 'refs/tags']).splitlines() or [] |
| 3725 | tags = [t.split('/')[-1] for t in tags] |
| 3726 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3727 | print('Finding all branches associated with closed issues...') |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3728 | changes = [Changelist(branchref=b) |
| 3729 | for b in branches.splitlines()] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3730 | alignment = max(5, max(len(c.GetBranch()) for c in changes)) |
| 3731 | statuses = get_cl_statuses(changes, |
| 3732 | fine_grained=True, |
| 3733 | max_processes=options.maxjobs) |
| 3734 | proposal = [(cl.GetBranch(), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3735 | GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), |
| 3736 | tags)) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3737 | for cl, status in statuses |
Andrii Shyshkalov | 51bdf8c | 2018-10-18 01:07:58 +0000 | [diff] [blame] | 3738 | if status in ('closed', 'rietveld-not-supported')] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3739 | proposal.sort() |
| 3740 | |
| 3741 | if not proposal: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3742 | print('No branches with closed codereview issues found.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3743 | return 0 |
| 3744 | |
| 3745 | current_branch = GetCurrentBranch() |
| 3746 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3747 | print('\nBranches with closed issues that will be archived:\n') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3748 | if options.notags: |
| 3749 | for next_item in proposal: |
| 3750 | print(' ' + next_item[0]) |
| 3751 | else: |
| 3752 | print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name')) |
| 3753 | for next_item in proposal: |
| 3754 | print('%*s %s' % (alignment, next_item[0], next_item[1])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3755 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3756 | # Quit now on precondition failure or if instructed by the user, either |
| 3757 | # via an interactive prompt or by command line flags. |
| 3758 | if options.dry_run: |
| 3759 | print('\nNo changes were made (dry run).\n') |
| 3760 | return 0 |
| 3761 | elif any(branch == current_branch for branch, _ in proposal): |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3762 | print('You are currently on a branch \'%s\' which is associated with a ' |
| 3763 | 'closed codereview issue, so archive cannot proceed. Please ' |
| 3764 | 'checkout another branch and run this command again.' % |
| 3765 | current_branch) |
| 3766 | return 1 |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3767 | elif not options.force: |
sergiyb | 4a5ecbe | 2016-06-20 09:46:00 -0700 | [diff] [blame] | 3768 | answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower() |
| 3769 | if answer not in ('y', ''): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3770 | print('Aborted.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3771 | return 1 |
| 3772 | |
| 3773 | for branch, tagname in proposal: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3774 | if not options.notags: |
| 3775 | RunGit(['tag', tagname, branch]) |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3776 | |
| 3777 | if RunGitWithCode(['branch', '-D', branch])[0] != 0: |
| 3778 | # Clean up the tag if we failed to delete the branch. |
| 3779 | RunGit(['tag', '-d', tagname]) |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3780 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3781 | print('\nJob\'s done!') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3782 | |
| 3783 | return 0 |
| 3784 | |
| 3785 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3786 | @metrics.collector.collect_metrics('git cl status') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3787 | def CMDstatus(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3788 | """Show status of changelists. |
| 3789 | |
| 3790 | Colors are used to tell the state of the CL unless --fast is used: |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3791 | - Blue waiting for review |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3792 | - Yellow waiting for you to reply to review, or not yet sent |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3793 | - Green LGTM'ed |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3794 | - Red 'not LGTM'ed |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 3795 | - Magenta in the CQ |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3796 | - Cyan was committed, branch can be deleted |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3797 | - White error, or unknown status |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3798 | |
| 3799 | Also see 'git cl comments'. |
| 3800 | """ |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3801 | parser.add_option( |
| 3802 | '--no-branch-color', |
| 3803 | action='store_true', |
| 3804 | help='Disable colorized branch names') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3805 | parser.add_option('--field', |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3806 | help='print only specific field (desc|id|patch|status|url)') |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3807 | parser.add_option('-f', '--fast', action='store_true', |
| 3808 | help='Do not retrieve review status') |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3809 | parser.add_option( |
| 3810 | '-j', '--maxjobs', action='store', type=int, |
| 3811 | help='The maximum number of jobs to use when retrieving review status') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 3812 | parser.add_option( |
| 3813 | '-i', '--issue', type=int, |
| 3814 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 3815 | 'issue. Requires --field to be set.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3816 | options, args = parser.parse_args(args) |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3817 | if args: |
| 3818 | parser.error('Unsupported args: %s' % args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3819 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3820 | if options.issue is not None and not options.field: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 3821 | parser.error('--field must be specified with --issue.') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 3822 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3823 | if options.field: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3824 | cl = Changelist(issue=options.issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3825 | if options.field.startswith('desc'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3826 | print(cl.GetDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3827 | elif options.field == 'id': |
| 3828 | issueid = cl.GetIssue() |
| 3829 | if issueid: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3830 | print(issueid) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3831 | elif options.field == 'patch': |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 3832 | patchset = cl.GetMostRecentPatchset() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3833 | if patchset: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3834 | print(patchset) |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3835 | elif options.field == 'status': |
| 3836 | print(cl.GetStatus()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3837 | elif options.field == 'url': |
| 3838 | url = cl.GetIssueURL() |
| 3839 | if url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3840 | print(url) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 3841 | return 0 |
| 3842 | |
| 3843 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3844 | if not branches: |
| 3845 | print('No local branch found.') |
| 3846 | return 0 |
| 3847 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3848 | changes = [ |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3849 | Changelist(branchref=b) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3850 | for b in branches.splitlines()] |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3851 | print('Branches associated with reviews:') |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3852 | output = get_cl_statuses(changes, |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3853 | fine_grained=not options.fast, |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3854 | max_processes=options.maxjobs) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3855 | |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3856 | current_branch = GetCurrentBranch() |
| 3857 | |
| 3858 | def FormatBranchName(branch, colorize=False): |
| 3859 | """Simulates 'git branch' behavior. Colorizes and prefixes branch name with |
| 3860 | an asterisk when it is the current branch.""" |
| 3861 | |
| 3862 | asterisk = "" |
| 3863 | color = Fore.RESET |
| 3864 | if branch == current_branch: |
| 3865 | asterisk = "* " |
| 3866 | color = Fore.GREEN |
| 3867 | branch_name = ShortBranchName(branch) |
| 3868 | |
| 3869 | if colorize: |
| 3870 | return asterisk + color + branch_name + Fore.RESET |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3871 | return asterisk + branch_name |
| 3872 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3873 | branch_statuses = {} |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3874 | |
| 3875 | alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes)) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3876 | for cl in sorted(changes, key=lambda c: c.GetBranch()): |
| 3877 | branch = cl.GetBranch() |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3878 | while branch not in branch_statuses: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3879 | c, status = next(output) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3880 | branch_statuses[c.GetBranch()] = status |
| 3881 | status = branch_statuses.pop(branch) |
| 3882 | url = cl.GetIssueURL() |
| 3883 | if url and (not status or status == 'error'): |
| 3884 | # The issue probably doesn't exist anymore. |
| 3885 | url += ' (broken)' |
| 3886 | |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3887 | color = color_for_status(status) |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3888 | reset = Fore.RESET |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 3889 | if not setup_color.IS_TTY: |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3890 | color = '' |
| 3891 | reset = '' |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3892 | status_str = '(%s)' % status if status else '' |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3893 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3894 | branch_display = FormatBranchName(branch) |
| 3895 | padding = ' ' * (alignment - len(branch_display)) |
| 3896 | if not options.no_branch_color: |
| 3897 | branch_display = FormatBranchName(branch, colorize=True) |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3898 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3899 | print(' %s : %s%s %s%s' % (padding + branch_display, color, url, |
| 3900 | status_str, reset)) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3901 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3902 | print() |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3903 | print('Current branch: %s' % current_branch) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3904 | for cl in changes: |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3905 | if cl.GetBranch() == current_branch: |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3906 | break |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3907 | if not cl.GetIssue(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3908 | print('No issue assigned.') |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3909 | return 0 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3910 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 3911 | if not options.fast: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3912 | print('Issue description:') |
| 3913 | print(cl.GetDescription(pretty=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3914 | return 0 |
| 3915 | |
| 3916 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3917 | def colorize_CMDstatus_doc(): |
| 3918 | """To be called once in main() to add colors to git cl status help.""" |
| 3919 | colors = [i for i in dir(Fore) if i[0].isupper()] |
| 3920 | |
| 3921 | def colorize_line(line): |
| 3922 | for color in colors: |
| 3923 | if color in line.upper(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3924 | # Extract whitespace first and the leading '-'. |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3925 | indent = len(line) - len(line.lstrip(' ')) + 1 |
| 3926 | return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET |
| 3927 | return line |
| 3928 | |
| 3929 | lines = CMDstatus.__doc__.splitlines() |
| 3930 | CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines) |
| 3931 | |
| 3932 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3933 | def write_json(path, contents): |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 3934 | if path == '-': |
| 3935 | json.dump(contents, sys.stdout) |
| 3936 | else: |
| 3937 | with open(path, 'w') as f: |
| 3938 | json.dump(contents, f) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3939 | |
| 3940 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3941 | @subcommand.usage('[issue_number]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3942 | @metrics.collector.collect_metrics('git cl issue') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3943 | def CMDissue(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3944 | """Sets or displays the current code review issue number. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3945 | |
| 3946 | Pass issue number 0 to clear the current issue. |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3947 | """ |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3948 | parser.add_option('-r', '--reverse', action='store_true', |
| 3949 | help='Lookup the branch(es) for the specified issues. If ' |
| 3950 | 'no issues are specified, all branches with mapped ' |
| 3951 | 'issues will be listed.') |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 3952 | parser.add_option('--json', |
| 3953 | help='Path to JSON output file, or "-" for stdout.') |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3954 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3955 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3956 | if options.reverse: |
| 3957 | branches = RunGit(['for-each-ref', 'refs/heads', |
Aaron Gable | ad64abd | 2017-12-04 09:49:13 -0800 | [diff] [blame] | 3958 | '--format=%(refname)']).splitlines() |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3959 | # Reverse issue lookup. |
| 3960 | issue_branch_map = {} |
Daniel Bratell | b56a43a | 2018-09-06 15:49:03 +0000 | [diff] [blame] | 3961 | |
| 3962 | git_config = {} |
| 3963 | for config in RunGit(['config', '--get-regexp', |
| 3964 | r'branch\..*issue']).splitlines(): |
| 3965 | name, _space, val = config.partition(' ') |
| 3966 | git_config[name] = val |
| 3967 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3968 | for branch in branches: |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 3969 | config_key = _git_branch_config_key(ShortBranchName(branch), |
| 3970 | Changelist.IssueConfigKey()) |
| 3971 | issue = git_config.get(config_key) |
| 3972 | if issue: |
| 3973 | issue_branch_map.setdefault(int(issue), []).append(branch) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3974 | if not args: |
| 3975 | args = sorted(issue_branch_map.iterkeys()) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3976 | result = {} |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3977 | for issue in args: |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3978 | try: |
| 3979 | issue_num = int(issue) |
| 3980 | except ValueError: |
| 3981 | print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3982 | continue |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3983 | result[issue_num] = issue_branch_map.get(issue_num) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3984 | print('Branch for issue number %s: %s' % ( |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3985 | issue, ', '.join(issue_branch_map.get(issue_num) or ('None',)))) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3986 | if options.json: |
| 3987 | write_json(options.json, result) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3988 | return 0 |
| 3989 | |
| 3990 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3991 | issue = ParseIssueNumberArgument(args[0]) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3992 | if not issue.valid: |
| 3993 | DieWithError('Pass a url or number to set the issue, 0 to unset it, ' |
| 3994 | 'or no argument to list it.\n' |
| 3995 | 'Maybe you want to run git cl status?') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3996 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3997 | cl.SetIssue(issue.issue) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3998 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3999 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4000 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
| 4001 | if options.json: |
| 4002 | write_json(options.json, { |
| 4003 | 'issue': cl.GetIssue(), |
| 4004 | 'issue_url': cl.GetIssueURL(), |
| 4005 | }) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4006 | return 0 |
| 4007 | |
| 4008 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4009 | @metrics.collector.collect_metrics('git cl comments') |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4010 | def CMDcomments(parser, args): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4011 | """Shows or posts review comments for any changelist.""" |
| 4012 | parser.add_option('-a', '--add-comment', dest='comment', |
| 4013 | help='comment to add to an issue') |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 4014 | parser.add_option('-p', '--publish', action='store_true', |
| 4015 | help='marks CL as ready and sends comment to reviewers') |
Andrii Shyshkalov | 0d6b46e | 2017-03-17 22:23:22 +0100 | [diff] [blame] | 4016 | parser.add_option('-i', '--issue', dest='issue', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4017 | help='review issue id (defaults to current issue).') |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 4018 | parser.add_option('-m', '--machine-readable', dest='readable', |
| 4019 | action='store_false', default=True, |
| 4020 | help='output comments in a format compatible with ' |
| 4021 | 'editor parsing') |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 4022 | parser.add_option('-j', '--json-file', |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4023 | help='File to write JSON summary to, or "-" for stdout') |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4024 | options, args = parser.parse_args(args) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4025 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4026 | issue = None |
| 4027 | if options.issue: |
| 4028 | try: |
| 4029 | issue = int(options.issue) |
| 4030 | except ValueError: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4031 | DieWithError('A review issue ID is expected to be a number.') |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4032 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4033 | cl = Changelist(issue=issue) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4034 | |
| 4035 | if options.comment: |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 4036 | cl.AddComment(options.comment, options.publish) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4037 | return 0 |
| 4038 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 4039 | summary = sorted(cl.GetCommentsSummary(readable=options.readable), |
| 4040 | key=lambda c: c.date) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4041 | for comment in summary: |
| 4042 | if comment.disapproval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4043 | color = Fore.RED |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4044 | elif comment.approval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4045 | color = Fore.GREEN |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4046 | elif comment.sender == cl.GetIssueOwner(): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4047 | color = Fore.MAGENTA |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 4048 | elif comment.autogenerated: |
| 4049 | color = Fore.CYAN |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4050 | else: |
| 4051 | color = Fore.BLUE |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4052 | print('\n%s%s %s%s\n%s' % ( |
| 4053 | color, |
| 4054 | comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'), |
| 4055 | comment.sender, |
| 4056 | Fore.RESET, |
| 4057 | '\n'.join(' ' + l for l in comment.message.strip().splitlines()))) |
| 4058 | |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 4059 | if options.json_file: |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4060 | def pre_serialize(c): |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4061 | dct = c._asdict().copy() |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4062 | dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f') |
| 4063 | return dct |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4064 | write_json(options.json_file, [pre_serialize(x) for x in summary]) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4065 | return 0 |
| 4066 | |
| 4067 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4068 | @subcommand.usage('[codereview url or issue id]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4069 | @metrics.collector.collect_metrics('git cl description') |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4070 | def CMDdescription(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4071 | """Brings up the editor for the current CL's description.""" |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4072 | parser.add_option('-d', '--display', action='store_true', |
| 4073 | help='Display the description instead of opening an editor') |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4074 | parser.add_option('-n', '--new-description', |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4075 | help='New description to set for this issue (- for stdin, ' |
| 4076 | '+ to load from local commit HEAD)') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4077 | parser.add_option('-f', '--force', action='store_true', |
| 4078 | help='Delete any unpublished Gerrit edits for this issue ' |
| 4079 | 'without prompting') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4080 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4081 | options, args = parser.parse_args(args) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4082 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4083 | target_issue_arg = None |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4084 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4085 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4086 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4087 | parser.error('Invalid issue ID or URL.') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4088 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4089 | kwargs = {} |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4090 | if target_issue_arg: |
| 4091 | kwargs['issue'] = target_issue_arg.issue |
| 4092 | kwargs['codereview_host'] = target_issue_arg.hostname |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 4093 | |
| 4094 | cl = Changelist(**kwargs) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4095 | if not cl.GetIssue(): |
| 4096 | DieWithError('This branch has no associated changelist.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4097 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4098 | if args and not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4099 | logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4100 | |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4101 | description = ChangeDescription(cl.GetDescription()) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4102 | |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4103 | if options.display: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4104 | print(description.description) |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4105 | return 0 |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4106 | |
| 4107 | if options.new_description: |
| 4108 | text = options.new_description |
| 4109 | if text == '-': |
| 4110 | text = '\n'.join(l.rstrip() for l in sys.stdin) |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4111 | elif text == '+': |
| 4112 | base_branch = cl.GetCommonAncestorWithUpstream() |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 4113 | text = cl.GetLocalDescription(base_branch) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4114 | |
| 4115 | description.set_description(text) |
| 4116 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4117 | description.prompt() |
Andrii Shyshkalov | 680253d | 2017-03-15 21:07:36 +0100 | [diff] [blame] | 4118 | if cl.GetDescription().strip() != description.description: |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4119 | cl.UpdateDescription(description.description, force=options.force) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4120 | return 0 |
| 4121 | |
| 4122 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4123 | @metrics.collector.collect_metrics('git cl lint') |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4124 | def CMDlint(parser, args): |
| 4125 | """Runs cpplint on the current changelist.""" |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4126 | parser.add_option('--filter', action='append', metavar='-x,+y', |
| 4127 | help='Comma-separated list of cpplint\'s category-filters') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4128 | options, args = parser.parse_args(args) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4129 | |
| 4130 | # Access to a protected member _XX of a client class |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 4131 | # pylint: disable=protected-access |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4132 | try: |
| 4133 | import cpplint |
| 4134 | import cpplint_chromium |
| 4135 | except ImportError: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4136 | print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.') |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4137 | return 1 |
| 4138 | |
| 4139 | # Change the current working directory before calling lint so that it |
| 4140 | # shows the correct base. |
| 4141 | previous_cwd = os.getcwd() |
| 4142 | os.chdir(settings.GetRoot()) |
| 4143 | try: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4144 | cl = Changelist() |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 4145 | change = cl.GetChange(cl.GetCommonAncestorWithUpstream()) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4146 | files = [f.LocalPath() for f in change.AffectedFiles()] |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4147 | if not files: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4148 | print('Cannot lint an empty CL') |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4149 | return 1 |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4150 | |
| 4151 | # Process cpplints arguments if any. |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4152 | command = args + files |
| 4153 | if options.filter: |
| 4154 | command = ['--filter=' + ','.join(options.filter)] + command |
| 4155 | filenames = cpplint.ParseArguments(command) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4156 | |
| 4157 | white_regex = re.compile(settings.GetLintRegex()) |
| 4158 | black_regex = re.compile(settings.GetLintIgnoreRegex()) |
| 4159 | extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace] |
| 4160 | for filename in filenames: |
| 4161 | if white_regex.match(filename): |
| 4162 | if black_regex.match(filename): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4163 | print('Ignoring file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4164 | else: |
| 4165 | cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level, |
| 4166 | extra_check_functions) |
| 4167 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4168 | print('Skipping file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4169 | finally: |
| 4170 | os.chdir(previous_cwd) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4171 | print('Total errors found: %d\n' % cpplint._cpplint_state.error_count) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4172 | if cpplint._cpplint_state.error_count != 0: |
| 4173 | return 1 |
| 4174 | return 0 |
| 4175 | |
| 4176 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4177 | @metrics.collector.collect_metrics('git cl presubmit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4178 | def CMDpresubmit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4179 | """Runs presubmit tests on the current changelist.""" |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4180 | parser.add_option('-u', '--upload', action='store_true', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4181 | help='Run upload hook instead of the push hook') |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4182 | parser.add_option('-f', '--force', action='store_true', |
sbc@chromium.org | 495ad15 | 2012-09-04 23:07:42 +0000 | [diff] [blame] | 4183 | help='Run checks even if tree is dirty') |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4184 | parser.add_option('--all', action='store_true', |
| 4185 | help='Run checks against all files, not just modified ones') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4186 | parser.add_option('--parallel', action='store_true', |
| 4187 | help='Run all tests specified by input_api.RunTests in all ' |
| 4188 | 'PRESUBMIT files in parallel.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4189 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4190 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4191 | if not options.force and git_common.is_dirty_git_tree('presubmit'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4192 | print('use --force to check even if tree is dirty.') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4193 | return 1 |
| 4194 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4195 | cl = Changelist() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4196 | if args: |
| 4197 | base_branch = args[0] |
| 4198 | else: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 4199 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4200 | base_branch = cl.GetCommonAncestorWithUpstream() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4201 | |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4202 | if options.all: |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 4203 | base_change = cl.GetChange(base_branch) |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4204 | files = [('M', f) for f in base_change.AllFiles()] |
| 4205 | change = presubmit_support.GitChange( |
| 4206 | base_change.Name(), |
| 4207 | base_change.FullDescriptionText(), |
| 4208 | base_change.RepositoryRoot(), |
| 4209 | files, |
| 4210 | base_change.issue, |
| 4211 | base_change.patchset, |
| 4212 | base_change.author_email, |
| 4213 | base_change._upstream) |
| 4214 | else: |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 4215 | change = cl.GetChange(base_branch) |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4216 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 4217 | cl.RunHook( |
| 4218 | committing=not options.upload, |
| 4219 | may_prompt=False, |
| 4220 | verbose=options.verbose, |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4221 | change=change, |
| 4222 | parallel=options.parallel) |
dpranke@chromium.org | 0a2bb37 | 2011-03-25 01:16:22 +0000 | [diff] [blame] | 4223 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4224 | |
| 4225 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4226 | def GenerateGerritChangeId(message): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4227 | """Returns the Change ID footer value (Ixxxxxx...xxx). |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4228 | |
| 4229 | Works the same way as |
| 4230 | https://gerrit-review.googlesource.com/tools/hooks/commit-msg |
| 4231 | but can be called on demand on all platforms. |
| 4232 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4233 | The basic idea is to generate git hash of a state of the tree, original |
| 4234 | commit message, author/committer info and timestamps. |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4235 | """ |
| 4236 | lines = [] |
| 4237 | tree_hash = RunGitSilent(['write-tree']) |
| 4238 | lines.append('tree %s' % tree_hash.strip()) |
| 4239 | code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False) |
| 4240 | if code == 0: |
| 4241 | lines.append('parent %s' % parent.strip()) |
| 4242 | author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT']) |
| 4243 | lines.append('author %s' % author.strip()) |
| 4244 | committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT']) |
| 4245 | lines.append('committer %s' % committer.strip()) |
| 4246 | lines.append('') |
| 4247 | # Note: Gerrit's commit-hook actually cleans message of some lines and |
| 4248 | # whitespace. This code is not doing this, but it clearly won't decrease |
| 4249 | # entropy. |
| 4250 | lines.append(message) |
| 4251 | change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'], |
Raul Tambre | b946b23 | 2019-03-26 14:48:46 +0000 | [diff] [blame] | 4252 | stdin=('\n'.join(lines)).encode()) |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4253 | return 'I%s' % change_hash.strip() |
| 4254 | |
| 4255 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 4256 | def GetTargetRef(remote, remote_branch, target_branch): |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4257 | """Computes the remote branch ref to use for the CL. |
| 4258 | |
| 4259 | Args: |
| 4260 | remote (str): The git remote for the CL. |
| 4261 | remote_branch (str): The git remote branch for the CL. |
| 4262 | target_branch (str): The target branch specified by the user. |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4263 | """ |
| 4264 | if not (remote and remote_branch): |
| 4265 | return None |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4266 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4267 | if target_branch: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 4268 | # Canonicalize branch references to the equivalent local full symbolic |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4269 | # refs, which are then translated into the remote full symbolic refs |
| 4270 | # below. |
| 4271 | if '/' not in target_branch: |
| 4272 | remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch) |
| 4273 | else: |
| 4274 | prefix_replacements = ( |
| 4275 | ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'), |
| 4276 | ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote), |
| 4277 | ('^(refs/)?heads/', 'refs/remotes/%s/' % remote), |
| 4278 | ) |
| 4279 | match = None |
| 4280 | for regex, replacement in prefix_replacements: |
| 4281 | match = re.search(regex, target_branch) |
| 4282 | if match: |
| 4283 | remote_branch = target_branch.replace(match.group(0), replacement) |
| 4284 | break |
| 4285 | if not match: |
| 4286 | # This is a branch path but not one we recognize; use as-is. |
| 4287 | remote_branch = target_branch |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 4288 | elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS: |
| 4289 | # Handle the refs that need to land in different refs. |
| 4290 | remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4291 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4292 | # Create the true path to the remote branch. |
| 4293 | # Does the following translation: |
| 4294 | # * refs/remotes/origin/refs/diff/test -> refs/diff/test |
| 4295 | # * refs/remotes/origin/master -> refs/heads/master |
| 4296 | # * refs/remotes/branch-heads/test -> refs/branch-heads/test |
| 4297 | if remote_branch.startswith('refs/remotes/%s/refs/' % remote): |
| 4298 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '') |
| 4299 | elif remote_branch.startswith('refs/remotes/%s/' % remote): |
| 4300 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, |
| 4301 | 'refs/heads/') |
| 4302 | elif remote_branch.startswith('refs/remotes/branch-heads'): |
| 4303 | remote_branch = remote_branch.replace('refs/remotes/', 'refs/') |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 4304 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4305 | return remote_branch |
| 4306 | |
| 4307 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4308 | def cleanup_list(l): |
| 4309 | """Fixes a list so that comma separated items are put as individual items. |
| 4310 | |
| 4311 | So that "--reviewers joe@c,john@c --reviewers joa@c" results in |
| 4312 | options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']). |
| 4313 | """ |
| 4314 | items = sum((i.split(',') for i in l), []) |
| 4315 | stripped_items = (i.strip() for i in items) |
| 4316 | return sorted(filter(None, stripped_items)) |
| 4317 | |
| 4318 | |
Aaron Gable | 4db38df | 2017-11-03 14:59:07 -0700 | [diff] [blame] | 4319 | @subcommand.usage('[flags]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4320 | @metrics.collector.collect_metrics('git cl upload') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4321 | def CMDupload(parser, args): |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4322 | """Uploads the current changelist to codereview. |
| 4323 | |
| 4324 | Can skip dependency patchset uploads for a branch by running: |
| 4325 | git config branch.branch_name.skip-deps-uploads True |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4326 | To unset, run: |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4327 | git config --unset branch.branch_name.skip-deps-uploads |
| 4328 | Can also set the above globally by using the --global flag. |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 4329 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4330 | If the name of the checked out branch starts with "bug-" or "fix-" followed |
| 4331 | by a bug number, this bug number is automatically populated in the CL |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 4332 | description. |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4333 | |
| 4334 | If subject contains text in square brackets or has "<text>: " prefix, such |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4335 | text(s) is treated as Gerrit hashtags. For example, CLs with subjects: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4336 | [git-cl] add support for hashtags |
| 4337 | Foo bar: implement foo |
| 4338 | will be hashtagged with "git-cl" and "foo-bar" respectively. |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4339 | """ |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4340 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4341 | help='bypass upload presubmit hook') |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 4342 | parser.add_option('--bypass-watchlists', action='store_true', |
| 4343 | dest='bypass_watchlists', |
| 4344 | help='bypass watchlists auto CC-ing reviewers') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4345 | parser.add_option('-f', '--force', action='store_true', dest='force', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4346 | help="force yes to questions (don't prompt)") |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4347 | parser.add_option('--message', '-m', dest='message', |
| 4348 | help='message for patchset') |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 4349 | parser.add_option('-b', '--bug', |
| 4350 | help='pre-populate the bug number(s) for this issue. ' |
| 4351 | 'If several, separate with commas') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4352 | parser.add_option('--message-file', dest='message_file', |
| 4353 | help='file which contains message for patchset') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4354 | parser.add_option('--title', '-t', dest='title', |
| 4355 | help='title for patchset') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4356 | parser.add_option('-r', '--reviewers', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4357 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4358 | help='reviewer email addresses') |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 4359 | parser.add_option('--tbrs', |
| 4360 | action='append', default=[], |
| 4361 | help='TBR email addresses') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4362 | parser.add_option('--cc', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4363 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4364 | help='cc email addresses') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4365 | parser.add_option('--hashtag', dest='hashtags', |
| 4366 | action='append', default=[], |
| 4367 | help=('Gerrit hashtag for new CL; ' |
| 4368 | 'can be applied multiple times')) |
adamk@chromium.org | 36f4730 | 2013-04-05 01:08:31 +0000 | [diff] [blame] | 4369 | parser.add_option('-s', '--send-mail', action='store_true', |
Aaron Gable | 59f4851 | 2017-01-12 10:54:46 -0800 | [diff] [blame] | 4370 | help='send email to reviewer(s) and cc(s) immediately') |
ukai@chromium.org | 8ef7ab2 | 2012-11-28 04:24:52 +0000 | [diff] [blame] | 4371 | parser.add_option('--target_branch', |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 4372 | '--target-branch', |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4373 | metavar='TARGET', |
| 4374 | help='Apply CL to remote ref TARGET. ' + |
| 4375 | 'Default: remote branch head, or master') |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4376 | parser.add_option('--squash', action='store_true', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4377 | help='Squash multiple commits into one') |
Mike Frysinger | a989d55 | 2019-08-14 20:51:23 +0000 | [diff] [blame] | 4378 | parser.add_option('--no-squash', action='store_false', dest='squash', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4379 | help='Don\'t squash multiple commits into one') |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 4380 | parser.add_option('--topic', default=None, |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4381 | help='Topic to specify when uploading') |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 4382 | parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const', |
| 4383 | const='TBR', help='add a set of OWNERS to TBR') |
| 4384 | parser.add_option('--r-owners', dest='add_owners_to', action='store_const', |
| 4385 | const='R', help='add a set of OWNERS to R') |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4386 | parser.add_option('-c', '--use-commit-queue', action='store_true', |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4387 | default=False, |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4388 | help='tell the CQ to commit this patchset; ' |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4389 | 'implies --send-mail') |
| 4390 | parser.add_option('-d', '--cq-dry-run', |
| 4391 | action='store_true', default=False, |
rmistry@google.com | ef96622 | 2015-04-07 11:15:01 +0000 | [diff] [blame] | 4392 | help='Send the patchset to do a CQ dry run right after ' |
| 4393 | 'upload.') |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 4394 | parser.add_option('--preserve-tryjobs', action='store_true', |
| 4395 | help='instruct the CQ to let tryjobs running even after ' |
| 4396 | 'new patchsets are uploaded instead of canceling ' |
| 4397 | 'prior patchset\' tryjobs') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4398 | parser.add_option('--dependencies', action='store_true', |
| 4399 | help='Uploads CLs of all the local branches that depend on ' |
| 4400 | 'the current branch') |
Ravi Mistry | 31e7d56 | 2018-04-02 12:53:57 -0400 | [diff] [blame] | 4401 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4402 | help='Sends your change to the CQ after an approval. Only ' |
| 4403 | 'works on repos that have the Auto-Submit label ' |
| 4404 | 'enabled') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4405 | parser.add_option('--parallel', action='store_true', |
| 4406 | help='Run all tests specified by input_api.RunTests in all ' |
| 4407 | 'PRESUBMIT files in parallel.') |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4408 | parser.add_option('--no-autocc', action='store_true', |
| 4409 | help='Disables automatic addition of CC emails') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4410 | parser.add_option('--private', action='store_true', |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4411 | help='Set the review private. This implies --no-autocc.') |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4412 | parser.add_option('-R', '--retry-failed', action='store_true', |
| 4413 | help='Retry failed tryjobs from old patchset immediately ' |
| 4414 | 'after uploading new patchset. Cannot be used with ' |
| 4415 | '--use-commit-queue or --cq-dry-run.') |
| 4416 | parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4417 | help='Host of buildbucket. The default host is %default.') |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 4418 | parser.add_option('--fixed', '-x', |
| 4419 | help='List of bugs that will be commented on and marked ' |
| 4420 | 'fixed (pre-populates "Fixed:" tag). Same format as ' |
| 4421 | '-b option / "Bug:" tag. If fixing several issues, ' |
| 4422 | 'separate with commas.') |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 4423 | parser.add_option('--edit-description', action='store_true', default=False, |
| 4424 | help='Modify description before upload. Cannot be used ' |
| 4425 | 'with --force. It is a noop when --no-squash is set ' |
| 4426 | 'or a new commit is created.') |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4427 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4428 | orig_args = args |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4429 | (options, args) = parser.parse_args(args) |
| 4430 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4431 | if git_common.is_dirty_git_tree('upload'): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4432 | return 1 |
| 4433 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4434 | options.reviewers = cleanup_list(options.reviewers) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 4435 | options.tbrs = cleanup_list(options.tbrs) |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4436 | options.cc = cleanup_list(options.cc) |
| 4437 | |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 4438 | if options.edit_description and options.force: |
| 4439 | parser.error('Only one of --force and --edit-description allowed') |
| 4440 | |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4441 | if options.message_file: |
| 4442 | if options.message: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4443 | parser.error('Only one of --message and --message-file allowed.') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4444 | options.message = gclient_utils.FileRead(options.message_file) |
| 4445 | options.message_file = None |
| 4446 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4447 | if ([options.cq_dry_run, |
| 4448 | options.use_commit_queue, |
| 4449 | options.retry_failed].count(True) > 1): |
| 4450 | parser.error('Only one of --use-commit-queue, --cq-dry-run, or ' |
| 4451 | '--retry-failed is allowed.') |
tandrii | 4d0545a | 2016-07-06 03:56:49 -0700 | [diff] [blame] | 4452 | |
Aaron Gable | edbc413 | 2017-09-11 13:22:28 -0700 | [diff] [blame] | 4453 | if options.use_commit_queue: |
| 4454 | options.send_mail = True |
| 4455 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 4456 | # For sanity of test expectations, do this otherwise lazy-loading *now*. |
| 4457 | settings.GetIsGerrit() |
| 4458 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4459 | cl = Changelist() |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4460 | if options.retry_failed and not cl.GetIssue(): |
| 4461 | print('No previous patchsets, so --retry-failed has no effect.') |
| 4462 | options.retry_failed = False |
| 4463 | # cl.GetMostRecentPatchset uses cached information, and can return the last |
| 4464 | # patchset before upload. Calling it here makes it clear that it's the |
| 4465 | # last patchset before upload. Note that GetMostRecentPatchset will fail |
| 4466 | # if no CL has been uploaded yet. |
| 4467 | if options.retry_failed: |
| 4468 | patchset = cl.GetMostRecentPatchset() |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 4469 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4470 | ret = cl.CMDUpload(options, args, orig_args) |
| 4471 | |
| 4472 | if options.retry_failed: |
| 4473 | if ret != 0: |
| 4474 | print('Upload failed, so --retry-failed has no effect.') |
| 4475 | return ret |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 4476 | builds, _ = _fetch_latest_builds( |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4477 | cl, options.buildbucket_host, latest_patchset=patchset) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 4478 | buckets = _filter_failed_for_retry(builds) |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4479 | if len(buckets) == 0: |
| 4480 | print('No failed tryjobs, so --retry-failed has no effect.') |
| 4481 | return ret |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4482 | _trigger_try_jobs(cl, buckets, options, patchset + 1) |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4483 | |
| 4484 | return ret |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4485 | |
| 4486 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4487 | @subcommand.usage('--description=<description file>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4488 | @metrics.collector.collect_metrics('git cl split') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4489 | def CMDsplit(parser, args): |
| 4490 | """Splits a branch into smaller branches and uploads CLs. |
| 4491 | |
| 4492 | Creates a branch and uploads a CL for each group of files modified in the |
| 4493 | current branch that share a common OWNERS file. In the CL description and |
Yannic Bonenberger | 6840963 | 2020-01-23 18:29:01 +0000 | [diff] [blame] | 4494 | comment, '$directory' is replaced with the directory containing the changes |
| 4495 | in this CL, '$cl_index' is replaced with the index of the CL we're currently |
| 4496 | sending out, and '$num_cls' is replaced with the total number of CLs that |
| 4497 | we're sending out in this split. |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4498 | """ |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4499 | parser.add_option('-d', '--description', dest='description_file', |
| 4500 | help='A text file containing a CL description in which ' |
| 4501 | '$directory will be replaced by each CL\'s directory.') |
| 4502 | parser.add_option('-c', '--comment', dest='comment_file', |
| 4503 | help='A text file containing a CL comment.') |
| 4504 | parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true', |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 4505 | default=False, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4506 | help='List the files and reviewers for each CL that would ' |
| 4507 | 'be created, but don\'t create branches or CLs.') |
| 4508 | parser.add_option('--cq-dry-run', action='store_true', |
| 4509 | help='If set, will do a cq dry run for each uploaded CL. ' |
| 4510 | 'Please be careful when doing this; more than ~10 CLs ' |
| 4511 | 'has the potential to overload our build ' |
| 4512 | 'infrastructure. Try to upload these not during high ' |
| 4513 | 'load times (usually 11-3 Mountain View time). Email ' |
| 4514 | 'infra-dev@chromium.org with any questions.') |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 4515 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4516 | default=True, |
| 4517 | help='Sends your change to the CQ after an approval. Only ' |
| 4518 | 'works on repos that have the Auto-Submit label ' |
| 4519 | 'enabled') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4520 | options, _ = parser.parse_args(args) |
| 4521 | |
| 4522 | if not options.description_file: |
| 4523 | parser.error('No --description flag specified.') |
| 4524 | |
| 4525 | def WrappedCMDupload(args): |
| 4526 | return CMDupload(OptionParser(), args) |
| 4527 | |
| 4528 | return split_cl.SplitCl(options.description_file, options.comment_file, |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 4529 | Changelist, WrappedCMDupload, options.dry_run, |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 4530 | options.cq_dry_run, options.enable_auto_submit) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4531 | |
| 4532 | |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4533 | @subcommand.usage('DEPRECATED') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4534 | @metrics.collector.collect_metrics('git cl commit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4535 | def CMDdcommit(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4536 | """DEPRECATED: Used to commit the current changelist via git-svn.""" |
| 4537 | message = ('git-cl no longer supports committing to SVN repositories via ' |
| 4538 | 'git-svn. You probably want to use `git cl land` instead.') |
| 4539 | print(message) |
| 4540 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4541 | |
| 4542 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4543 | @subcommand.usage('[upstream branch to apply against]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4544 | @metrics.collector.collect_metrics('git cl land') |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 4545 | def CMDland(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4546 | """Commits the current changelist via git. |
| 4547 | |
| 4548 | In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes |
| 4549 | upstream and closes the issue automatically and atomically. |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4550 | """ |
| 4551 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4552 | help='bypass upload presubmit hook') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4553 | parser.add_option('-f', '--force', action='store_true', dest='force', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4554 | help="force yes to questions (don't prompt)") |
Edward Lesmes | 67b3faa | 2018-04-13 17:50:52 -0400 | [diff] [blame] | 4555 | parser.add_option('--parallel', action='store_true', |
| 4556 | help='Run all tests specified by input_api.RunTests in all ' |
| 4557 | 'PRESUBMIT files in parallel.') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4558 | (options, args) = parser.parse_args(args) |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4559 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4560 | cl = Changelist() |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4561 | |
Robert Iannucci | 2e73d43 | 2018-03-14 01:10:47 -0700 | [diff] [blame] | 4562 | if not cl.GetIssue(): |
| 4563 | DieWithError('You must upload the change first to Gerrit.\n' |
| 4564 | ' If you would rather have `git cl land` upload ' |
| 4565 | 'automatically for you, see http://crbug.com/642759') |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 4566 | return cl.CMDLand(options.force, options.bypass_hooks, |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 4567 | options.verbose, options.parallel) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4568 | |
| 4569 | |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4570 | @subcommand.usage('<patch url or issue id or issue url>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4571 | @metrics.collector.collect_metrics('git cl patch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4572 | def CMDpatch(parser, args): |
marq@chromium.org | e5e5900 | 2013-10-02 23:21:25 +0000 | [diff] [blame] | 4573 | """Patches in a code review.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4574 | parser.add_option('-b', dest='newbranch', |
| 4575 | help='create a new branch off trunk for the patch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4576 | parser.add_option('-f', '--force', action='store_true', |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 4577 | help='overwrite state on the current or chosen branch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4578 | parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4579 | help='don\'t commit after patch applies.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4580 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4581 | group = optparse.OptionGroup( |
| 4582 | parser, |
| 4583 | 'Options for continuing work on the current issue uploaded from a ' |
| 4584 | 'different clone (e.g. different machine). Must be used independently ' |
| 4585 | 'from the other options. No issue number should be specified, and the ' |
| 4586 | 'branch must have an issue number associated with it') |
| 4587 | group.add_option('--reapply', action='store_true', dest='reapply', |
| 4588 | help='Reset the branch and reapply the issue.\n' |
| 4589 | 'CAUTION: This will undo any local changes in this ' |
| 4590 | 'branch') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4591 | |
| 4592 | group.add_option('--pull', action='store_true', dest='pull', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4593 | help='Performs a pull before reapplying.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4594 | parser.add_option_group(group) |
| 4595 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4596 | (options, args) = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4597 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4598 | if options.reapply: |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4599 | if options.newbranch: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4600 | parser.error('--reapply works on the current branch only.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4601 | if len(args) > 0: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4602 | parser.error('--reapply implies no additional arguments.') |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4603 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4604 | cl = Changelist() |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4605 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4606 | parser.error('Current branch must have an associated issue.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4607 | |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4608 | upstream = cl.GetUpstreamBranch() |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4609 | if upstream is None: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4610 | parser.error('No upstream branch specified. Cannot reset branch.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4611 | |
| 4612 | RunGit(['reset', '--hard', upstream]) |
| 4613 | if options.pull: |
| 4614 | RunGit(['pull']) |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4615 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4616 | target_issue_arg = ParseIssueNumberArgument(cl.GetIssue()) |
| 4617 | return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4618 | |
| 4619 | if len(args) != 1 or not args[0]: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4620 | parser.error('Must specify issue number or URL.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4621 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4622 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4623 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4624 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4625 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4626 | # We don't want uncommitted changes mixed up with the patch. |
| 4627 | if git_common.is_dirty_git_tree('patch'): |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4628 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4629 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4630 | if options.newbranch: |
| 4631 | if options.force: |
| 4632 | RunGit(['branch', '-D', options.newbranch], |
| 4633 | stderr=subprocess2.PIPE, error_ok=True) |
| 4634 | RunGit(['new-branch', options.newbranch]) |
| 4635 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4636 | cl = Changelist( |
| 4637 | codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4638 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4639 | if not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4640 | print('canonical issue/change URL: %s\n' % cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4641 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4642 | return cl.CMDPatchWithParsedIssue( |
| 4643 | target_issue_arg, options.nocommit, options.force) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4644 | |
| 4645 | |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4646 | def GetTreeStatus(url=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4647 | """Fetches the tree status and returns either 'open', 'closed', |
| 4648 | 'unknown' or 'unset'.""" |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4649 | url = url or settings.GetTreeStatusUrl(error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4650 | if url: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4651 | status = urllib.request.urlopen(url).read().lower() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4652 | if status.find('closed') != -1 or status == '0': |
| 4653 | return 'closed' |
| 4654 | elif status.find('open') != -1 or status == '1': |
| 4655 | return 'open' |
| 4656 | return 'unknown' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4657 | return 'unset' |
| 4658 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4659 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4660 | def GetTreeStatusReason(): |
| 4661 | """Fetches the tree status from a json url and returns the message |
| 4662 | with the reason for the tree to be opened or closed.""" |
msb@chromium.org | bf1a7ba | 2011-02-01 16:21:46 +0000 | [diff] [blame] | 4663 | url = settings.GetTreeStatusUrl() |
| 4664 | json_url = urlparse.urljoin(url, '/current?format=json') |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4665 | connection = urllib.request.urlopen(json_url) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4666 | status = json.loads(connection.read()) |
| 4667 | connection.close() |
| 4668 | return status['message'] |
| 4669 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4670 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4671 | @metrics.collector.collect_metrics('git cl tree') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4672 | def CMDtree(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4673 | """Shows the status of the tree.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4674 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4675 | status = GetTreeStatus() |
| 4676 | if 'unset' == status: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4677 | print('You must configure your tree status URL by running "git cl config".') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4678 | return 2 |
| 4679 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4680 | print('The tree is %s' % status) |
| 4681 | print() |
| 4682 | print(GetTreeStatusReason()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4683 | if status != 'open': |
| 4684 | return 1 |
| 4685 | return 0 |
| 4686 | |
| 4687 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4688 | @metrics.collector.collect_metrics('git cl try') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4689 | def CMDtry(parser, args): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4690 | """Triggers tryjobs using either Buildbucket or CQ dry run.""" |
| 4691 | group = optparse.OptionGroup(parser, 'Tryjob options') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4692 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4693 | '-b', '--bot', action='append', |
| 4694 | help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple ' |
| 4695 | 'times to specify multiple builders. ex: ' |
| 4696 | '"-b win_rel -b win_layout". See ' |
| 4697 | 'the try server waterfall for the builders name and the tests ' |
| 4698 | 'available.')) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4699 | group.add_option( |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4700 | '-B', '--bucket', default='', |
| 4701 | help=('Buildbucket bucket to send the try requests.')) |
| 4702 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4703 | '-r', '--revision', |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4704 | help='Revision to use for the tryjob; default: the revision will ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4705 | 'be determined by the try recipe that builder runs, which usually ' |
| 4706 | 'defaults to HEAD of origin/master') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4707 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4708 | '-c', '--clobber', action='store_true', default=False, |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4709 | help='Force a clobber before building; that is don\'t do an ' |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4710 | 'incremental build') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4711 | group.add_option( |
Andrii Shyshkalov | f9648b5 | 2018-02-21 22:32:42 -0800 | [diff] [blame] | 4712 | '--category', default='git_cl_try', help='Specify custom build category.') |
| 4713 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4714 | '--project', |
| 4715 | help='Override which project to use. Projects are defined ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4716 | 'in recipe to determine to which repository or directory to ' |
| 4717 | 'apply the patch') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4718 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4719 | '-p', '--property', dest='properties', action='append', default=[], |
| 4720 | help='Specify generic properties in the form -p key1=value1 -p ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4721 | 'key2=value2 etc. The value will be treated as ' |
| 4722 | 'json if decodable, or as string otherwise. ' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4723 | 'NOTE: using this may make your tryjob not usable for CQ, ' |
| 4724 | 'which will then schedule another tryjob with default properties') |
sheyang@chromium.org | db37557 | 2015-08-17 19:22:23 +0000 | [diff] [blame] | 4725 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4726 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4727 | help='Host of buildbucket. The default host is %default.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4728 | parser.add_option_group(group) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4729 | parser.add_option( |
| 4730 | '-R', '--retry-failed', action='store_true', default=False, |
| 4731 | help='Retry failed jobs from the latest set of tryjobs. ' |
| 4732 | 'Not allowed with --bucket and --bot options.') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 4733 | parser.add_option( |
| 4734 | '-i', '--issue', type=int, |
| 4735 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 4736 | 'issue.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4737 | options, args = parser.parse_args(args) |
| 4738 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 4739 | # Make sure that all properties are prop=value pairs. |
| 4740 | bad_params = [x for x in options.properties if '=' not in x] |
| 4741 | if bad_params: |
| 4742 | parser.error('Got properties with missing "=": %s' % bad_params) |
| 4743 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4744 | if args: |
| 4745 | parser.error('Unknown arguments: %s' % args) |
| 4746 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4747 | cl = Changelist(issue=options.issue) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4748 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4749 | parser.error('Need to upload first.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4750 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4751 | # HACK: warm up Gerrit change detail cache to save on RPCs. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 4752 | cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS']) |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 4753 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 4754 | error_message = cl.CannotTriggerTryJobReason() |
| 4755 | if error_message: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4756 | parser.error('Can\'t trigger tryjobs: %s' % error_message) |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 4757 | |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4758 | if options.retry_failed: |
| 4759 | if options.bot or options.bucket: |
| 4760 | print('ERROR: The option --retry-failed is not compatible with ' |
| 4761 | '-B, -b, --bucket, or --bot.', file=sys.stderr) |
| 4762 | return 1 |
| 4763 | print('Searching for failed tryjobs...') |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4764 | builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4765 | if options.verbose: |
| 4766 | print('Got %d builds in patchset #%d' % (len(builds), patchset)) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 4767 | buckets = _filter_failed_for_retry(builds) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4768 | if not buckets: |
| 4769 | print('There are no failed jobs in the latest set of jobs ' |
| 4770 | '(patchset #%d), doing nothing.' % patchset) |
| 4771 | return 0 |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 4772 | num_builders = sum(map(len, buckets.values())) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4773 | if num_builders > 10: |
| 4774 | confirm_or_exit('There are %d builders with failed builds.' |
| 4775 | % num_builders, action='continue') |
| 4776 | else: |
| 4777 | buckets = _get_bucket_map(cl, options, parser) |
| 4778 | if buckets and any(b.startswith('master.') for b in buckets): |
| 4779 | print('ERROR: Buildbot masters are not supported.') |
| 4780 | return 1 |
phajdan.jr@chromium.org | 8da7f27 | 2014-03-14 01:28:39 +0000 | [diff] [blame] | 4781 | |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 4782 | # If no bots are listed and we couldn't get a list based on PRESUBMIT files, |
| 4783 | # then we default to triggering a CQ dry run (see http://crbug.com/625697). |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4784 | if not buckets: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4785 | if options.verbose: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 4786 | print('git cl try with no bots now defaults to CQ dry run.') |
| 4787 | print('Scheduling CQ dry run on: %s' % cl.GetIssueURL()) |
| 4788 | return cl.SetCQState(_CQState.DRY_RUN) |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 4789 | |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 4790 | for builders in buckets.values(): |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4791 | if any('triggered' in b for b in builders): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4792 | print('ERROR You are trying to send a job to a triggered bot. This type ' |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 4793 | 'of bot requires an initial job from a parent (usually a builder). ' |
| 4794 | 'Instead send your job to the parent.\n' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4795 | 'Bot list: %s' % builders, file=sys.stderr) |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4796 | return 1 |
ilevy@chromium.org | f3b2123 | 2012-09-24 20:48:55 +0000 | [diff] [blame] | 4797 | |
ilevy@chromium.org | 36e420b | 2013-08-06 23:21:12 +0000 | [diff] [blame] | 4798 | patchset = cl.GetMostRecentPatchset() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 4799 | try: |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4800 | _trigger_try_jobs(cl, buckets, options, patchset) |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 4801 | except BuildbucketResponseException as ex: |
| 4802 | print('ERROR: %s' % ex) |
| 4803 | return 1 |
| 4804 | return 0 |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4805 | |
| 4806 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4807 | @metrics.collector.collect_metrics('git cl try-results') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4808 | def CMDtry_results(parser, args): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 4809 | """Prints info about results for tryjobs associated with the current CL.""" |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4810 | group = optparse.OptionGroup(parser, 'Tryjob results options') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4811 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4812 | '-p', '--patchset', type=int, help='patchset number if not current.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4813 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4814 | '--print-master', action='store_true', help='print master name as well.') |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 4815 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4816 | '--color', action='store_true', default=setup_color.IS_TTY, |
| 4817 | help='force color output, useful when piping output.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4818 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4819 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4820 | help='Host of buildbucket. The default host is %default.') |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4821 | group.add_option( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4822 | '--json', help=('Path of JSON output file to write tryjob results to,' |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4823 | 'or "-" for stdout.')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4824 | parser.add_option_group(group) |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 4825 | parser.add_option( |
| 4826 | '-i', '--issue', type=int, |
| 4827 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 4828 | 'issue.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4829 | options, args = parser.parse_args(args) |
| 4830 | if args: |
| 4831 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4832 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4833 | cl = Changelist(issue=options.issue) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4834 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4835 | parser.error('Need to upload first.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4836 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4837 | patchset = options.patchset |
| 4838 | if not patchset: |
| 4839 | patchset = cl.GetMostRecentPatchset() |
| 4840 | if not patchset: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4841 | parser.error('Code review host doesn\'t know about issue %s. ' |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4842 | 'No access to issue or wrong issue number?\n' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4843 | 'Either upload first, or pass --patchset explicitly.' % |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4844 | cl.GetIssue()) |
| 4845 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4846 | try: |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4847 | jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4848 | except BuildbucketResponseException as ex: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4849 | print('Buildbucket error: %s' % ex) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4850 | return 1 |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4851 | if options.json: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 4852 | write_json(options.json, jobs) |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4853 | else: |
| 4854 | print_try_jobs(options, jobs) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4855 | return 0 |
| 4856 | |
| 4857 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4858 | @subcommand.usage('[new upstream branch]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4859 | @metrics.collector.collect_metrics('git cl upstream') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4860 | def CMDupstream(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4861 | """Prints or sets the name of the upstream branch, if any.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4862 | _, args = parser.parse_args(args) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4863 | if len(args) > 1: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4864 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4865 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4866 | cl = Changelist() |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4867 | if args: |
| 4868 | # One arg means set upstream branch. |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4869 | branch = cl.GetBranch() |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 4870 | RunGit(['branch', '--set-upstream-to', args[0], branch]) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4871 | cl = Changelist() |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4872 | print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),)) |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4873 | |
| 4874 | # Clear configured merge-base, if there is one. |
| 4875 | git_common.remove_merge_base(branch) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4876 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4877 | print(cl.GetUpstreamBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4878 | return 0 |
| 4879 | |
| 4880 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4881 | @metrics.collector.collect_metrics('git cl web') |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4882 | def CMDweb(parser, args): |
| 4883 | """Opens the current CL in the web browser.""" |
| 4884 | _, args = parser.parse_args(args) |
| 4885 | if args: |
| 4886 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4887 | |
| 4888 | issue_url = Changelist().GetIssueURL() |
| 4889 | if not issue_url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4890 | print('ERROR No issue to open', file=sys.stderr) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4891 | return 1 |
| 4892 | |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4893 | # Redirect I/O before invoking browser to hide its output. For example, this |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4894 | # allows us to hide the "Created new window in existing browser session." |
| 4895 | # message from Chrome. Based on https://stackoverflow.com/a/2323563. |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4896 | saved_stdout = os.dup(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4897 | saved_stderr = os.dup(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4898 | os.close(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4899 | os.close(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4900 | os.open(os.devnull, os.O_RDWR) |
| 4901 | try: |
| 4902 | webbrowser.open(issue_url) |
| 4903 | finally: |
| 4904 | os.dup2(saved_stdout, 1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4905 | os.dup2(saved_stderr, 2) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4906 | return 0 |
| 4907 | |
| 4908 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4909 | @metrics.collector.collect_metrics('git cl set-commit') |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4910 | def CMDset_commit(parser, args): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4911 | """Sets the commit bit to trigger the CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4912 | parser.add_option('-d', '--dry-run', action='store_true', |
| 4913 | help='trigger in dry run mode') |
| 4914 | parser.add_option('-c', '--clear', action='store_true', |
| 4915 | help='stop CQ run, if any') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 4916 | parser.add_option( |
| 4917 | '-i', '--issue', type=int, |
| 4918 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 4919 | 'issue.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4920 | options, args = parser.parse_args(args) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4921 | if args: |
| 4922 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4923 | if options.dry_run and options.clear: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4924 | parser.error('Only one of --dry-run and --clear are allowed.') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4925 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4926 | cl = Changelist(issue=options.issue) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4927 | if options.clear: |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 4928 | state = _CQState.NONE |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4929 | elif options.dry_run: |
| 4930 | state = _CQState.DRY_RUN |
| 4931 | else: |
| 4932 | state = _CQState.COMMIT |
| 4933 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4934 | parser.error('Must upload the issue first.') |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 4935 | cl.SetCQState(state) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4936 | return 0 |
| 4937 | |
| 4938 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4939 | @metrics.collector.collect_metrics('git cl set-close') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4940 | def CMDset_close(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4941 | """Closes the issue.""" |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 4942 | parser.add_option( |
| 4943 | '-i', '--issue', type=int, |
| 4944 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 4945 | 'issue.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4946 | options, args = parser.parse_args(args) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4947 | if args: |
| 4948 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4949 | cl = Changelist(issue=options.issue) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4950 | # Ensure there actually is an issue to close. |
Aaron Gable | 7139a4e | 2017-09-05 17:53:09 -0700 | [diff] [blame] | 4951 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4952 | DieWithError('ERROR: No issue to close.') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4953 | cl.CloseIssue() |
| 4954 | return 0 |
| 4955 | |
| 4956 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4957 | @metrics.collector.collect_metrics('git cl diff') |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4958 | def CMDdiff(parser, args): |
wychen@chromium.org | 37b2ec0 | 2015-04-03 00:49:15 +0000 | [diff] [blame] | 4959 | """Shows differences between local tree and last upload.""" |
thomasanderson | 074beb2 | 2016-08-29 14:03:20 -0700 | [diff] [blame] | 4960 | parser.add_option( |
| 4961 | '--stat', |
| 4962 | action='store_true', |
| 4963 | dest='stat', |
| 4964 | help='Generate a diffstat') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4965 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4966 | if args: |
| 4967 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 4968 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4969 | cl = Changelist() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 4970 | issue = cl.GetIssue() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4971 | branch = cl.GetBranch() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 4972 | if not issue: |
| 4973 | DieWithError('No issue found for current branch (%s)' % branch) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4974 | |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 4975 | base = cl._GitGetBranchConfigValue('last-upload-hash') |
| 4976 | if not base: |
| 4977 | base = cl._GitGetBranchConfigValue('gerritsquashhash') |
| 4978 | if not base: |
| 4979 | detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT']) |
| 4980 | revision_info = detail['revisions'][detail['current_revision']] |
| 4981 | fetch_info = revision_info['fetch']['http'] |
| 4982 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
| 4983 | base = 'FETCH_HEAD' |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4984 | |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 4985 | cmd = ['git', 'diff'] |
| 4986 | if options.stat: |
| 4987 | cmd.append('--stat') |
| 4988 | cmd.append(base) |
| 4989 | subprocess2.check_call(cmd) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4990 | |
| 4991 | return 0 |
| 4992 | |
| 4993 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4994 | @metrics.collector.collect_metrics('git cl owners') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4995 | def CMDowners(parser, args): |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 4996 | """Finds potential owners for reviewing.""" |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4997 | parser.add_option( |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 4998 | '--ignore-current', |
| 4999 | action='store_true', |
| 5000 | help='Ignore the CL\'s current reviewers and start from scratch.') |
| 5001 | parser.add_option( |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 5002 | '--ignore-self', |
| 5003 | action='store_true', |
| 5004 | help='Do not consider CL\'s author as an owners.') |
| 5005 | parser.add_option( |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5006 | '--no-color', |
| 5007 | action='store_true', |
| 5008 | help='Use this option to disable color output') |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5009 | parser.add_option( |
| 5010 | '--batch', |
| 5011 | action='store_true', |
| 5012 | help='Do not run interactively, just suggest some') |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5013 | # TODO: Consider moving this to another command, since other |
| 5014 | # git-cl owners commands deal with owners for a given CL. |
| 5015 | parser.add_option( |
| 5016 | '--show-all', |
| 5017 | action='store_true', |
| 5018 | help='Show all owners for a particular file') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5019 | options, args = parser.parse_args(args) |
| 5020 | |
| 5021 | author = RunGit(['config', 'user.email']).strip() or None |
| 5022 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5023 | cl = Changelist() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5024 | |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5025 | if options.show_all: |
| 5026 | for arg in args: |
| 5027 | base_branch = cl.GetCommonAncestorWithUpstream() |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 5028 | database = owners.Database(settings.GetRoot(), file, os.path) |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5029 | database.load_data_needed_for([arg]) |
| 5030 | print('Owners for %s:' % arg) |
| 5031 | for owner in sorted(database.all_possible_owners([arg], None)): |
| 5032 | print(' - %s' % owner) |
| 5033 | return 0 |
| 5034 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5035 | if args: |
| 5036 | if len(args) > 1: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5037 | parser.error('Unknown args.') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5038 | base_branch = args[0] |
| 5039 | else: |
| 5040 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5041 | base_branch = cl.GetCommonAncestorWithUpstream() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5042 | |
Edward Lemur | 7f6dec0 | 2020-02-06 20:23:58 +0000 | [diff] [blame] | 5043 | change = cl.GetChange(base_branch) |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5044 | affected_files = [f.LocalPath() for f in change.AffectedFiles()] |
| 5045 | |
| 5046 | if options.batch: |
| 5047 | db = owners.Database(change.RepositoryRoot(), file, os.path) |
| 5048 | print('\n'.join(db.reviewers_for(affected_files, author))) |
| 5049 | return 0 |
| 5050 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5051 | return owners_finder.OwnersFinder( |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5052 | affected_files, |
Jochen Eisinger | 72606f8 | 2017-04-04 10:44:18 +0200 | [diff] [blame] | 5053 | change.RepositoryRoot(), |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 5054 | author, |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 5055 | [] if options.ignore_current else cl.GetReviewers(), |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 5056 | fopen=file, os_path=os.path, |
Jochen Eisinger | d0573ec | 2017-04-13 10:55:06 +0200 | [diff] [blame] | 5057 | disable_color=options.no_color, |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 5058 | override_files=change.OriginalOwnersFiles(), |
| 5059 | ignore_author=options.ignore_self).run() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5060 | |
| 5061 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5062 | def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5063 | """Generates a diff command.""" |
| 5064 | # Generate diff for the current branch's changes. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5065 | diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff'] |
| 5066 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 5067 | if allow_prefix: |
| 5068 | # explicitly setting --src-prefix and --dst-prefix is necessary in the |
| 5069 | # case that diff.noprefix is set in the user's git config. |
| 5070 | diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/'] |
| 5071 | else: |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5072 | diff_cmd += ['--no-prefix'] |
| 5073 | |
| 5074 | diff_cmd += [diff_type, upstream_commit, '--'] |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5075 | |
| 5076 | if args: |
| 5077 | for arg in args: |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5078 | if os.path.isdir(arg) or os.path.isfile(arg): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5079 | diff_cmd.append(arg) |
| 5080 | else: |
| 5081 | DieWithError('Argument "%s" is not a file or a directory' % arg) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5082 | |
| 5083 | return diff_cmd |
| 5084 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5085 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5086 | def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit): |
| 5087 | """Runs clang-format-diff and sets a return value if necessary.""" |
| 5088 | |
| 5089 | if not clang_diff_files: |
| 5090 | return 0 |
| 5091 | |
| 5092 | # Set to 2 to signal to CheckPatchFormatted() that this patch isn't |
| 5093 | # formatted. This is used to block during the presubmit. |
| 5094 | return_value = 0 |
| 5095 | |
| 5096 | # Locate the clang-format binary in the checkout |
| 5097 | try: |
| 5098 | clang_format_tool = clang_format.FindClangFormatToolInChromiumTree() |
| 5099 | except clang_format.NotFoundError as e: |
| 5100 | DieWithError(e) |
| 5101 | |
| 5102 | if opts.full or settings.GetFormatFullByDefault(): |
| 5103 | cmd = [clang_format_tool] |
| 5104 | if not opts.dry_run and not opts.diff: |
| 5105 | cmd.append('-i') |
| 5106 | if opts.dry_run: |
| 5107 | for diff_file in clang_diff_files: |
| 5108 | with open(diff_file, 'r') as myfile: |
| 5109 | code = myfile.read().replace('\r\n', '\n') |
| 5110 | stdout = RunCommand(cmd + [diff_file], cwd=top_dir) |
| 5111 | stdout = stdout.replace('\r\n', '\n') |
| 5112 | if opts.diff: |
| 5113 | sys.stdout.write(stdout) |
| 5114 | if code != stdout: |
| 5115 | return_value = 2 |
| 5116 | else: |
| 5117 | stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir) |
| 5118 | if opts.diff: |
| 5119 | sys.stdout.write(stdout) |
| 5120 | else: |
| 5121 | env = os.environ.copy() |
| 5122 | env['PATH'] = str(os.path.dirname(clang_format_tool)) |
| 5123 | try: |
| 5124 | script = clang_format.FindClangFormatScriptInChromiumTree( |
| 5125 | 'clang-format-diff.py') |
| 5126 | except clang_format.NotFoundError as e: |
| 5127 | DieWithError(e) |
| 5128 | |
| 5129 | cmd = [sys.executable, script, '-p0'] |
| 5130 | if not opts.dry_run and not opts.diff: |
| 5131 | cmd.append('-i') |
| 5132 | |
| 5133 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files) |
| 5134 | diff_output = RunGit(diff_cmd) |
| 5135 | |
| 5136 | stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env) |
| 5137 | if opts.diff: |
| 5138 | sys.stdout.write(stdout) |
| 5139 | if opts.dry_run and len(stdout) > 0: |
| 5140 | return_value = 2 |
| 5141 | |
| 5142 | return return_value |
| 5143 | |
| 5144 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5145 | def MatchingFileType(file_name, extensions): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 5146 | """Returns True if the file name ends with one of the given extensions.""" |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5147 | return bool([ext for ext in extensions if file_name.lower().endswith(ext)]) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5148 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5149 | |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 5150 | @subcommand.usage('[files or directories to diff]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5151 | @metrics.collector.collect_metrics('git cl format') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5152 | def CMDformat(parser, args): |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5153 | """Runs auto-formatting tools (clang-format etc.) on the diff.""" |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5154 | CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java'] |
kylechar | 58edce2 | 2016-06-17 06:07:51 -0700 | [diff] [blame] | 5155 | GN_EXTS = ['.gn', '.gni', '.typemap'] |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 5156 | parser.add_option('--full', action='store_true', |
| 5157 | help='Reformat the full content of all touched files') |
| 5158 | parser.add_option('--dry-run', action='store_true', |
| 5159 | help='Don\'t modify any file on disk.') |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5160 | parser.add_option( |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5161 | '--no-clang-format', |
| 5162 | dest='clang_format', |
| 5163 | action='store_false', |
| 5164 | default=True, |
| 5165 | help='Disables formatting of various file types using clang-format.') |
| 5166 | parser.add_option( |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5167 | '--python', |
| 5168 | action='store_true', |
| 5169 | default=None, |
| 5170 | help='Enables python formatting on all python files.') |
| 5171 | parser.add_option( |
| 5172 | '--no-python', |
| 5173 | action='store_true', |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5174 | default=False, |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5175 | help='Disables python formatting on all python files. ' |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5176 | 'If neither --python or --no-python are set, python files that have a ' |
| 5177 | '.style.yapf file in an ancestor directory will be formatted. ' |
| 5178 | 'It is an error to set both.') |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5179 | parser.add_option( |
| 5180 | '--js', |
| 5181 | action='store_true', |
| 5182 | help='Format javascript code with clang-format. ' |
| 5183 | 'Has no effect if --no-clang-format is set.') |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 5184 | parser.add_option('--diff', action='store_true', |
| 5185 | help='Print diff to stdout rather than modifying files.') |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5186 | parser.add_option('--presubmit', action='store_true', |
| 5187 | help='Used when running the script from a presubmit.') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5188 | opts, args = parser.parse_args(args) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5189 | |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5190 | if opts.python is not None and opts.no_python: |
| 5191 | raise parser.error('Cannot set both --python and --no-python') |
| 5192 | if opts.no_python: |
| 5193 | opts.python = False |
| 5194 | |
Daniel Cheng | c55eecf | 2016-12-30 03:11:02 -0800 | [diff] [blame] | 5195 | # Normalize any remaining args against the current path, so paths relative to |
| 5196 | # the current directory are still resolved as expected. |
| 5197 | args = [os.path.join(os.getcwd(), arg) for arg in args] |
| 5198 | |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5199 | # git diff generates paths against the root of the repository. Change |
| 5200 | # to that directory so clang-format can find files even within subdirs. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5201 | rel_base_path = settings.GetRelativeRoot() |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5202 | if rel_base_path: |
| 5203 | os.chdir(rel_base_path) |
| 5204 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5205 | # Grab the merge-base commit, i.e. the upstream commit of the current |
| 5206 | # branch when it was created or the last time it was rebased. This is |
| 5207 | # to cover the case where the user may have called "git fetch origin", |
| 5208 | # moving the origin branch to a newer commit, but hasn't rebased yet. |
| 5209 | upstream_commit = None |
| 5210 | cl = Changelist() |
| 5211 | upstream_branch = cl.GetUpstreamBranch() |
| 5212 | if upstream_branch: |
| 5213 | upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch]) |
| 5214 | upstream_commit = upstream_commit.strip() |
| 5215 | |
| 5216 | if not upstream_commit: |
| 5217 | DieWithError('Could not find base commit for this branch. ' |
| 5218 | 'Are you in detached state?') |
| 5219 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5220 | changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args) |
| 5221 | diff_output = RunGit(changed_files_cmd) |
| 5222 | diff_files = diff_output.splitlines() |
jkarlin@chromium.org | ad21b92 | 2016-01-28 17:48:42 +0000 | [diff] [blame] | 5223 | # Filter out files deleted by this CL |
| 5224 | diff_files = [x for x in diff_files if os.path.isfile(x)] |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5225 | |
Andreas Haas | 417d89c | 2020-02-06 10:24:27 +0000 | [diff] [blame] | 5226 | if opts.js: |
Deepanjan Roy | 605dd31 | 2018-07-02 17:48:54 +0000 | [diff] [blame] | 5227 | CLANG_EXTS.extend(['.js', '.ts']) |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5228 | |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5229 | clang_diff_files = [] |
| 5230 | if opts.clang_format: |
| 5231 | clang_diff_files = [ |
| 5232 | x for x in diff_files if MatchingFileType(x, CLANG_EXTS) |
| 5233 | ] |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5234 | python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])] |
| 5235 | dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])] |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5236 | gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)] |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5237 | |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 5238 | top_dir = os.path.normpath( |
| 5239 | RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n')) |
| 5240 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5241 | return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir, |
| 5242 | upstream_commit) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5243 | |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5244 | # Similar code to above, but using yapf on .py files rather than clang-format |
| 5245 | # on C/C++ files |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5246 | py_explicitly_disabled = opts.python is not None and not opts.python |
| 5247 | if python_diff_files and not py_explicitly_disabled: |
Aiden Benner | e47ac15 | 2018-11-20 16:44:03 +0000 | [diff] [blame] | 5248 | depot_tools_path = os.path.dirname(os.path.abspath(__file__)) |
| 5249 | yapf_tool = os.path.join(depot_tools_path, 'yapf') |
| 5250 | if sys.platform.startswith('win'): |
| 5251 | yapf_tool += '.bat' |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5252 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5253 | # Used for caching. |
| 5254 | yapf_configs = {} |
| 5255 | for f in python_diff_files: |
| 5256 | # Find the yapf style config for the current file, defaults to depot |
| 5257 | # tools default. |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5258 | _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5259 | |
| 5260 | # Turn on python formatting by default if a yapf config is specified. |
| 5261 | # This breaks in the case of this repo though since the specified |
| 5262 | # style file is also the global default. |
| 5263 | if opts.python is None: |
| 5264 | filtered_py_files = [] |
| 5265 | for f in python_diff_files: |
| 5266 | if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None: |
| 5267 | filtered_py_files.append(f) |
| 5268 | else: |
| 5269 | filtered_py_files = python_diff_files |
| 5270 | |
| 5271 | # Note: yapf still seems to fix indentation of the entire file |
| 5272 | # even if line ranges are specified. |
| 5273 | # See https://github.com/google/yapf/issues/499 |
| 5274 | if not opts.full and filtered_py_files: |
| 5275 | py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit) |
| 5276 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 5277 | yapfignore_patterns = _GetYapfIgnorePatterns(top_dir) |
| 5278 | filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files, |
| 5279 | yapfignore_patterns) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 5280 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5281 | for f in filtered_py_files: |
Andrew Grieve | fa40bfa | 2020-01-07 02:32:57 +0000 | [diff] [blame] | 5282 | yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5283 | # Default to pep8 if not .style.yapf is found. |
| 5284 | if not yapf_style: |
| 5285 | yapf_style = 'pep8' |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5286 | |
Andrew Grieve | fa40bfa | 2020-01-07 02:32:57 +0000 | [diff] [blame] | 5287 | cmd = [yapf_tool, '--style', yapf_style, f] |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5288 | |
| 5289 | has_formattable_lines = False |
| 5290 | if not opts.full: |
| 5291 | # Only run yapf over changed line ranges. |
| 5292 | for diff_start, diff_len in py_line_diffs[f]: |
| 5293 | diff_end = diff_start + diff_len - 1 |
| 5294 | # Yapf errors out if diff_end < diff_start but this |
| 5295 | # is a valid line range diff for a removal. |
| 5296 | if diff_end >= diff_start: |
| 5297 | has_formattable_lines = True |
| 5298 | cmd += ['-l', '{}-{}'.format(diff_start, diff_end)] |
| 5299 | # If all line diffs were removals we have nothing to format. |
| 5300 | if not has_formattable_lines: |
| 5301 | continue |
| 5302 | |
| 5303 | if opts.diff or opts.dry_run: |
| 5304 | cmd += ['--diff'] |
| 5305 | # Will return non-zero exit code if non-empty diff. |
| 5306 | stdout = RunCommand(cmd, error_ok=True, cwd=top_dir) |
| 5307 | if opts.diff: |
| 5308 | sys.stdout.write(stdout) |
| 5309 | elif len(stdout) > 0: |
| 5310 | return_value = 2 |
| 5311 | else: |
| 5312 | cmd += ['-i'] |
| 5313 | RunCommand(cmd, cwd=top_dir) |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5314 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5315 | # Dart's formatter does not have the nice property of only operating on |
| 5316 | # modified chunks, so hard code full. |
| 5317 | if dart_diff_files: |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5318 | try: |
| 5319 | command = [dart_format.FindDartFmtToolInChromiumTree()] |
| 5320 | if not opts.dry_run and not opts.diff: |
| 5321 | command.append('-w') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5322 | command.extend(dart_diff_files) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5323 | |
ppi@chromium.org | 6593d93 | 2016-03-03 15:41:15 +0000 | [diff] [blame] | 5324 | stdout = RunCommand(command, cwd=top_dir) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5325 | if opts.dry_run and stdout: |
| 5326 | return_value = 2 |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5327 | except dart_format.NotFoundError: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5328 | print('Warning: Unable to check Dart code formatting. Dart SDK not ' |
| 5329 | 'found in this checkout. Files in other languages are still ' |
| 5330 | 'formatted.') |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5331 | |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5332 | # Format GN build files. Always run on full build files for canonical form. |
| 5333 | if gn_diff_files: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5334 | cmd = ['gn', 'format'] |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5335 | if opts.dry_run or opts.diff: |
| 5336 | cmd.append('--dry-run') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5337 | for gn_diff_file in gn_diff_files: |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5338 | gn_ret = subprocess2.call(cmd + [gn_diff_file], |
| 5339 | shell=sys.platform == 'win32', |
| 5340 | cwd=top_dir) |
| 5341 | if opts.dry_run and gn_ret == 2: |
| 5342 | return_value = 2 # Not formatted. |
| 5343 | elif opts.diff and gn_ret == 2: |
| 5344 | # TODO this should compute and print the actual diff. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5345 | print('This change has GN build file diff for ' + gn_diff_file) |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5346 | elif gn_ret != 0: |
| 5347 | # For non-dry run cases (and non-2 return values for dry-run), a |
| 5348 | # nonzero error code indicates a failure, probably because the file |
| 5349 | # doesn't parse. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5350 | DieWithError('gn format failed on ' + gn_diff_file + |
| 5351 | '\nTry running `gn format` on this file manually.') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5352 | |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5353 | # Skip the metrics formatting from the global presubmit hook. These files have |
| 5354 | # a separate presubmit hook that issues an error if the files need formatting, |
| 5355 | # whereas the top-level presubmit script merely issues a warning. Formatting |
| 5356 | # these files is somewhat slow, so it's important not to duplicate the work. |
| 5357 | if not opts.presubmit: |
| 5358 | for xml_dir in GetDirtyMetricsDirs(diff_files): |
| 5359 | tool_dir = os.path.join(top_dir, xml_dir) |
| 5360 | cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive'] |
| 5361 | if opts.dry_run or opts.diff: |
| 5362 | cmd.append('--diff') |
Ilya Sherman | 235b70d | 2017-08-22 17:46:38 -0700 | [diff] [blame] | 5363 | stdout = RunCommand(cmd, cwd=top_dir) |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5364 | if opts.diff: |
| 5365 | sys.stdout.write(stdout) |
| 5366 | if opts.dry_run and stdout: |
| 5367 | return_value = 2 # Not formatted. |
Alexei Svitkine | f3cac41 | 2017-02-06 11:08:50 -0500 | [diff] [blame] | 5368 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5369 | return return_value |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5370 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5371 | |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5372 | def GetDirtyMetricsDirs(diff_files): |
| 5373 | xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])] |
| 5374 | metrics_xml_dirs = [ |
| 5375 | os.path.join('tools', 'metrics', 'actions'), |
| 5376 | os.path.join('tools', 'metrics', 'histograms'), |
| 5377 | os.path.join('tools', 'metrics', 'rappor'), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5378 | os.path.join('tools', 'metrics', 'ukm'), |
| 5379 | ] |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5380 | for xml_dir in metrics_xml_dirs: |
| 5381 | if any(file.startswith(xml_dir) for file in xml_diff_files): |
| 5382 | yield xml_dir |
| 5383 | |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5384 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5385 | @subcommand.usage('<codereview url or issue id>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5386 | @metrics.collector.collect_metrics('git cl checkout') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5387 | def CMDcheckout(parser, args): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5388 | """Checks out a branch associated with a given Gerrit issue.""" |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5389 | _, args = parser.parse_args(args) |
| 5390 | |
| 5391 | if len(args) != 1: |
| 5392 | parser.print_help() |
| 5393 | return 1 |
| 5394 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5395 | issue_arg = ParseIssueNumberArgument(args[0]) |
tandrii@chromium.org | de6c9a1 | 2016-04-11 15:33:53 +0000 | [diff] [blame] | 5396 | if not issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5397 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5398 | |
tandrii@chromium.org | abd27e5 | 2016-04-11 15:43:32 +0000 | [diff] [blame] | 5399 | target_issue = str(issue_arg.issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5400 | |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5401 | issueprefix = Changelist.IssueConfigKey() |
| 5402 | output = RunGit(['config', '--local', '--get-regexp', |
| 5403 | r'branch\..*\.%s' % issueprefix], |
| 5404 | error_ok=True) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5405 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5406 | branches = [] |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5407 | for key, issue in [x.split() for x in output.splitlines()]: |
| 5408 | if issue == target_issue: |
| 5409 | branches.append(re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)) |
| 5410 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5411 | if len(branches) == 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5412 | print('No branch found for issue %s.' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5413 | return 1 |
| 5414 | if len(branches) == 1: |
| 5415 | RunGit(['checkout', branches[0]]) |
| 5416 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5417 | print('Multiple branches match issue %s:' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5418 | for i in range(len(branches)): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5419 | print('%d: %s' % (i, branches[i])) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5420 | which = raw_input('Choose by index: ') |
| 5421 | try: |
| 5422 | RunGit(['checkout', branches[int(which)]]) |
| 5423 | except (IndexError, ValueError): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5424 | print('Invalid selection, not checking out any branch.') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5425 | return 1 |
| 5426 | |
| 5427 | return 0 |
| 5428 | |
| 5429 | |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5430 | def CMDlol(parser, args): |
| 5431 | # This command is intentionally undocumented. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5432 | print(zlib.decompress(base64.b64decode( |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 5433 | 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE' |
| 5434 | 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9' |
| 5435 | 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5436 | 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))) |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5437 | return 0 |
| 5438 | |
| 5439 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5440 | class OptionParser(optparse.OptionParser): |
| 5441 | """Creates the option parse and add --verbose support.""" |
| 5442 | def __init__(self, *args, **kwargs): |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5443 | optparse.OptionParser.__init__( |
| 5444 | self, *args, prog='git cl', version=__version__, **kwargs) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5445 | self.add_option( |
| 5446 | '-v', '--verbose', action='count', default=0, |
| 5447 | help='Use 2 times for more debugging info') |
| 5448 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5449 | def parse_args(self, args=None, _values=None): |
Andrii Shyshkalov | 46f20cd | 2018-10-30 06:42:54 +0000 | [diff] [blame] | 5450 | try: |
| 5451 | return self._parse_args(args) |
| 5452 | finally: |
| 5453 | # Regardless of success or failure of args parsing, we want to report |
| 5454 | # metrics, but only after logging has been initialized (if parsing |
| 5455 | # succeeded). |
| 5456 | global settings |
| 5457 | settings = Settings() |
| 5458 | |
| 5459 | if not metrics.DISABLE_METRICS_COLLECTION: |
| 5460 | # GetViewVCUrl ultimately calls logging method. |
| 5461 | project_url = settings.GetViewVCUrl().strip('/+') |
| 5462 | if project_url in metrics_utils.KNOWN_PROJECT_URLS: |
| 5463 | metrics.collector.add('project_urls', [project_url]) |
| 5464 | |
| 5465 | def _parse_args(self, args=None): |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5466 | # Create an optparse.Values object that will store only the actual passed |
| 5467 | # options, without the defaults. |
| 5468 | actual_options = optparse.Values() |
| 5469 | _, args = optparse.OptionParser.parse_args(self, args, actual_options) |
| 5470 | # Create an optparse.Values object with the default options. |
| 5471 | options = optparse.Values(self.get_default_values().__dict__) |
| 5472 | # Update it with the options passed by the user. |
| 5473 | options._update_careful(actual_options.__dict__) |
| 5474 | # Store the options passed by the user in an _actual_options attribute. |
| 5475 | # We store only the keys, and not the values, since the values can contain |
| 5476 | # arbitrary information, which might be PII. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 5477 | metrics.collector.add('arguments', list(actual_options.__dict__.keys())) |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5478 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5479 | levels = [logging.WARNING, logging.INFO, logging.DEBUG] |
Andrii Shyshkalov | 5b04a57 | 2017-01-23 17:44:41 +0100 | [diff] [blame] | 5480 | logging.basicConfig( |
| 5481 | level=levels[min(options.verbose, len(levels) - 1)], |
| 5482 | format='[%(levelname).1s%(asctime)s %(process)d %(thread)d ' |
| 5483 | '%(filename)s] %(message)s') |
Edward Lemur | 83bd7f4 | 2018-10-10 00:14:21 +0000 | [diff] [blame] | 5484 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5485 | return options, args |
| 5486 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5487 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5488 | def main(argv): |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5489 | if sys.hexversion < 0x02060000: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5490 | print('\nYour Python version %s is unsupported, please upgrade.\n' % |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5491 | (sys.version.split(' ', 1)[0],), file=sys.stderr) |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5492 | return 2 |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 5493 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 5494 | colorize_CMDstatus_doc() |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5495 | dispatcher = subcommand.CommandDispatcher(__name__) |
| 5496 | try: |
| 5497 | return dispatcher.execute(OptionParser(), argv) |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 5498 | except auth.LoginRequiredError as e: |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 5499 | DieWithError(str(e)) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 5500 | except urllib.error.HTTPError as e: |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5501 | if e.code != 500: |
| 5502 | raise |
| 5503 | DieWithError( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5504 | ('App Engine is misbehaving and returned HTTP %d, again. Keep faith ' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5505 | 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))) |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 5506 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5507 | |
| 5508 | |
| 5509 | if __name__ == '__main__': |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5510 | # These affect sys.stdout, so do it outside of main() to simplify mocks in |
| 5511 | # the unit tests. |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 5512 | fix_encoding.fix_encoding() |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 5513 | setup_color.init() |
Edward Lemur | 6f812e1 | 2018-07-31 22:45:57 +0000 | [diff] [blame] | 5514 | with metrics.collector.print_notice_and_exit(): |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 5515 | sys.exit(main(sys.argv[1:])) |