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 |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 17 | import httplib |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 18 | import itertools |
maruel@chromium.org | 4f6852c | 2012-04-20 20:39:20 +0000 | [diff] [blame] | 19 | import json |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 20 | import logging |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 21 | import multiprocessing |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 22 | import optparse |
| 23 | import os |
| 24 | import re |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 25 | import shutil |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 26 | import stat |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 27 | import sys |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 28 | import tempfile |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 29 | import textwrap |
Edward Lemur | fec80c4 | 2018-11-01 23:14:14 +0000 | [diff] [blame] | 30 | import time |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 31 | import urllib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 32 | import urllib2 |
maruel@chromium.org | 967c0a8 | 2013-06-17 22:52:24 +0000 | [diff] [blame] | 33 | import urlparse |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 34 | import uuid |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 35 | import webbrowser |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 36 | import zlib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 37 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 38 | from third_party import colorama |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 39 | from third_party import httplib2 |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 40 | import auth |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 41 | import clang_format |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 42 | import dart_format |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 43 | import fix_encoding |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 44 | import gclient_utils |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 45 | import gerrit_util |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 46 | import git_common |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 47 | import git_footers |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 48 | import metrics |
Edward Lesmes | 93277a7 | 2018-10-18 22:04:26 +0000 | [diff] [blame] | 49 | import metrics_utils |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 50 | import owners |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 51 | import owners_finder |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 52 | import presubmit_support |
| 53 | import scm |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 54 | import setup_color |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 55 | import split_cl |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 56 | import subcommand |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 57 | import subprocess2 |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 58 | import watchlists |
| 59 | |
tandrii | 7400cf0 | 2016-06-21 08:48:07 -0700 | [diff] [blame] | 60 | __version__ = '2.0' |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 61 | |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 62 | # Traces for git push will be stored in a traces directory inside the |
| 63 | # depot_tools checkout. |
| 64 | DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__)) |
| 65 | TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces') |
| 66 | |
| 67 | # When collecting traces, Git hashes will be reduced to 6 characters to reduce |
| 68 | # the size after compression. |
| 69 | GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I) |
| 70 | # Used to redact the cookies from the gitcookies file. |
| 71 | GITCOOKIES_REDACT_RE = re.compile(r'1/.*') |
| 72 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 73 | MAX_ATTEMPTS = 3 |
| 74 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 75 | # The maximum number of traces we will keep. Multiplied by 3 since we store |
| 76 | # 3 files per trace. |
| 77 | MAX_TRACES = 3 * 10 |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 78 | # Message to be displayed to the user to inform where to find the traces for a |
| 79 | # git-cl upload execution. |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 80 | TRACES_MESSAGE = ( |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 81 | '\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 82 | 'The traces of this git-cl execution have been recorded at:\n' |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 83 | ' %(trace_name)s-traces.zip\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 84 | 'Copies of your gitcookies file and git config have been recorded at:\n' |
| 85 | ' %(trace_name)s-git-info.zip\n') |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 86 | # Format of the message to be stored as part of the traces to give developers a |
| 87 | # better context when they go through traces. |
| 88 | TRACES_README_FORMAT = ( |
| 89 | 'Date: %(now)s\n' |
| 90 | '\n' |
| 91 | 'Change: https://%(gerrit_host)s/q/%(change_id)s\n' |
| 92 | 'Title: %(title)s\n' |
| 93 | '\n' |
| 94 | '%(description)s\n' |
| 95 | '\n' |
| 96 | 'Execution time: %(execution_time)s\n' |
| 97 | 'Exit code: %(exit_code)s\n') + TRACES_MESSAGE |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 98 | |
tandrii | 9d2c7a3 | 2016-06-22 03:42:45 -0700 | [diff] [blame] | 99 | COMMIT_BOT_EMAIL = 'commit-bot@chromium.org' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 100 | POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 101 | DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup' |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 102 | REFS_THAT_ALIAS_TO_OTHER_REFS = { |
| 103 | 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master', |
| 104 | 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master', |
| 105 | } |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 106 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 107 | # Valid extensions for files we want to lint. |
| 108 | DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" |
| 109 | DEFAULT_LINT_IGNORE_REGEX = r"$^" |
| 110 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 111 | # File name for yapf style config files. |
| 112 | YAPF_CONFIG_FILENAME = '.style.yapf' |
| 113 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 114 | # Shortcut since it quickly becomes repetitive. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 115 | Fore = colorama.Fore |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 116 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 117 | # Initialized in main() |
| 118 | settings = None |
| 119 | |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 120 | # Used by tests/git_cl_test.py to add extra logging. |
| 121 | # Inside the weirdly failing test, add this: |
| 122 | # >>> self.mock(git_cl, '_IS_BEING_TESTED', True) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 123 | # And scroll up to see the stack trace printed. |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 124 | _IS_BEING_TESTED = False |
| 125 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 126 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 127 | def DieWithError(message, change_desc=None): |
| 128 | if change_desc: |
| 129 | SaveDescriptionBackup(change_desc) |
| 130 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 131 | print(message, file=sys.stderr) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 132 | sys.exit(1) |
| 133 | |
| 134 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 135 | def SaveDescriptionBackup(change_desc): |
| 136 | backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE) |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 137 | print('\nsaving CL description to %s\n' % backup_path) |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 138 | backup_file = open(backup_path, 'w') |
| 139 | backup_file.write(change_desc.description) |
| 140 | backup_file.close() |
| 141 | |
| 142 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 143 | def GetNoGitPagerEnv(): |
| 144 | env = os.environ.copy() |
| 145 | # 'cat' is a magical git string that disables pagers on all platforms. |
| 146 | env['GIT_PAGER'] = 'cat' |
| 147 | return env |
| 148 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 149 | |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 150 | 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] | 151 | try: |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 152 | return subprocess2.check_output(args, shell=shell, **kwargs) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 153 | except subprocess2.CalledProcessError as e: |
| 154 | logging.debug('Failed running %s', args) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 155 | if not error_ok: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 156 | DieWithError( |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 157 | 'Command "%s" failed.\n%s' % ( |
| 158 | ' '.join(args), error_message or e.stdout or '')) |
| 159 | return e.stdout |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 160 | |
| 161 | |
| 162 | def RunGit(args, **kwargs): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 163 | """Returns stdout.""" |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 164 | return RunCommand(['git'] + args, **kwargs) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 165 | |
| 166 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 167 | def RunGitWithCode(args, suppress_stderr=False): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 168 | """Returns return code and stdout.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 169 | if suppress_stderr: |
| 170 | stderr = subprocess2.VOID |
| 171 | else: |
| 172 | stderr = sys.stderr |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 173 | try: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 174 | (out, _), code = subprocess2.communicate(['git'] + args, |
| 175 | env=GetNoGitPagerEnv(), |
| 176 | stdout=subprocess2.PIPE, |
| 177 | stderr=stderr) |
| 178 | return code, out |
| 179 | except subprocess2.CalledProcessError as e: |
Yoshisato Yanagisawa | 81e3ff5 | 2017-09-26 15:33:34 +0900 | [diff] [blame] | 180 | logging.debug('Failed running %s', ['git'] + args) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 181 | return e.returncode, e.stdout |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 182 | |
| 183 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 184 | def RunGitSilent(args): |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 185 | """Returns stdout, suppresses stderr and ignores the return code.""" |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 186 | return RunGitWithCode(args, suppress_stderr=True)[1] |
| 187 | |
| 188 | |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 189 | def IsGitVersionAtLeast(min_version): |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 190 | prefix = 'git version ' |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 191 | version = RunGit(['--version']).strip() |
ilevy@chromium.org | cc56ee4 | 2013-07-10 22:16:29 +0000 | [diff] [blame] | 192 | return (version.startswith(prefix) and |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 193 | LooseVersion(version[len(prefix):]) >= LooseVersion(min_version)) |
tapted@chromium.org | 6a0b07c | 2013-07-10 01:29:19 +0000 | [diff] [blame] | 194 | |
| 195 | |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 196 | def BranchExists(branch): |
| 197 | """Return True if specified branch exists.""" |
| 198 | code, _ = RunGitWithCode(['rev-parse', '--verify', branch], |
| 199 | suppress_stderr=True) |
| 200 | return not code |
| 201 | |
| 202 | |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 203 | def time_sleep(seconds): |
| 204 | # Use this so that it can be mocked in tests without interfering with python |
| 205 | # system machinery. |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 206 | return time.sleep(seconds) |
| 207 | |
| 208 | |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 209 | def time_time(): |
| 210 | # Use this so that it can be mocked in tests without interfering with python |
| 211 | # system machinery. |
| 212 | return time.time() |
| 213 | |
| 214 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 215 | def datetime_now(): |
| 216 | # Use this so that it can be mocked in tests without interfering with python |
| 217 | # system machinery. |
| 218 | return datetime.datetime.now() |
| 219 | |
| 220 | |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 221 | def ask_for_data(prompt): |
| 222 | try: |
| 223 | return raw_input(prompt) |
| 224 | except KeyboardInterrupt: |
| 225 | # Hide the exception. |
| 226 | sys.exit(1) |
| 227 | |
| 228 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 229 | def confirm_or_exit(prefix='', action='confirm'): |
| 230 | """Asks user to press enter to continue or press Ctrl+C to abort.""" |
| 231 | if not prefix or prefix.endswith('\n'): |
| 232 | mid = 'Press' |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 233 | elif prefix.endswith('.') or prefix.endswith('?'): |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 234 | mid = ' Press' |
| 235 | elif prefix.endswith(' '): |
| 236 | mid = 'press' |
| 237 | else: |
| 238 | mid = ' press' |
| 239 | ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action)) |
| 240 | |
| 241 | |
| 242 | def ask_for_explicit_yes(prompt): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 243 | """Returns whether user typed 'y' or 'yes' to confirm the given prompt.""" |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 244 | result = ask_for_data(prompt + ' [Yes/No]: ').lower() |
| 245 | while True: |
| 246 | if 'yes'.startswith(result): |
| 247 | return True |
| 248 | if 'no'.startswith(result): |
| 249 | return False |
| 250 | result = ask_for_data('Please, type yes or no: ').lower() |
| 251 | |
| 252 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 253 | def _git_branch_config_key(branch, key): |
| 254 | """Helper method to return Git config key for a branch.""" |
| 255 | assert branch, 'branch name is required to set git config for it' |
| 256 | return 'branch.%s.%s' % (branch, key) |
| 257 | |
| 258 | |
| 259 | def _git_get_branch_config_value(key, default=None, value_type=str, |
| 260 | branch=False): |
| 261 | """Returns git config value of given or current branch if any. |
| 262 | |
| 263 | Returns default in all other cases. |
| 264 | """ |
| 265 | assert value_type in (int, str, bool) |
| 266 | if branch is False: # Distinguishing default arg value from None. |
| 267 | branch = GetCurrentBranch() |
| 268 | |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 269 | if not branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 270 | return default |
rogerta@chromium.org | caa1655 | 2013-03-18 20:45:05 +0000 | [diff] [blame] | 271 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 272 | args = ['config'] |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 273 | if value_type == bool: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 274 | args.append('--bool') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 275 | # `git config` also has --int, but apparently git config suffers from integer |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 276 | # overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 277 | args.append(_git_branch_config_key(branch, key)) |
| 278 | code, out = RunGitWithCode(args) |
| 279 | if code == 0: |
| 280 | value = out.strip() |
| 281 | if value_type == int: |
| 282 | return int(value) |
| 283 | if value_type == bool: |
| 284 | return bool(value.lower() == 'true') |
| 285 | return value |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 286 | return default |
| 287 | |
| 288 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 289 | def _git_set_branch_config_value(key, value, branch=None, **kwargs): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 290 | """Sets or unsets the git branch config value. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 291 | |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 292 | If value is None, the key will be unset, otherwise it will be set. |
| 293 | If no branch is given, the currently checked out branch is used. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 294 | """ |
| 295 | if not branch: |
| 296 | branch = GetCurrentBranch() |
| 297 | assert branch, 'a branch name OR currently checked out branch is required' |
| 298 | args = ['config'] |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 299 | # Check for boolean first, because bool is int, but int is not bool. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 300 | if value is None: |
| 301 | args.append('--unset') |
| 302 | elif isinstance(value, bool): |
| 303 | args.append('--bool') |
| 304 | value = str(value).lower() |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 305 | else: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 306 | # `git config` also has --int, but apparently git config suffers from |
| 307 | # integer overflows (http://crbug.com/640115), so don't use it. |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 308 | value = str(value) |
| 309 | args.append(_git_branch_config_key(branch, key)) |
| 310 | if value is not None: |
| 311 | args.append(value) |
| 312 | RunGit(args, **kwargs) |
| 313 | |
| 314 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 315 | def _get_properties_from_options(options): |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 316 | prop_list = getattr(options, 'properties', []) |
| 317 | properties = dict(x.split('=', 1) for x in prop_list) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 318 | for key, val in properties.items(): |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 319 | try: |
| 320 | properties[key] = json.loads(val) |
| 321 | except ValueError: |
| 322 | pass # If a value couldn't be evaluated, treat it as a string. |
| 323 | return properties |
| 324 | |
| 325 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 326 | # TODO(crbug.com/976104): Remove this function once git-cl try-results has |
| 327 | # migrated to use buildbucket v2 |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 328 | def _buildbucket_retry(operation_name, http, *args, **kwargs): |
| 329 | """Retries requests to buildbucket service and returns parsed json content.""" |
| 330 | try_count = 0 |
| 331 | while True: |
| 332 | response, content = http.request(*args, **kwargs) |
| 333 | try: |
| 334 | content_json = json.loads(content) |
| 335 | except ValueError: |
| 336 | content_json = None |
| 337 | |
| 338 | # Buildbucket could return an error even if status==200. |
| 339 | if content_json and content_json.get('error'): |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 340 | error = content_json.get('error') |
| 341 | if error.get('code') == 403: |
| 342 | raise BuildbucketResponseException( |
| 343 | 'Access denied: %s' % error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 344 | msg = 'Error in response. Reason: %s. Message: %s.' % ( |
nodir@chromium.org | baff4e1 | 2016-03-08 00:33:57 +0000 | [diff] [blame] | 345 | error.get('reason', ''), error.get('message', '')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 346 | raise BuildbucketResponseException(msg) |
| 347 | |
| 348 | if response.status == 200: |
Nodir Turakulov | 23d75d2 | 2018-06-04 12:37:32 -0700 | [diff] [blame] | 349 | if content_json is None: |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 350 | raise BuildbucketResponseException( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 351 | 'Buildbucket returned invalid JSON content: %s.\n' |
Nodir Turakulov | 9ac5979 | 2018-06-04 12:34:14 -0700 | [diff] [blame] | 352 | 'Please file bugs at http://crbug.com, ' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 353 | 'component "Infra>Platform>Buildbucket".' % |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 354 | content) |
| 355 | return content_json |
| 356 | if response.status < 500 or try_count >= 2: |
| 357 | raise httplib2.HttpLib2Error(content) |
| 358 | |
| 359 | # status >= 500 means transient failures. |
| 360 | logging.debug('Transient errors when %s. Will retry.', operation_name) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 361 | time_sleep(0.5 + (1.5 * try_count)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 362 | try_count += 1 |
| 363 | assert False, 'unreachable' |
| 364 | |
| 365 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 366 | def _call_buildbucket(http, buildbucket_host, method, request): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 367 | """Calls a buildbucket v2 method and returns the parsed json response.""" |
| 368 | headers = { |
| 369 | 'Accept': 'application/json', |
| 370 | 'Content-Type': 'application/json', |
| 371 | } |
| 372 | request = json.dumps(request) |
| 373 | url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method) |
| 374 | |
| 375 | logging.info('POST %s with %s' % (url, request)) |
| 376 | |
| 377 | attempts = 1 |
| 378 | time_to_sleep = 1 |
| 379 | while True: |
| 380 | response, content = http.request(url, 'POST', body=request, headers=headers) |
| 381 | if response.status == 200: |
| 382 | return json.loads(content[4:]) |
| 383 | if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500: |
| 384 | msg = '%s error when calling POST %s with %s: %s' % ( |
| 385 | response.status, url, request, content) |
| 386 | raise BuildbucketResponseException(msg) |
| 387 | logging.debug( |
| 388 | '%s error when calling POST %s with %s. ' |
| 389 | 'Sleeping for %d seconds and retrying...' % ( |
| 390 | response.status, url, request, time_to_sleep)) |
| 391 | time.sleep(time_to_sleep) |
| 392 | time_to_sleep *= 2 |
| 393 | attempts += 1 |
| 394 | |
| 395 | assert False, 'unreachable' |
| 396 | |
| 397 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 398 | def _get_bucket_map(changelist, options, option_parser): |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 399 | """Returns a dict mapping bucket names to builders and tests, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 400 | for triggering tryjobs. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 401 | """ |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 402 | # If no bots are listed, we try to get a set of builders and tests based |
| 403 | # on GetPreferredTryMasters functions in PRESUBMIT.py files. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 404 | if not options.bot: |
| 405 | change = changelist.GetChange( |
| 406 | changelist.GetCommonAncestorWithUpstream(), None) |
qyearsley | 136b49f | 2016-10-31 09:02:26 -0700 | [diff] [blame] | 407 | # Get try masters from PRESUBMIT.py files. |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 408 | masters = presubmit_support.DoGetTryMasters( |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 409 | change=change, |
| 410 | changed_files=change.LocalPaths(), |
| 411 | repository_root=settings.GetRoot(), |
| 412 | default_presubmit=None, |
| 413 | project=None, |
| 414 | verbose=options.verbose, |
| 415 | output_stream=sys.stdout) |
nodir | e4f0fe0 | 2016-11-04 16:23:30 -0700 | [diff] [blame] | 416 | if masters is None: |
| 417 | return None |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 418 | return {m: b for m, b in masters.items()} |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 419 | |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 420 | if options.bucket: |
| 421 | return {options.bucket: {b: [] for b in options.bot}} |
Andrii Shyshkalov | 7542437 | 2019-08-30 22:48:15 +0000 | [diff] [blame] | 422 | option_parser.error( |
| 423 | 'Please specify the bucket, e.g. "-B luci.chromium.try".') |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 424 | |
| 425 | |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 426 | def _parse_bucket(raw_bucket): |
| 427 | legacy = True |
| 428 | project = bucket = None |
| 429 | if '/' in raw_bucket: |
| 430 | legacy = False |
| 431 | project, bucket = raw_bucket.split('/', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 432 | # Assume luci.<project>.<bucket>. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 433 | elif raw_bucket.startswith('luci.'): |
| 434 | project, bucket = raw_bucket[len('luci.'):].split('.', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 435 | # Otherwise, assume prefix is also the project name. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 436 | elif '.' in raw_bucket: |
| 437 | project = raw_bucket.split('.')[0] |
| 438 | bucket = raw_bucket |
| 439 | # Legacy buckets. |
| 440 | if legacy: |
| 441 | print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket)) |
| 442 | return project, bucket |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 443 | |
| 444 | |
Andrii Shyshkalov | f9648b5 | 2018-02-21 22:32:42 -0800 | [diff] [blame] | 445 | def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 446 | """Sends a request to Buildbucket to trigger tryjobs for a changelist. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 447 | |
| 448 | Args: |
Aaron Gable | fb28d48 | 2018-04-02 13:08:06 -0700 | [diff] [blame] | 449 | auth_config: AuthConfig for Buildbucket. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 450 | changelist: Changelist that the tryjobs are associated with. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 451 | buckets: A nested dict mapping bucket names to builders to tests. |
| 452 | options: Command-line options. |
| 453 | """ |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 454 | print('Scheduling jobs on:') |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 455 | for bucket, builders_and_tests in sorted(buckets.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 456 | print('Bucket:', bucket) |
| 457 | print('\n'.join( |
| 458 | ' %s: %s' % (builder, tests) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 459 | for builder, tests in sorted(builders_and_tests.items()))) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 460 | print('To see results here, run: git cl try-results') |
| 461 | print('To see results in browser, run: git cl web') |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 462 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 463 | requests = _make_try_job_schedule_requests( |
| 464 | changelist, buckets, options, patchset) |
| 465 | if not requests: |
| 466 | return |
| 467 | |
Edward Lemur | b4a587d | 2019-10-09 23:56:38 +0000 | [diff] [blame] | 468 | http = auth.get_authenticator(auth_config).authorize(httplib2.Http()) |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 469 | http.force_exception_to_status_code = True |
| 470 | |
| 471 | batch_request = {'requests': requests} |
| 472 | batch_response = _call_buildbucket( |
| 473 | http, options.buildbucket_host, 'Batch', batch_request) |
| 474 | |
| 475 | errors = [ |
| 476 | ' ' + response['error']['message'] |
| 477 | for response in batch_response.get('responses', []) |
| 478 | if 'error' in response |
| 479 | ] |
| 480 | if errors: |
| 481 | raise BuildbucketResponseException( |
| 482 | 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors)) |
| 483 | |
| 484 | |
| 485 | def _make_try_job_schedule_requests(changelist, buckets, options, patchset): |
Edward Lemur | f0faf48 | 2019-09-25 20:40:17 +0000 | [diff] [blame] | 486 | gerrit_changes = [changelist.GetGerritChange(patchset)] |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 487 | shared_properties = {'category': getattr(options, 'category', 'git_cl_try')} |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 488 | if getattr(options, 'clobber', False): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 489 | shared_properties['clobber'] = True |
| 490 | shared_properties.update(_get_properties_from_options(options) or {}) |
| 491 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 492 | shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}] |
| 493 | if options.retry_failed: |
| 494 | shared_tags.append({'key': 'retry_failed', |
| 495 | 'value': '1'}) |
| 496 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 497 | requests = [] |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 498 | for raw_bucket, builders_and_tests in sorted(buckets.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 499 | project, bucket = _parse_bucket(raw_bucket) |
| 500 | if not project or not bucket: |
| 501 | print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket) |
| 502 | continue |
| 503 | |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 504 | for builder, tests in sorted(builders_and_tests.items()): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 505 | properties = shared_properties.copy() |
| 506 | if 'presubmit' in builder.lower(): |
| 507 | properties['dry_run'] = 'true' |
| 508 | if tests: |
| 509 | properties['testfilter'] = tests |
| 510 | |
| 511 | requests.append({ |
| 512 | 'scheduleBuild': { |
| 513 | 'requestId': str(uuid.uuid4()), |
| 514 | 'builder': { |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 515 | 'project': getattr(options, 'project', None) or project, |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 516 | 'bucket': bucket, |
| 517 | 'builder': builder, |
| 518 | }, |
| 519 | 'gerritChanges': gerrit_changes, |
| 520 | 'properties': properties, |
| 521 | 'tags': [ |
| 522 | {'key': 'builder', 'value': builder}, |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 523 | ] + shared_tags, |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 524 | } |
| 525 | }) |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 526 | return requests |
kjellander@chromium.org | 4442454 | 2015-06-02 18:35:29 +0000 | [diff] [blame] | 527 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 528 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 529 | def fetch_try_jobs(auth_config, changelist, buildbucket_host, |
| 530 | patchset=None): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 531 | """Fetches tryjobs from buildbucket. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 532 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 533 | 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] | 534 | """ |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 535 | fields = ['id', 'builder', 'status', 'createTime', 'tags'] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 536 | request = { |
| 537 | 'predicate': { |
| 538 | 'gerritChanges': [changelist.GetGerritChange(patchset)], |
| 539 | }, |
| 540 | 'fields': ','.join('builds.*.' + field for field in fields), |
| 541 | } |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 542 | |
Edward Lemur | b4a587d | 2019-10-09 23:56:38 +0000 | [diff] [blame] | 543 | authenticator = auth.get_authenticator(auth_config) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 544 | if authenticator.has_cached_credentials(): |
| 545 | http = authenticator.authorize(httplib2.Http()) |
| 546 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 547 | print('Warning: Some results might be missing because %s' % |
| 548 | # Get the message on how to login. |
Edward Lemur | ba5bc99 | 2019-09-23 22:59:17 +0000 | [diff] [blame] | 549 | (auth.LoginRequiredError().message,)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 550 | http = httplib2.Http() |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 551 | http.force_exception_to_status_code = True |
| 552 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 553 | response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request) |
| 554 | return response.get('builds', []) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 555 | |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 556 | def _fetch_latest_builds( |
| 557 | auth_config, changelist, buildbucket_host, latest_patchset=None): |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 558 | """Fetches builds from the latest patchset that has builds (within |
| 559 | the last few patchsets). |
| 560 | |
| 561 | Args: |
| 562 | auth_config (auth.AuthConfig): Auth info for Buildbucket |
| 563 | changelist (Changelist): The CL to fetch builds for |
| 564 | buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com" |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 565 | lastest_patchset(int|NoneType): the patchset to start fetching builds from. |
| 566 | If None (default), starts with the latest available patchset. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 567 | Returns: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 568 | A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build, |
| 569 | and patchset is the patchset number where those builds came from. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 570 | """ |
| 571 | assert buildbucket_host |
| 572 | assert changelist.GetIssue(), 'CL must be uploaded first' |
| 573 | assert changelist.GetCodereviewServer(), 'CL must be uploaded first' |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 574 | if latest_patchset is None: |
| 575 | assert changelist.GetMostRecentPatchset() |
| 576 | ps = changelist.GetMostRecentPatchset() |
| 577 | else: |
| 578 | assert latest_patchset > 0, latest_patchset |
| 579 | ps = latest_patchset |
| 580 | |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 581 | min_ps = max(1, ps - 5) |
| 582 | while ps >= min_ps: |
| 583 | builds = fetch_try_jobs( |
| 584 | auth_config, changelist, buildbucket_host, patchset=ps) |
| 585 | if len(builds): |
| 586 | return builds, ps |
| 587 | ps -= 1 |
| 588 | return [], 0 |
| 589 | |
| 590 | |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 591 | def _filter_failed_for_retry(all_builds): |
| 592 | """Returns a list of buckets/builders that are worth retrying. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 593 | |
| 594 | Args: |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 595 | all_builds (list): Builds, in the format returned by fetch_try_jobs, |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 596 | i.e. a list of buildbucket.v2.Builds which includes status and builder |
| 597 | info. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 598 | |
| 599 | Returns: |
| 600 | A dict of bucket to builder to tests (empty list). This is the same format |
| 601 | accepted by _trigger_try_jobs and returned by _get_bucket_map. |
| 602 | """ |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 603 | |
| 604 | def _builder_of(build): |
| 605 | builder = build['builder'] |
| 606 | return (builder['project'], builder['bucket'], builder['builder']) |
| 607 | |
| 608 | res = collections.defaultdict(dict) |
| 609 | ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime'])) |
| 610 | for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of): |
| 611 | # If builder had several builds, retry only if the last one failed. |
| 612 | # This is a bit different from CQ, which would re-use *any* SUCCESS-full |
| 613 | # build, but in case of retrying failed jobs retrying a flaky one makes |
| 614 | # sense. |
| 615 | builds = list(builds) |
| 616 | if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'): |
| 617 | continue |
| 618 | if any(t['key'] == 'cq_experimental' and t['value'] == 'true' |
| 619 | for t in builds[-1]['tags']): |
| 620 | # Don't retry experimental build previously triggered by CQ. |
| 621 | continue |
| 622 | if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds): |
| 623 | # Don't retry if any are running. |
| 624 | continue |
| 625 | res[proj + '/' + buck][bldr] = [] |
| 626 | return res |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 627 | |
| 628 | |
qyearsley | eab3c04 | 2016-08-24 09:18:28 -0700 | [diff] [blame] | 629 | def print_try_jobs(options, builds): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 630 | """Prints nicely result of fetch_try_jobs.""" |
| 631 | if not builds: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 632 | print('No tryjobs scheduled.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 633 | return |
| 634 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 635 | longest_builder = max(len(b['builder']['builder']) for b in builds) |
| 636 | name_fmt = '{builder:<%d}' % longest_builder |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 637 | if options.print_master: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 638 | longest_bucket = max(len(b['builder']['bucket']) for b in builds) |
| 639 | name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 640 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 641 | builds_by_status = {} |
| 642 | for b in builds: |
| 643 | builds_by_status.setdefault(b['status'], []).append({ |
| 644 | 'id': b['id'], |
| 645 | 'name': name_fmt.format( |
| 646 | builder=b['builder']['builder'], bucket=b['builder']['bucket']), |
| 647 | }) |
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 | sort_key = lambda b: (b['name'], b['id']) |
| 650 | |
| 651 | def print_builds(title, builds, fmt=None, color=None): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 652 | """Pop matching builds from `builds` dict and print them.""" |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 653 | if not builds: |
| 654 | return |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 655 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 656 | fmt = fmt or '{name} https://ci.chromium.org/b/{id}' |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 657 | if not options.color or color is None: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 658 | colorize = lambda x: x |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 659 | else: |
| 660 | colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET) |
| 661 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 662 | print(colorize(title)) |
| 663 | for b in sorted(builds, key=sort_key): |
| 664 | print(' ', colorize(fmt.format(**b))) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 665 | |
| 666 | total = len(builds) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 667 | print_builds( |
| 668 | 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN) |
| 669 | print_builds( |
| 670 | 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []), |
| 671 | color=Fore.MAGENTA) |
| 672 | print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED) |
| 673 | print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}', |
| 674 | color=Fore.MAGENTA) |
| 675 | print_builds('Started:', builds_by_status.pop('STARTED', [])) |
| 676 | print_builds( |
| 677 | 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 678 | # 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] | 679 | print_builds( |
| 680 | 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 681 | print('Total: %d tryjobs' % total) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 682 | |
| 683 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 684 | def _ComputeDiffLineRanges(files, upstream_commit): |
| 685 | """Gets the changed line ranges for each file since upstream_commit. |
| 686 | |
| 687 | Parses a git diff on provided files and returns a dict that maps a file name |
| 688 | to an ordered list of range tuples in the form (start_line, count). |
| 689 | Ranges are in the same format as a git diff. |
| 690 | """ |
| 691 | # If files is empty then diff_output will be a full diff. |
| 692 | if len(files) == 0: |
| 693 | return {} |
| 694 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 695 | # Take the git diff and find the line ranges where there are changes. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 696 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True) |
| 697 | diff_output = RunGit(diff_cmd) |
| 698 | |
| 699 | pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)' |
| 700 | # 2 capture groups |
| 701 | # 0 == fname of diff file |
| 702 | # 1 == 'diff_start,diff_count' or 'diff_start' |
| 703 | # will match each of |
| 704 | # diff --git a/foo.foo b/foo.py |
| 705 | # @@ -12,2 +14,3 @@ |
| 706 | # @@ -12,2 +17 @@ |
| 707 | # running re.findall on the above string with pattern will give |
| 708 | # [('foo.py', ''), ('', '14,3'), ('', '17')] |
| 709 | |
| 710 | curr_file = None |
| 711 | line_diffs = {} |
| 712 | for match in re.findall(pattern, diff_output, flags=re.MULTILINE): |
| 713 | if match[0] != '': |
| 714 | # Will match the second filename in diff --git a/a.py b/b.py. |
| 715 | curr_file = match[0] |
| 716 | line_diffs[curr_file] = [] |
| 717 | else: |
| 718 | # Matches +14,3 |
| 719 | if ',' in match[1]: |
| 720 | diff_start, diff_count = match[1].split(',') |
| 721 | else: |
| 722 | # Single line changes are of the form +12 instead of +12,1. |
| 723 | diff_start = match[1] |
| 724 | diff_count = 1 |
| 725 | |
| 726 | diff_start = int(diff_start) |
| 727 | diff_count = int(diff_count) |
| 728 | |
| 729 | # If diff_count == 0 this is a removal we can ignore. |
| 730 | line_diffs[curr_file].append((diff_start, diff_count)) |
| 731 | |
| 732 | return line_diffs |
| 733 | |
| 734 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 735 | def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None): |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 736 | """Checks if a yapf file is in any parent directory of fpath until top_dir. |
| 737 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 738 | 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] | 739 | is found returns None. Uses yapf_config_cache as a cache for previously found |
| 740 | configs. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 741 | """ |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 742 | fpath = os.path.abspath(fpath) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 743 | # Return result if we've already computed it. |
| 744 | if fpath in yapf_config_cache: |
| 745 | return yapf_config_cache[fpath] |
| 746 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 747 | parent_dir = os.path.dirname(fpath) |
| 748 | if os.path.isfile(fpath): |
| 749 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 750 | else: |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 751 | # Otherwise fpath is a directory |
| 752 | yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME) |
| 753 | if os.path.isfile(yapf_file): |
| 754 | ret = yapf_file |
| 755 | elif fpath == top_dir or parent_dir == fpath: |
| 756 | # If we're at the top level directory, or if we're at root |
| 757 | # there is no provided style. |
| 758 | ret = None |
| 759 | else: |
| 760 | # Otherwise recurse on the current directory. |
| 761 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 762 | yapf_config_cache[fpath] = ret |
| 763 | return ret |
| 764 | |
| 765 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 766 | def print_stats(args): |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 767 | """Prints statistics about the change to the user.""" |
| 768 | # --no-ext-diff is broken in some versions of Git, so try to work around |
| 769 | # this by overriding the environment (but there is still a problem if the |
| 770 | # git config key "diff.external" is used). |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 771 | env = GetNoGitPagerEnv() |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 772 | if 'GIT_EXTERNAL_DIFF' in env: |
| 773 | del env['GIT_EXTERNAL_DIFF'] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 774 | |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 775 | try: |
| 776 | stdout = sys.stdout.fileno() |
| 777 | except AttributeError: |
| 778 | stdout = None |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 779 | return subprocess2.call( |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 780 | ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args, |
szager@chromium.org | d057f9a | 2014-05-29 21:09:36 +0000 | [diff] [blame] | 781 | stdout=stdout, env=env) |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 782 | |
| 783 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 784 | class BuildbucketResponseException(Exception): |
| 785 | pass |
| 786 | |
| 787 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 788 | class Settings(object): |
| 789 | def __init__(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 790 | self.cc = None |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 791 | self.root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 792 | self.tree_status_url = None |
| 793 | self.viewvc_url = None |
| 794 | self.updated = False |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 795 | self.is_gerrit = None |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 796 | self.squash_gerrit_uploads = None |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 797 | self.gerrit_skip_ensure_authenticated = None |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 798 | self.git_editor = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 799 | |
| 800 | def LazyUpdateIfNeeded(self): |
| 801 | """Updates the settings from a codereview.settings file, if available.""" |
| 802 | if not self.updated: |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 803 | # The only value that actually changes the behavior is |
| 804 | # autoupdate = "false". Everything else means "true". |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 805 | autoupdate = RunGit(['config', 'rietveld.autoupdate'], |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 806 | error_ok=True |
| 807 | ).strip().lower() |
| 808 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 809 | cr_settings_file = FindCodereviewSettingsFile() |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 810 | if autoupdate != 'false' and cr_settings_file: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 811 | LoadCodereviewSettingsFromFile(cr_settings_file) |
| 812 | self.updated = True |
| 813 | |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 814 | @staticmethod |
| 815 | def GetRelativeRoot(): |
| 816 | return RunGit(['rev-parse', '--show-cdup']).strip() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 817 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 818 | def GetRoot(self): |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 819 | if self.root is None: |
| 820 | self.root = os.path.abspath(self.GetRelativeRoot()) |
| 821 | return self.root |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 822 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 823 | def GetTreeStatusUrl(self, error_ok=False): |
| 824 | if not self.tree_status_url: |
| 825 | error_message = ('You must configure your tree status URL by running ' |
| 826 | '"git cl config".') |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 827 | self.tree_status_url = self._GetConfig( |
| 828 | 'rietveld.tree-status-url', error_ok=error_ok, |
| 829 | error_message=error_message) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 830 | return self.tree_status_url |
| 831 | |
| 832 | def GetViewVCUrl(self): |
| 833 | if not self.viewvc_url: |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 834 | self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 835 | return self.viewvc_url |
| 836 | |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 837 | def GetBugPrefix(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 838 | return self._GetConfig('rietveld.bug-prefix', error_ok=True) |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 839 | |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 840 | def GetRunPostUploadHook(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 841 | run_post_upload_hook = self._GetConfig( |
| 842 | 'rietveld.run-post-upload-hook', error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 843 | return run_post_upload_hook == "True" |
| 844 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 845 | def GetDefaultCCList(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 846 | return self._GetConfig('rietveld.cc', error_ok=True) |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 847 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 848 | def GetIsGerrit(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 849 | """Returns True if this repo is associated with Gerrit.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 850 | if self.is_gerrit is None: |
Aaron Gable | 9b46527 | 2017-05-12 10:53:51 -0700 | [diff] [blame] | 851 | self.is_gerrit = ( |
| 852 | self._GetConfig('gerrit.host', error_ok=True).lower() == 'true') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 853 | return self.is_gerrit |
| 854 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 855 | def GetSquashGerritUploads(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 856 | """Returns True if uploads to Gerrit should be squashed by default.""" |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 857 | if self.squash_gerrit_uploads is None: |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 858 | self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride() |
| 859 | if self.squash_gerrit_uploads is None: |
| 860 | # Default is squash now (http://crbug.com/611892#c23). |
| 861 | self.squash_gerrit_uploads = not ( |
| 862 | RunGit(['config', '--bool', 'gerrit.squash-uploads'], |
| 863 | error_ok=True).strip() == 'false') |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 864 | return self.squash_gerrit_uploads |
| 865 | |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 866 | def GetSquashGerritUploadsOverride(self): |
| 867 | """Return True or False if codereview.settings should be overridden. |
| 868 | |
| 869 | Returns None if no override has been defined. |
| 870 | """ |
| 871 | # See also http://crbug.com/611892#c23 |
| 872 | result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'], |
| 873 | error_ok=True).strip() |
| 874 | if result == 'true': |
| 875 | return True |
| 876 | if result == 'false': |
| 877 | return False |
| 878 | return None |
| 879 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 880 | def GetGerritSkipEnsureAuthenticated(self): |
| 881 | """Return True if EnsureAuthenticated should not be done for Gerrit |
| 882 | uploads.""" |
| 883 | if self.gerrit_skip_ensure_authenticated is None: |
| 884 | self.gerrit_skip_ensure_authenticated = ( |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 885 | RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'], |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 886 | error_ok=True).strip() == 'true') |
| 887 | return self.gerrit_skip_ensure_authenticated |
| 888 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 889 | def GetGitEditor(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 890 | """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] | 891 | if self.git_editor is None: |
Raul Tambre | 5a52587 | 2019-02-12 19:08:08 +0000 | [diff] [blame] | 892 | # Git requires single quotes for paths with spaces. We need to replace |
| 893 | # them with double quotes for Windows to treat such paths as a single |
| 894 | # path. |
| 895 | self.git_editor = self._GetConfig( |
| 896 | 'core.editor', error_ok=True).replace('\'', '"') |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 897 | return self.git_editor or None |
| 898 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 899 | def GetLintRegex(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 900 | return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 901 | DEFAULT_LINT_REGEX) |
| 902 | |
| 903 | def GetLintIgnoreRegex(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 904 | return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 905 | DEFAULT_LINT_IGNORE_REGEX) |
| 906 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 907 | def _GetConfig(self, param, **kwargs): |
| 908 | self.LazyUpdateIfNeeded() |
| 909 | return RunGit(['config', param], **kwargs).strip() |
| 910 | |
| 911 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 912 | def ShortBranchName(branch): |
| 913 | """Convert a name like 'refs/heads/foo' to just 'foo'.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 914 | return branch.replace('refs/heads/', '', 1) |
| 915 | |
| 916 | |
| 917 | def GetCurrentBranchRef(): |
| 918 | """Returns branch ref (e.g., refs/heads/master) or None.""" |
| 919 | return RunGit(['symbolic-ref', 'HEAD'], |
| 920 | stderr=subprocess2.VOID, error_ok=True).strip() or None |
| 921 | |
| 922 | |
| 923 | def GetCurrentBranch(): |
| 924 | """Returns current branch or None. |
| 925 | |
| 926 | For refs/heads/* branches, returns just last part. For others, full ref. |
| 927 | """ |
| 928 | branchref = GetCurrentBranchRef() |
| 929 | if branchref: |
| 930 | return ShortBranchName(branchref) |
| 931 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 932 | |
| 933 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 934 | class _CQState(object): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 935 | """Enum for states of CL with respect to CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 936 | NONE = 'none' |
| 937 | DRY_RUN = 'dry_run' |
| 938 | COMMIT = 'commit' |
| 939 | |
| 940 | ALL_STATES = [NONE, DRY_RUN, COMMIT] |
| 941 | |
| 942 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 943 | class _ParsedIssueNumberArgument(object): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 944 | def __init__(self, issue=None, patchset=None, hostname=None): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 945 | self.issue = issue |
| 946 | self.patchset = patchset |
| 947 | self.hostname = hostname |
| 948 | |
| 949 | @property |
| 950 | def valid(self): |
| 951 | return self.issue is not None |
| 952 | |
| 953 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 954 | def ParseIssueNumberArgument(arg): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 955 | """Parses the issue argument and returns _ParsedIssueNumberArgument.""" |
| 956 | fail_result = _ParsedIssueNumberArgument() |
| 957 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 958 | if isinstance(arg, int): |
| 959 | return _ParsedIssueNumberArgument(issue=arg) |
| 960 | if not isinstance(arg, basestring): |
| 961 | return fail_result |
| 962 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 963 | if arg.isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 964 | return _ParsedIssueNumberArgument(issue=int(arg)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 965 | if not arg.startswith('http'): |
| 966 | return fail_result |
Aaron Gable | aee6c85 | 2017-06-26 12:49:01 -0700 | [diff] [blame] | 967 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 968 | url = gclient_utils.UpgradeToHttps(arg) |
| 969 | try: |
| 970 | parsed_url = urlparse.urlparse(url) |
| 971 | except ValueError: |
| 972 | return fail_result |
Andrii Shyshkalov | 28d840e | 2017-04-10 15:45:09 +0200 | [diff] [blame] | 973 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 974 | # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]] |
| 975 | # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]] |
| 976 | # Short urls like https://domain/<issue_number> can be used, but don't allow |
| 977 | # specifying the patchset (you'd 404), but we allow that here. |
| 978 | if parsed_url.path == '/': |
| 979 | part = parsed_url.fragment |
| 980 | else: |
| 981 | part = parsed_url.path |
| 982 | |
| 983 | match = re.match( |
| 984 | r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part) |
| 985 | if not match: |
| 986 | return fail_result |
| 987 | |
| 988 | issue = int(match.group('issue')) |
| 989 | patchset = match.group('patchset') |
| 990 | return _ParsedIssueNumberArgument( |
| 991 | issue=issue, |
| 992 | patchset=int(patchset) if patchset else None, |
| 993 | hostname=parsed_url.netloc) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 994 | |
| 995 | |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 996 | def _create_description_from_log(args): |
| 997 | """Pulls out the commit log to use as a base for the CL description.""" |
| 998 | log_args = [] |
| 999 | if len(args) == 1 and not args[0].endswith('.'): |
| 1000 | log_args = [args[0] + '..'] |
| 1001 | elif len(args) == 1 and args[0].endswith('...'): |
| 1002 | log_args = [args[0][:-1]] |
| 1003 | elif len(args) == 2: |
| 1004 | log_args = [args[0] + '..' + args[1]] |
| 1005 | else: |
| 1006 | log_args = args[:] # Hope for the best! |
| 1007 | return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args) |
| 1008 | |
| 1009 | |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1010 | class GerritChangeNotExists(Exception): |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1011 | def __init__(self, issue, url): |
| 1012 | self.issue = issue |
| 1013 | self.url = url |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1014 | super(GerritChangeNotExists, self).__init__() |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1015 | |
| 1016 | def __str__(self): |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1017 | 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] | 1018 | self.issue, self.url) |
| 1019 | |
| 1020 | |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 1021 | _CommentSummary = collections.namedtuple( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1022 | '_CommentSummary', ['date', 'message', 'sender', 'autogenerated', |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 1023 | # TODO(tandrii): these two aren't known in Gerrit. |
| 1024 | 'approval', 'disapproval']) |
| 1025 | |
| 1026 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1027 | class Changelist(object): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1028 | """Changelist works with one changelist in local branch. |
| 1029 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 1030 | Notes: |
| 1031 | * Not safe for concurrent multi-{thread,process} use. |
| 1032 | * Caches values from current branch. Therefore, re-use after branch change |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1033 | with great care. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1034 | """ |
| 1035 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1036 | def __init__(self, branchref=None, issue=None, codereview_host=None): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1037 | """Create a new ChangeList instance. |
| 1038 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1039 | **kwargs will be passed directly to Gerrit implementation. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1040 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1041 | # 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] | 1042 | global settings |
| 1043 | if not settings: |
| 1044 | # Happens when git_cl.py is used as a utility library. |
| 1045 | settings = Settings() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1046 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1047 | self.branchref = branchref |
| 1048 | if self.branchref: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 1049 | assert branchref.startswith('refs/heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1050 | self.branch = ShortBranchName(self.branchref) |
| 1051 | else: |
| 1052 | self.branch = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1053 | self.upstream_branch = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1054 | self.lookedup_issue = False |
| 1055 | self.issue = issue or None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1056 | self.has_description = False |
| 1057 | self.description = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1058 | self.lookedup_patchset = False |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1059 | self.patchset = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1060 | self.cc = None |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1061 | self.more_cc = [] |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1062 | self._remote = None |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1063 | self._cached_remote_url = (False, None) # (is_cached, value) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1064 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1065 | # Lazily cached values. |
| 1066 | self._gerrit_host = None # e.g. chromium-review.googlesource.com |
| 1067 | self._gerrit_server = None # e.g. https://chromium-review.googlesource.com |
| 1068 | # Map from change number (issue) to its detail cache. |
| 1069 | self._detail_cache = {} |
| 1070 | |
| 1071 | if codereview_host is not None: |
| 1072 | assert not codereview_host.startswith('https://'), codereview_host |
| 1073 | self._gerrit_host = codereview_host |
| 1074 | self._gerrit_server = 'https://%s' % codereview_host |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1075 | |
| 1076 | def GetCCList(self): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1077 | """Returns the users cc'd on this CL. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1078 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1079 | The return value is a string suitable for passing to git cl with the --cc |
| 1080 | flag. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1081 | """ |
| 1082 | if self.cc is None: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1083 | base_cc = settings.GetDefaultCCList() |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1084 | more_cc = ','.join(self.more_cc) |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1085 | self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' |
| 1086 | return self.cc |
| 1087 | |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1088 | def GetCCListWithoutDefault(self): |
| 1089 | """Return the users cc'd on this CL excluding default ones.""" |
| 1090 | if self.cc is None: |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1091 | self.cc = ','.join(self.more_cc) |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 1092 | return self.cc |
| 1093 | |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1094 | def ExtendCC(self, more_cc): |
| 1095 | """Extends the list of users to cc on this CL based on the changed files.""" |
| 1096 | self.more_cc.extend(more_cc) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1097 | |
| 1098 | def GetBranch(self): |
| 1099 | """Returns the short branch name, e.g. 'master'.""" |
| 1100 | if not self.branch: |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1101 | branchref = GetCurrentBranchRef() |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 1102 | if not branchref: |
| 1103 | return None |
| 1104 | self.branchref = branchref |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1105 | self.branch = ShortBranchName(self.branchref) |
| 1106 | return self.branch |
| 1107 | |
| 1108 | def GetBranchRef(self): |
| 1109 | """Returns the full branch name, e.g. 'refs/heads/master'.""" |
| 1110 | self.GetBranch() # Poke the lazy loader. |
| 1111 | return self.branchref |
| 1112 | |
tandrii@chromium.org | 534f67a | 2016-04-07 18:47:05 +0000 | [diff] [blame] | 1113 | def ClearBranch(self): |
| 1114 | """Clears cached branch data of this object.""" |
| 1115 | self.branch = self.branchref = None |
| 1116 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1117 | def _GitGetBranchConfigValue(self, key, default=None, **kwargs): |
| 1118 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1119 | kwargs['branch'] = self.GetBranch() |
| 1120 | return _git_get_branch_config_value(key, default, **kwargs) |
| 1121 | |
| 1122 | def _GitSetBranchConfigValue(self, key, value, **kwargs): |
| 1123 | assert 'branch' not in kwargs, 'this CL branch is used automatically' |
| 1124 | assert self.GetBranch(), ( |
| 1125 | 'this CL must have an associated branch to %sset %s%s' % |
| 1126 | ('un' if value is None else '', |
| 1127 | key, |
| 1128 | '' if value is None else ' to %r' % value)) |
| 1129 | kwargs['branch'] = self.GetBranch() |
| 1130 | return _git_set_branch_config_value(key, value, **kwargs) |
| 1131 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1132 | @staticmethod |
| 1133 | def FetchUpstreamTuple(branch): |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1134 | """Returns a tuple containing remote and remote ref, |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1135 | e.g. 'origin', 'refs/heads/master' |
| 1136 | """ |
| 1137 | remote = '.' |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1138 | upstream_branch = _git_get_branch_config_value('merge', branch=branch) |
| 1139 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1140 | if upstream_branch: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1141 | remote = _git_get_branch_config_value('remote', branch=branch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1142 | else: |
bauerb@chromium.org | ade368c | 2011-03-01 08:57:50 +0000 | [diff] [blame] | 1143 | upstream_branch = RunGit(['config', 'rietveld.upstream-branch'], |
| 1144 | error_ok=True).strip() |
| 1145 | if upstream_branch: |
| 1146 | remote = RunGit(['config', 'rietveld.upstream-remote']).strip() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1147 | else: |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1148 | # Else, try to guess the origin remote. |
| 1149 | remote_branches = RunGit(['branch', '-r']).split() |
| 1150 | if 'origin/master' in remote_branches: |
| 1151 | # Fall back on origin/master if it exits. |
| 1152 | remote = 'origin' |
| 1153 | upstream_branch = 'refs/heads/master' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1154 | else: |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1155 | DieWithError( |
| 1156 | 'Unable to determine default branch to diff against.\n' |
| 1157 | 'Either pass complete "git diff"-style arguments, like\n' |
| 1158 | ' git cl upload origin/master\n' |
| 1159 | 'or verify this branch is set up to track another \n' |
| 1160 | '(via the --track argument to "git checkout -b ...").') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1161 | |
| 1162 | return remote, upstream_branch |
| 1163 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1164 | def GetCommonAncestorWithUpstream(self): |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1165 | upstream_branch = self.GetUpstreamBranch() |
| 1166 | if not BranchExists(upstream_branch): |
| 1167 | DieWithError('The upstream for the current branch (%s) does not exist ' |
| 1168 | 'anymore.\nPlease fix it and try again.' % self.GetBranch()) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 1169 | return git_common.get_or_create_merge_base(self.GetBranch(), |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1170 | upstream_branch) |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1171 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1172 | def GetUpstreamBranch(self): |
| 1173 | if self.upstream_branch is None: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1174 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Raul Tambre | fe1dbe1 | 2019-05-02 04:43:57 +0000 | [diff] [blame] | 1175 | if remote != '.': |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1176 | upstream_branch = upstream_branch.replace('refs/heads/', |
| 1177 | 'refs/remotes/%s/' % remote) |
| 1178 | upstream_branch = upstream_branch.replace('refs/branch-heads/', |
| 1179 | 'refs/remotes/branch-heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1180 | self.upstream_branch = upstream_branch |
| 1181 | return self.upstream_branch |
| 1182 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1183 | def GetRemoteBranch(self): |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1184 | if not self._remote: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1185 | remote, branch = None, self.GetBranch() |
| 1186 | seen_branches = set() |
| 1187 | while branch not in seen_branches: |
| 1188 | seen_branches.add(branch) |
| 1189 | remote, branch = self.FetchUpstreamTuple(branch) |
| 1190 | branch = ShortBranchName(branch) |
| 1191 | if remote != '.' or branch.startswith('refs/remotes'): |
| 1192 | break |
| 1193 | else: |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1194 | remotes = RunGit(['remote'], error_ok=True).split() |
| 1195 | if len(remotes) == 1: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1196 | remote, = remotes |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1197 | elif 'origin' in remotes: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1198 | remote = 'origin' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1199 | logging.warn('Could not determine which remote this change is ' |
| 1200 | 'associated with, so defaulting to "%s".' % self._remote) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1201 | else: |
| 1202 | logging.warn('Could not determine which remote this change is ' |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1203 | 'associated with.') |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1204 | branch = 'HEAD' |
| 1205 | if branch.startswith('refs/remotes'): |
| 1206 | self._remote = (remote, branch) |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1207 | elif branch.startswith('refs/branch-heads/'): |
| 1208 | self._remote = (remote, branch.replace('refs/', 'refs/remotes/')) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1209 | else: |
| 1210 | self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch)) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1211 | return self._remote |
| 1212 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1213 | def GitSanityChecks(self, upstream_git_obj): |
| 1214 | """Checks git repo status and ensures diff is from local commits.""" |
| 1215 | |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1216 | if upstream_git_obj is None: |
| 1217 | if self.GetBranch() is None: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1218 | print('ERROR: Unable to determine current branch (detached HEAD?)', |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1219 | file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1220 | else: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1221 | print('ERROR: No upstream branch.', file=sys.stderr) |
sbc@chromium.org | 7970606 | 2015-01-14 21:18:12 +0000 | [diff] [blame] | 1222 | return False |
| 1223 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1224 | # Verify the commit we're diffing against is in our current branch. |
| 1225 | upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip() |
| 1226 | common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip() |
| 1227 | if upstream_sha != common_ancestor: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1228 | print('ERROR: %s is not in the current branch. You may need to rebase ' |
| 1229 | 'your tracking branch' % upstream_sha, file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1230 | return False |
| 1231 | |
| 1232 | # List the commits inside the diff, and verify they are all local. |
| 1233 | commits_in_diff = RunGit( |
| 1234 | ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines() |
| 1235 | code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch']) |
| 1236 | remote_branch = remote_branch.strip() |
| 1237 | if code != 0: |
| 1238 | _, remote_branch = self.GetRemoteBranch() |
| 1239 | |
| 1240 | commits_in_remote = RunGit( |
| 1241 | ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines() |
| 1242 | |
| 1243 | common_commits = set(commits_in_diff) & set(commits_in_remote) |
| 1244 | if common_commits: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1245 | print('ERROR: Your diff contains %d commits already in %s.\n' |
| 1246 | 'Run "git log --oneline %s..HEAD" to get a list of commits in ' |
| 1247 | 'the diff. If you are using a custom git flow, you can override' |
| 1248 | ' the reference used for this check with "git config ' |
| 1249 | 'gitcl.remotebranch <git-ref>".' % ( |
| 1250 | len(common_commits), remote_branch, upstream_git_obj), |
| 1251 | file=sys.stderr) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1252 | return False |
| 1253 | return True |
| 1254 | |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1255 | def GetGitBaseUrlFromConfig(self): |
sheyang@chromium.org | a656e70 | 2014-05-15 20:43:05 +0000 | [diff] [blame] | 1256 | """Return the configured base URL from branch.<branchname>.baseurl. |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 1257 | |
| 1258 | Returns None if it is not set. |
| 1259 | """ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1260 | return self._GitGetBranchConfigValue('base-url') |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1261 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1262 | def GetRemoteUrl(self): |
| 1263 | """Return the configured remote URL, e.g. 'git://example.org/foo.git/'. |
| 1264 | |
| 1265 | Returns None if there is no remote. |
| 1266 | """ |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1267 | is_cached, value = self._cached_remote_url |
| 1268 | if is_cached: |
| 1269 | return value |
| 1270 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1271 | remote, _ = self.GetRemoteBranch() |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1272 | url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip() |
| 1273 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1274 | # Check if the remote url can be parsed as an URL. |
| 1275 | host = urlparse.urlparse(url).netloc |
| 1276 | if host: |
| 1277 | self._cached_remote_url = (True, url) |
| 1278 | return url |
| 1279 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1280 | # If it cannot be parsed as an url, assume it is a local directory, |
| 1281 | # probably a git cache. |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1282 | logging.warning('"%s" doesn\'t appear to point to a git host. ' |
| 1283 | 'Interpreting it as a local directory.', url) |
| 1284 | if not os.path.isdir(url): |
| 1285 | logging.error( |
| 1286 | 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.', |
Daniel Bratell | 4a60db4 | 2019-09-16 17:02:52 +0000 | [diff] [blame] | 1287 | remote, self.GetBranch(), url) |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1288 | return None |
| 1289 | |
| 1290 | cache_path = url |
| 1291 | url = RunGit(['config', 'remote.%s.url' % remote], |
| 1292 | error_ok=True, |
| 1293 | cwd=url).strip() |
| 1294 | |
| 1295 | host = urlparse.urlparse(url).netloc |
| 1296 | if not host: |
| 1297 | logging.error( |
| 1298 | 'Remote "%(remote)s" for branch "%(branch)s" points to ' |
| 1299 | '"%(cache_path)s", but it is misconfigured.\n' |
| 1300 | '"%(cache_path)s" must be a git repo and must have a remote named ' |
| 1301 | '"%(remote)s" pointing to the git host.', { |
| 1302 | 'remote': remote, |
| 1303 | 'cache_path': cache_path, |
| 1304 | 'branch': self.GetBranch()}) |
| 1305 | return None |
| 1306 | |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1307 | self._cached_remote_url = (True, url) |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1308 | return url |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1309 | |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1310 | def GetIssue(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1311 | """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] | 1312 | if self.issue is None and not self.lookedup_issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1313 | self.issue = self._GitGetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1314 | self.IssueConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1315 | self.lookedup_issue = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1316 | return self.issue |
| 1317 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1318 | def GetIssueURL(self): |
| 1319 | """Get the URL for a particular issue.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1320 | issue = self.GetIssue() |
| 1321 | if not issue: |
dbeam@chromium.org | 015fd3d | 2013-06-18 19:02:50 +0000 | [diff] [blame] | 1322 | return None |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1323 | return '%s/%s' % (self.GetCodereviewServer(), issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1324 | |
Andrii Shyshkalov | 3186301 | 2017-02-08 11:35:12 +0100 | [diff] [blame] | 1325 | def GetDescription(self, pretty=False, force=False): |
| 1326 | if not self.has_description or force: |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1327 | if self.GetIssue(): |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1328 | self.description = self.FetchDescription(force=force) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1329 | self.has_description = True |
| 1330 | if pretty: |
Asanka Herath | 7c61dcb | 2016-12-14 13:01:58 -0500 | [diff] [blame] | 1331 | # Set width to 72 columns + 2 space indent. |
| 1332 | wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1333 | wrapper.initial_indent = wrapper.subsequent_indent = ' ' |
Asanka Herath | 7c61dcb | 2016-12-14 13:01:58 -0500 | [diff] [blame] | 1334 | lines = self.description.splitlines() |
| 1335 | return '\n'.join([wrapper.fill(line) for line in lines]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1336 | return self.description |
| 1337 | |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 1338 | def GetDescriptionFooters(self): |
| 1339 | """Returns (non_footer_lines, footers) for the commit message. |
| 1340 | |
| 1341 | Returns: |
| 1342 | non_footer_lines (list(str)) - Simple list of description lines without |
| 1343 | any footer. The lines do not contain newlines, nor does the list contain |
| 1344 | the empty line between the message and the footers. |
| 1345 | footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g. |
| 1346 | [("Change-Id", "Ideadbeef...."), ...] |
| 1347 | """ |
| 1348 | raw_description = self.GetDescription() |
| 1349 | msg_lines, _, footers = git_footers.split_footers(raw_description) |
| 1350 | if footers: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1351 | msg_lines = msg_lines[:len(msg_lines) - 1] |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 1352 | return msg_lines, footers |
| 1353 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1354 | def GetPatchset(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1355 | """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] | 1356 | if self.patchset is None and not self.lookedup_patchset: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1357 | self.patchset = self._GitGetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1358 | self.PatchsetConfigKey(), value_type=int) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1359 | self.lookedup_patchset = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1360 | return self.patchset |
| 1361 | |
| 1362 | def SetPatchset(self, patchset): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1363 | """Set this branch's patchset. If patchset=0, clears the patchset.""" |
| 1364 | assert self.GetBranch() |
| 1365 | if not patchset: |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1366 | self.patchset = None |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1367 | else: |
| 1368 | self.patchset = int(patchset) |
| 1369 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1370 | self.PatchsetConfigKey(), self.patchset) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1371 | |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 1372 | def SetIssue(self, issue=None): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1373 | """Set this branch's issue. If issue isn't given, clears the issue.""" |
| 1374 | assert self.GetBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1375 | if issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1376 | issue = int(issue) |
| 1377 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1378 | self.IssueConfigKey(), issue) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1379 | self.issue = issue |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1380 | codereview_server = self.GetCodereviewServer() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1381 | if codereview_server: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1382 | self._GitSetBranchConfigValue( |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1383 | self.CodereviewServerConfigKey(), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1384 | codereview_server) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1385 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1386 | # Reset all of these just to be clean. |
| 1387 | reset_suffixes = [ |
| 1388 | 'last-upload-hash', |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1389 | self.IssueConfigKey(), |
| 1390 | self.PatchsetConfigKey(), |
| 1391 | self.CodereviewServerConfigKey(), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1392 | ] + self._PostUnsetIssueProperties() |
| 1393 | for prop in reset_suffixes: |
| 1394 | self._GitSetBranchConfigValue(prop, None, error_ok=True) |
Aaron Gable | ca01e2c | 2017-07-19 11:16:02 -0700 | [diff] [blame] | 1395 | msg = RunGit(['log', '-1', '--format=%B']).strip() |
| 1396 | if msg and git_footers.get_footer_change_id(msg): |
| 1397 | print('WARNING: The change patched into this branch has a Change-Id. ' |
| 1398 | 'Removing it.') |
| 1399 | RunGit(['commit', '--amend', '-m', |
| 1400 | git_footers.remove_footer(msg, 'Change-Id')]) |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1401 | self.lookedup_issue = True |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1402 | self.issue = None |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1403 | self.patchset = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1404 | |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 1405 | def GetChange(self, upstream_branch, author, local_description=False): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1406 | if not self.GitSanityChecks(upstream_branch): |
| 1407 | DieWithError('\nGit sanity check failure') |
| 1408 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1409 | root = settings.GetRelativeRoot() |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 1410 | if not root: |
| 1411 | root = '.' |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 1412 | absroot = os.path.abspath(root) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1413 | |
| 1414 | # 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] | 1415 | name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip() |
bauerb@chromium.org | 512f1ef | 2011-04-20 15:17:57 +0000 | [diff] [blame] | 1416 | # Need to pass a relative path for msysgit. |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1417 | try: |
maruel@chromium.org | 80a9ef1 | 2011-12-13 20:44:10 +0000 | [diff] [blame] | 1418 | files = scm.GIT.CaptureStatus([root], '.', upstream_branch) |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1419 | except subprocess2.CalledProcessError: |
| 1420 | DieWithError( |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1421 | ('\nFailed to diff against upstream branch %s\n\n' |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1422 | 'This branch probably doesn\'t exist anymore. To reset the\n' |
| 1423 | 'tracking branch, please run\n' |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 1424 | ' git branch --set-upstream-to origin/master %s\n' |
| 1425 | 'or replace origin/master with the relevant branch') % |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1426 | (upstream_branch, self.GetBranch())) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1427 | |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1428 | issue = self.GetIssue() |
| 1429 | patchset = self.GetPatchset() |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 1430 | if issue and not local_description: |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1431 | description = self.GetDescription() |
| 1432 | else: |
| 1433 | # If the change was never uploaded, use the log messages of all commits |
| 1434 | # up to the branch point, as git cl upload will prefill the description |
| 1435 | # with these log messages. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1436 | args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)] |
| 1437 | description = RunGitWithCode(args)[1].strip() |
maruel@chromium.org | 03b3bdc | 2011-06-14 13:04:12 +0000 | [diff] [blame] | 1438 | |
| 1439 | if not author: |
maruel@chromium.org | 13f623c | 2011-07-22 16:02:23 +0000 | [diff] [blame] | 1440 | author = RunGit(['config', 'user.email']).strip() or None |
asvitkine@chromium.org | 1516995 | 2011-09-27 14:30:53 +0000 | [diff] [blame] | 1441 | return presubmit_support.GitChange( |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1442 | name, |
| 1443 | description, |
| 1444 | absroot, |
| 1445 | files, |
| 1446 | issue, |
| 1447 | patchset, |
agable@chromium.org | ea84ef1 | 2014-04-30 19:55:12 +0000 | [diff] [blame] | 1448 | author, |
| 1449 | upstream=upstream_branch) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1450 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1451 | def UpdateDescription(self, description, force=False): |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1452 | self.UpdateDescriptionRemote(description, force=force) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1453 | self.description = description |
Andrii Shyshkalov | 8305115 | 2017-02-07 23:47:29 +0100 | [diff] [blame] | 1454 | self.has_description = True |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1455 | |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 1456 | def UpdateDescriptionFooters(self, description_lines, footers, force=False): |
| 1457 | """Sets the description for this CL remotely. |
| 1458 | |
| 1459 | You can get description_lines and footers with GetDescriptionFooters. |
| 1460 | |
| 1461 | Args: |
| 1462 | description_lines (list(str)) - List of CL description lines without |
| 1463 | newline characters. |
| 1464 | footers (list(tuple(KEY, VALUE))) - List of footers, as returned by |
| 1465 | GetDescriptionFooters. Key must conform to the git footers format (i.e. |
| 1466 | `List-Of-Tokens`). It will be case-normalized so that each token is |
| 1467 | title-cased. |
| 1468 | """ |
| 1469 | new_description = '\n'.join(description_lines) |
| 1470 | if footers: |
| 1471 | new_description += '\n' |
| 1472 | for k, v in footers: |
| 1473 | foot = '%s: %s' % (git_footers.normalize_name(k), v) |
| 1474 | if not git_footers.FOOTER_PATTERN.match(foot): |
| 1475 | raise ValueError('Invalid footer %r' % foot) |
| 1476 | new_description += foot + '\n' |
| 1477 | self.UpdateDescription(new_description, force) |
| 1478 | |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1479 | def RunHook(self, committing, may_prompt, verbose, change, parallel): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1480 | """Calls sys.exit() if the hook fails; returns a HookResults otherwise.""" |
| 1481 | try: |
Edward Lemur | 2c48f24 | 2019-06-04 16:14:09 +0000 | [diff] [blame] | 1482 | start = time_time() |
| 1483 | result = presubmit_support.DoPresubmitChecks(change, committing, |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1484 | verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin, |
| 1485 | default_presubmit=None, may_prompt=may_prompt, |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1486 | gerrit_obj=self.GetGerritObjForPresubmit(), |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1487 | parallel=parallel) |
Edward Lemur | 2c48f24 | 2019-06-04 16:14:09 +0000 | [diff] [blame] | 1488 | metrics.collector.add_repeated('sub_commands', { |
| 1489 | 'command': 'presubmit', |
| 1490 | 'execution_time': time_time() - start, |
| 1491 | 'exit_code': 0 if result.should_continue() else 1, |
| 1492 | }) |
| 1493 | return result |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 1494 | except presubmit_support.PresubmitFailure as e: |
Aaron Gable | 5d5f22c | 2018-02-02 09:12:41 -0800 | [diff] [blame] | 1495 | DieWithError('%s\nMaybe your depot_tools is out of date?' % e) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1496 | |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1497 | def CMDUpload(self, options, git_diff_args, orig_args): |
| 1498 | """Uploads a change to codereview.""" |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1499 | custom_cl_base = None |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1500 | if git_diff_args: |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1501 | custom_cl_base = base_branch = git_diff_args[0] |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1502 | else: |
| 1503 | if self.GetBranch() is None: |
| 1504 | DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') |
| 1505 | |
| 1506 | # Default to diffing against common ancestor of upstream branch |
| 1507 | base_branch = self.GetCommonAncestorWithUpstream() |
| 1508 | git_diff_args = [base_branch, 'HEAD'] |
| 1509 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1510 | # Fast best-effort checks to abort before running potentially expensive |
| 1511 | # hooks if uploading is likely to fail anyway. Passing these checks does |
| 1512 | # not guarantee that uploading will not fail. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1513 | self.EnsureAuthenticated(force=options.force) |
| 1514 | self.EnsureCanUploadPatchset(force=options.force) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1515 | |
| 1516 | # Apply watchlists on upload. |
| 1517 | change = self.GetChange(base_branch, None) |
| 1518 | watchlist = watchlists.Watchlists(change.RepositoryRoot()) |
| 1519 | files = [f.LocalPath() for f in change.AffectedFiles()] |
| 1520 | if not options.bypass_watchlists: |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1521 | self.ExtendCC(watchlist.GetWatchersForPaths(files)) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1522 | |
| 1523 | if not options.bypass_hooks: |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1524 | if options.reviewers or options.tbrs or options.add_owners_to: |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1525 | # Set the reviewer list now so that presubmit checks can access it. |
| 1526 | change_description = ChangeDescription(change.FullDescriptionText()) |
| 1527 | change_description.update_reviewers(options.reviewers, |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1528 | options.tbrs, |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 1529 | options.add_owners_to, |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1530 | change) |
| 1531 | change.SetDescriptionText(change_description.description) |
| 1532 | hook_results = self.RunHook(committing=False, |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 1533 | may_prompt=not options.force, |
| 1534 | verbose=options.verbose, |
| 1535 | change=change, parallel=options.parallel) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1536 | if not hook_results.should_continue(): |
| 1537 | return 1 |
| 1538 | if not options.reviewers and hook_results.reviewers: |
| 1539 | options.reviewers = hook_results.reviewers.split(',') |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1540 | self.ExtendCC(hook_results.more_cc) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1541 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 1542 | print_stats(git_diff_args) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1543 | ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1544 | if not ret: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1545 | _git_set_branch_config_value('last-upload-hash', |
| 1546 | RunGit(['rev-parse', 'HEAD']).strip()) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1547 | # Run post upload hooks, if specified. |
| 1548 | if settings.GetRunPostUploadHook(): |
| 1549 | presubmit_support.DoPostUploadExecuter( |
| 1550 | change, |
| 1551 | self, |
| 1552 | settings.GetRoot(), |
| 1553 | options.verbose, |
| 1554 | sys.stdout) |
| 1555 | |
| 1556 | # Upload all dependencies if specified. |
| 1557 | if options.dependencies: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1558 | print() |
| 1559 | print('--dependencies has been specified.') |
| 1560 | print('All dependent local branches will be re-uploaded.') |
| 1561 | print() |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1562 | # Remove the dependencies flag from args so that we do not end up in a |
| 1563 | # loop. |
| 1564 | orig_args.remove('--dependencies') |
| 1565 | ret = upload_branch_deps(self, orig_args) |
| 1566 | return ret |
| 1567 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1568 | def SetCQState(self, new_state): |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1569 | """Updates the CQ state for the latest patchset. |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1570 | |
| 1571 | Issue must have been already uploaded and known. |
| 1572 | """ |
| 1573 | assert new_state in _CQState.ALL_STATES |
| 1574 | assert self.GetIssue() |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1575 | try: |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1576 | vote_map = { |
| 1577 | _CQState.NONE: 0, |
| 1578 | _CQState.DRY_RUN: 1, |
| 1579 | _CQState.COMMIT: 2, |
| 1580 | } |
| 1581 | labels = {'Commit-Queue': vote_map[new_state]} |
| 1582 | notify = False if new_state == _CQState.DRY_RUN else None |
| 1583 | gerrit_util.SetReview( |
| 1584 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1585 | labels=labels, notify=notify) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1586 | return 0 |
| 1587 | except KeyboardInterrupt: |
| 1588 | raise |
| 1589 | except: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1590 | print('WARNING: Failed to %s.\n' |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1591 | 'Either:\n' |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1592 | ' * Your project has no CQ,\n' |
| 1593 | ' * You don\'t have permission to change the CQ state,\n' |
| 1594 | ' * There\'s a bug in this code (see stack trace below).\n' |
| 1595 | 'Consider specifying which bots to trigger manually or asking your ' |
| 1596 | 'project owners for permissions or contacting Chrome Infra at:\n' |
| 1597 | 'https://www.chromium.org/infra\n\n' % |
| 1598 | ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ')) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1599 | # Still raise exception so that stack trace is printed. |
| 1600 | raise |
| 1601 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1602 | def _GetGerritHost(self): |
| 1603 | # Lazy load of configs. |
| 1604 | self.GetCodereviewServer() |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1605 | if self._gerrit_host and '.' not in self._gerrit_host: |
| 1606 | # Abbreviated domain like "chromium" instead of chromium.googlesource.com. |
| 1607 | # This happens for internal stuff http://crbug.com/614312. |
| 1608 | parsed = urlparse.urlparse(self.GetRemoteUrl()) |
| 1609 | if parsed.scheme == 'sso': |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1610 | print('WARNING: using non-https URLs for remote is likely broken\n' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1611 | ' Your current remote is: %s' % self.GetRemoteUrl()) |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1612 | self._gerrit_host = '%s.googlesource.com' % self._gerrit_host |
| 1613 | self._gerrit_server = 'https://%s' % self._gerrit_host |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1614 | return self._gerrit_host |
| 1615 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1616 | def _GetGitHost(self): |
| 1617 | """Returns git host to be used when uploading change to Gerrit.""" |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1618 | remote_url = self.GetRemoteUrl() |
| 1619 | if not remote_url: |
| 1620 | return None |
| 1621 | return urlparse.urlparse(remote_url).netloc |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1622 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1623 | def GetCodereviewServer(self): |
| 1624 | if not self._gerrit_server: |
| 1625 | # If we're on a branch then get the server potentially associated |
| 1626 | # with that branch. |
| 1627 | if self.GetIssue(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1628 | self._gerrit_server = self._GitGetBranchConfigValue( |
| 1629 | self.CodereviewServerConfigKey()) |
| 1630 | if self._gerrit_server: |
| 1631 | self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1632 | if not self._gerrit_server: |
| 1633 | # We assume repo to be hosted on Gerrit, and hence Gerrit server |
| 1634 | # has "-review" suffix for lowest level subdomain. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1635 | parts = self._GetGitHost().split('.') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1636 | parts[0] = parts[0] + '-review' |
| 1637 | self._gerrit_host = '.'.join(parts) |
| 1638 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 1639 | return self._gerrit_server |
| 1640 | |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1641 | def _GetGerritProject(self): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1642 | """Returns Gerrit project name based on remote git URL.""" |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1643 | remote_url = self.GetRemoteUrl() |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1644 | if remote_url is None: |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1645 | logging.warn('can\'t detect Gerrit project.') |
| 1646 | return None |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1647 | project = urlparse.urlparse(remote_url).path.strip('/') |
| 1648 | if project.endswith('.git'): |
| 1649 | project = project[:-len('.git')] |
Andrii Shyshkalov | 1e82867 | 2018-08-23 22:34:37 +0000 | [diff] [blame] | 1650 | # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with |
| 1651 | # 'a/' prefix, because 'a/' prefix is used to force authentication in |
| 1652 | # gitiles/git-over-https protocol. E.g., |
| 1653 | # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project |
| 1654 | # as |
| 1655 | # https://chromium.googlesource.com/v8/v8 |
| 1656 | if project.startswith('a/'): |
| 1657 | project = project[len('a/'):] |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1658 | return project |
| 1659 | |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1660 | def _GerritChangeIdentifier(self): |
| 1661 | """Handy method for gerrit_util.ChangeIdentifier for a given CL. |
| 1662 | |
| 1663 | Not to be confused by value of "Change-Id:" footer. |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1664 | 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] | 1665 | """ |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1666 | project = self._GetGerritProject() |
| 1667 | if project: |
| 1668 | return gerrit_util.ChangeIdentifier(project, self.GetIssue()) |
| 1669 | # Fall back on still unique, but less efficient change number. |
| 1670 | return str(self.GetIssue()) |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1671 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1672 | @classmethod |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1673 | def IssueConfigKey(cls): |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1674 | return 'gerritissue' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1675 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1676 | @classmethod |
| 1677 | def PatchsetConfigKey(cls): |
| 1678 | return 'gerritpatchset' |
| 1679 | |
| 1680 | @classmethod |
| 1681 | def CodereviewServerConfigKey(cls): |
| 1682 | return 'gerritserver' |
| 1683 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 1684 | def EnsureAuthenticated(self, force, refresh=None): |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1685 | """Best effort check that user is authenticated with Gerrit server.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1686 | if settings.GetGerritSkipEnsureAuthenticated(): |
| 1687 | # For projects with unusual authentication schemes. |
| 1688 | # See http://crbug.com/603378. |
| 1689 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1690 | |
| 1691 | # Check presence of cookies only if using cookies-based auth method. |
| 1692 | cookie_auth = gerrit_util.Authenticator.get() |
| 1693 | if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1694 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1695 | |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1696 | if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https': |
| 1697 | print('WARNING: Ignoring branch %s with non-https remote %s' % |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1698 | (self.branch, self.GetRemoteUrl())) |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1699 | return |
| 1700 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1701 | # Lazy-loader to identify Gerrit and Git hosts. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1702 | self.GetCodereviewServer() |
| 1703 | git_host = self._GetGitHost() |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1704 | assert self._gerrit_server and self._gerrit_host and git_host |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1705 | |
| 1706 | gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host) |
| 1707 | git_auth = cookie_auth.get_auth_header(git_host) |
| 1708 | if gerrit_auth and git_auth: |
| 1709 | if gerrit_auth == git_auth: |
| 1710 | return |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1711 | all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com') |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1712 | print( |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1713 | 'WARNING: You have different credentials for Gerrit and git hosts:\n' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1714 | ' %s\n' |
| 1715 | ' %s\n' |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1716 | ' Consider running the following command:\n' |
| 1717 | ' git cl creds-check\n' |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1718 | ' %s\n' |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1719 | ' %s' % |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1720 | (git_host, self._gerrit_host, |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1721 | ('Hint: delete creds for .googlesource.com' if all_gsrc else ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1722 | cookie_auth.get_new_password_message(git_host))) |
| 1723 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1724 | 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] | 1725 | return |
| 1726 | else: |
| 1727 | missing = ( |
Anna Henningsen | 4e89144 | 2017-07-06 21:40:58 +0200 | [diff] [blame] | 1728 | ([] if gerrit_auth else [self._gerrit_host]) + |
| 1729 | ([] if git_auth else [git_host])) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1730 | DieWithError('Credentials for the following hosts are required:\n' |
| 1731 | ' %s\n' |
| 1732 | 'These are read from %s (or legacy %s)\n' |
| 1733 | '%s' % ( |
| 1734 | '\n '.join(missing), |
| 1735 | cookie_auth.get_gitcookies_path(), |
| 1736 | cookie_auth.get_netrc_path(), |
| 1737 | cookie_auth.get_new_password_message(git_host))) |
| 1738 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1739 | def EnsureCanUploadPatchset(self, force): |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1740 | if not self.GetIssue(): |
| 1741 | return |
| 1742 | |
| 1743 | # Warm change details cache now to avoid RPCs later, reducing latency for |
| 1744 | # developers. |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1745 | self._GetChangeDetail( |
Andrii Shyshkalov | c4a7356 | 2018-09-25 18:40:17 +0000 | [diff] [blame] | 1746 | ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']) |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1747 | |
| 1748 | status = self._GetChangeDetail()['status'] |
| 1749 | if status in ('MERGED', 'ABANDONED'): |
| 1750 | DieWithError('Change %s has been %s, new uploads are not allowed' % |
| 1751 | (self.GetIssueURL(), |
| 1752 | 'submitted' if status == 'MERGED' else 'abandoned')) |
| 1753 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1754 | # TODO(vadimsh): For some reason the chunk of code below was skipped if |
| 1755 | # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'. |
| 1756 | # Apparently this check is not very important? Otherwise get_auth_email |
| 1757 | # could have been added to other implementations of Authenticator. |
| 1758 | cookies_auth = gerrit_util.Authenticator.get() |
| 1759 | if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator): |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1760 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1761 | |
| 1762 | cookies_user = cookies_auth.get_auth_email(self._GetGerritHost()) |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1763 | if self.GetIssueOwner() == cookies_user: |
| 1764 | return |
| 1765 | logging.debug('change %s owner is %s, cookies user is %s', |
| 1766 | self.GetIssue(), self.GetIssueOwner(), cookies_user) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1767 | # Maybe user has linked accounts or something like that, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1768 | # so ask what Gerrit thinks of this user. |
| 1769 | details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self') |
| 1770 | if details['email'] == self.GetIssueOwner(): |
| 1771 | return |
| 1772 | if not force: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1773 | 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] | 1774 | 'as %s.\n' |
| 1775 | 'Uploading may fail due to lack of permissions.' % |
| 1776 | (self.GetIssue(), self.GetIssueOwner(), details['email'])) |
| 1777 | confirm_or_exit(action='upload') |
| 1778 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1779 | def _PostUnsetIssueProperties(self): |
| 1780 | """Which branch-specific properties to erase when unsetting issue.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1781 | return ['gerritsquashhash'] |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1782 | |
tandrii@chromium.org | 37b07a7 | 2016-04-29 16:42:28 +0000 | [diff] [blame] | 1783 | def GetGerritObjForPresubmit(self): |
| 1784 | return presubmit_support.GerritAccessor(self._GetGerritHost()) |
| 1785 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1786 | def GetStatus(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1787 | """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] | 1788 | or CQ status, assuming adherence to a common workflow. |
| 1789 | |
| 1790 | 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] | 1791 | * 'error' - error from review tool (including deleted issues) |
| 1792 | * 'unsent' - no reviewers added |
| 1793 | * 'waiting' - waiting for review |
| 1794 | * 'reply' - waiting for uploader to reply to review |
| 1795 | * 'lgtm' - Code-Review label has been set |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 1796 | * 'dry-run' - dry-running in the CQ |
| 1797 | * 'commit' - in the CQ |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1798 | * 'closed' - successfully submitted or abandoned |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1799 | """ |
| 1800 | if not self.GetIssue(): |
| 1801 | return None |
| 1802 | |
| 1803 | try: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1804 | data = self._GetChangeDetail([ |
| 1805 | 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE']) |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 1806 | except (httplib.HTTPException, GerritChangeNotExists): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1807 | return 'error' |
| 1808 | |
tandrii@chromium.org | 5e1bf38 | 2016-05-17 08:43:24 +0000 | [diff] [blame] | 1809 | if data['status'] in ('ABANDONED', 'MERGED'): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1810 | return 'closed' |
| 1811 | |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 1812 | cq_label = data['labels'].get('Commit-Queue', {}) |
| 1813 | max_cq_vote = 0 |
| 1814 | for vote in cq_label.get('all', []): |
| 1815 | max_cq_vote = max(max_cq_vote, vote.get('value', 0)) |
| 1816 | if max_cq_vote == 2: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1817 | return 'commit' |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 1818 | if max_cq_vote == 1: |
| 1819 | return 'dry-run' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1820 | |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1821 | if data['labels'].get('Code-Review', {}).get('approved'): |
| 1822 | return 'lgtm' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1823 | |
| 1824 | if not data.get('reviewers', {}).get('REVIEWER', []): |
| 1825 | return 'unsent' |
| 1826 | |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1827 | owner = data['owner'].get('_account_id') |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1828 | messages = sorted(data.get('messages', []), key=lambda m: m.get('updated')) |
| 1829 | last_message_author = messages.pop().get('author', {}) |
| 1830 | while last_message_author: |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1831 | if last_message_author.get('email') == COMMIT_BOT_EMAIL: |
| 1832 | # Ignore replies from CQ. |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1833 | last_message_author = messages.pop().get('author', {}) |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 1834 | continue |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1835 | if last_message_author.get('_account_id') == owner: |
| 1836 | # Most recent message was by owner. |
| 1837 | return 'waiting' |
| 1838 | else: |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1839 | # Some reply from non-owner. |
| 1840 | return 'reply' |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 1841 | |
| 1842 | # Somehow there are no messages even though there are reviewers. |
| 1843 | return 'unsent' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1844 | |
| 1845 | def GetMostRecentPatchset(self): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 1846 | data = self._GetChangeDetail(['CURRENT_REVISION']) |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 1847 | patchset = data['revisions'][data['current_revision']]['_number'] |
| 1848 | self.SetPatchset(patchset) |
| 1849 | return patchset |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1850 | |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 1851 | def FetchDescription(self, force=False): |
| 1852 | data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'], |
| 1853 | no_cache=force) |
tandrii@chromium.org | 2d3da63 | 2016-04-25 19:23:27 +0000 | [diff] [blame] | 1854 | current_rev = data['current_revision'] |
Dan Beam | cf6df90 | 2018-11-08 01:48:37 +0000 | [diff] [blame] | 1855 | return data['revisions'][current_rev]['commit']['message'].encode( |
| 1856 | 'utf-8', 'ignore') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1857 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1858 | def UpdateDescriptionRemote(self, description, force=False): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1859 | if gerrit_util.HasPendingChangeEdit( |
| 1860 | self._GetGerritHost(), self._GerritChangeIdentifier()): |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1861 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1862 | confirm_or_exit( |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1863 | 'The description cannot be modified while the issue has a pending ' |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1864 | 'unpublished edit. Either publish the edit in the Gerrit web UI ' |
| 1865 | 'or delete it.\n\n', action='delete the unpublished edit') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1866 | |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1867 | gerrit_util.DeletePendingChangeEdit( |
| 1868 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
| 1869 | gerrit_util.SetCommitMessage( |
| 1870 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1871 | description, notify='NONE') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1872 | |
Aaron Gable | 636b13f | 2017-07-14 10:42:48 -0700 | [diff] [blame] | 1873 | def AddComment(self, message, publish=None): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1874 | gerrit_util.SetReview( |
| 1875 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1876 | msg=message, ready=publish) |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 1877 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1878 | def GetCommentsSummary(self, readable=True): |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 1879 | # DETAILED_ACCOUNTS is to get emails in accounts. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1880 | # CURRENT_REVISION is included to get the latest patchset so that |
| 1881 | # only the robot comments from the latest patchset can be shown. |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1882 | messages = self._GetChangeDetail( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1883 | options=['MESSAGES', 'DETAILED_ACCOUNTS', |
| 1884 | 'CURRENT_REVISION']).get('messages', []) |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1885 | file_comments = gerrit_util.GetChangeComments( |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1886 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1887 | robot_file_comments = gerrit_util.GetChangeRobotComments( |
| 1888 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
| 1889 | |
| 1890 | # Add the robot comments onto the list of comments, but only |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 1891 | # keep those that are from the latest patchset. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1892 | latest_patch_set = self.GetMostRecentPatchset() |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 1893 | for path, robot_comments in robot_file_comments.items(): |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1894 | line_comments = file_comments.setdefault(path, []) |
| 1895 | line_comments.extend( |
| 1896 | [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] | 1897 | |
| 1898 | # Build dictionary of file comments for easy access and sorting later. |
| 1899 | # {author+date: {path: {patchset: {line: url+message}}}} |
| 1900 | comments = collections.defaultdict( |
| 1901 | lambda: collections.defaultdict(lambda: collections.defaultdict(dict))) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 1902 | for path, line_comments in file_comments.items(): |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1903 | for comment in line_comments: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1904 | tag = comment.get('tag', '') |
| 1905 | if tag.startswith('autogenerated') and 'robot_id' not in comment: |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1906 | continue |
| 1907 | key = (comment['author']['email'], comment['updated']) |
| 1908 | if comment.get('side', 'REVISION') == 'PARENT': |
| 1909 | patchset = 'Base' |
| 1910 | else: |
| 1911 | patchset = 'PS%d' % comment['patch_set'] |
| 1912 | line = comment.get('line', 0) |
| 1913 | url = ('https://%s/c/%s/%s/%s#%s%s' % |
| 1914 | (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path, |
| 1915 | 'b' if comment.get('side') == 'PARENT' else '', |
| 1916 | str(line) if line else '')) |
| 1917 | comments[key][path][patchset][line] = (url, comment['message']) |
| 1918 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1919 | summaries = [] |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1920 | for msg in messages: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1921 | summary = self._BuildCommentSummary(msg, comments, readable) |
| 1922 | if summary: |
| 1923 | summaries.append(summary) |
| 1924 | return summaries |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 1925 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 1926 | @staticmethod |
| 1927 | def _BuildCommentSummary(msg, comments, readable): |
| 1928 | key = (msg['author']['email'], msg['date']) |
| 1929 | # Don't bother showing autogenerated messages that don't have associated |
| 1930 | # file or line comments. this will filter out most autogenerated |
| 1931 | # messages, but will keep robot comments like those from Tricium. |
| 1932 | is_autogenerated = msg.get('tag', '').startswith('autogenerated') |
| 1933 | if is_autogenerated and not comments.get(key): |
| 1934 | return None |
| 1935 | message = msg['message'] |
| 1936 | # Gerrit spits out nanoseconds. |
| 1937 | assert len(msg['date'].split('.')[-1]) == 9 |
| 1938 | date = datetime.datetime.strptime(msg['date'][:-3], |
| 1939 | '%Y-%m-%d %H:%M:%S.%f') |
| 1940 | if key in comments: |
| 1941 | message += '\n' |
| 1942 | for path, patchsets in sorted(comments.get(key, {}).items()): |
| 1943 | if readable: |
| 1944 | message += '\n%s' % path |
| 1945 | for patchset, lines in sorted(patchsets.items()): |
| 1946 | for line, (url, content) in sorted(lines.items()): |
| 1947 | if line: |
| 1948 | line_str = 'Line %d' % line |
| 1949 | path_str = '%s:%d:' % (path, line) |
| 1950 | else: |
| 1951 | line_str = 'File comment' |
| 1952 | path_str = '%s:0:' % path |
| 1953 | if readable: |
| 1954 | message += '\n %s, %s: %s' % (patchset, line_str, url) |
| 1955 | message += '\n %s\n' % content |
| 1956 | else: |
| 1957 | message += '\n%s ' % path_str |
| 1958 | message += '\n%s\n' % content |
| 1959 | |
| 1960 | return _CommentSummary( |
| 1961 | date=date, |
| 1962 | message=message, |
| 1963 | sender=msg['author']['email'], |
| 1964 | autogenerated=is_autogenerated, |
| 1965 | # These could be inferred from the text messages and correlated with |
| 1966 | # Code-Review label maximum, however this is not reliable. |
| 1967 | # Leaving as is until the need arises. |
| 1968 | approval=False, |
| 1969 | disapproval=False, |
| 1970 | ) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 1971 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1972 | def CloseIssue(self): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1973 | gerrit_util.AbandonChange( |
| 1974 | self._GetGerritHost(), self._GerritChangeIdentifier(), msg='') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1975 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 1976 | def SubmitIssue(self, wait_for_merge=True): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 1977 | gerrit_util.SubmitChange( |
| 1978 | self._GetGerritHost(), self._GerritChangeIdentifier(), |
| 1979 | wait_for_merge=wait_for_merge) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1980 | |
Andrii Shyshkalov | b721460 | 2018-08-22 23:20:26 +0000 | [diff] [blame] | 1981 | def _GetChangeDetail(self, options=None, no_cache=False): |
| 1982 | """Returns details of associated Gerrit change and caching results. |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 1983 | |
| 1984 | If fresh data is needed, set no_cache=True which will clear cache and |
| 1985 | thus new data will be fetched from Gerrit. |
| 1986 | """ |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 1987 | options = options or [] |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 1988 | assert self.GetIssue(), 'issue is required to query Gerrit' |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 1989 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 1990 | # Optimization to avoid multiple RPCs: |
| 1991 | if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and |
| 1992 | 'CURRENT_COMMIT' not in options): |
| 1993 | options.append('CURRENT_COMMIT') |
| 1994 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 1995 | # Normalize issue and options for consistent keys in cache. |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 1996 | cache_key = str(self.GetIssue()) |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 1997 | options = [o.upper() for o in options] |
| 1998 | |
| 1999 | # Check in cache first unless no_cache is True. |
| 2000 | if no_cache: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2001 | self._detail_cache.pop(cache_key, None) |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2002 | else: |
| 2003 | options_set = frozenset(options) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2004 | for cached_options_set, data in self._detail_cache.get(cache_key, []): |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2005 | # Assumption: data fetched before with extra options is suitable |
| 2006 | # for return for a smaller set of options. |
| 2007 | # For example, if we cached data for |
| 2008 | # options=[CURRENT_REVISION, DETAILED_FOOTERS] |
| 2009 | # and request is for options=[CURRENT_REVISION], |
| 2010 | # THEN we can return prior cached data. |
| 2011 | if options_set.issubset(cached_options_set): |
| 2012 | return data |
| 2013 | |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2014 | try: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2015 | data = gerrit_util.GetChangeDetail( |
| 2016 | self._GetGerritHost(), self._GerritChangeIdentifier(), options) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2017 | except gerrit_util.GerritError as e: |
| 2018 | if e.http_status == 404: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2019 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2020 | raise |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2021 | |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2022 | self._detail_cache.setdefault(cache_key, []).append( |
| 2023 | (frozenset(options), data)) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2024 | return data |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2025 | |
Andrii Shyshkalov | cc5f17e | 2018-08-22 23:35:59 +0000 | [diff] [blame] | 2026 | def _GetChangeCommit(self): |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2027 | assert self.GetIssue(), 'issue must be set to query Gerrit' |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2028 | try: |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2029 | data = gerrit_util.GetChangeCommit( |
| 2030 | self._GetGerritHost(), self._GerritChangeIdentifier()) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2031 | except gerrit_util.GerritError as e: |
| 2032 | if e.http_status == 404: |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2033 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2034 | raise |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2035 | return data |
| 2036 | |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2037 | def _IsCqConfigured(self): |
| 2038 | detail = self._GetChangeDetail(['LABELS']) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2039 | if u'Commit-Queue' not in detail.get('labels', {}): |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2040 | return False |
| 2041 | # TODO(crbug/753213): Remove temporary hack |
| 2042 | if ('https://chromium.googlesource.com/chromium/src' == |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2043 | self.GetRemoteUrl() and |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2044 | detail['branch'].startswith('refs/branch-heads/')): |
| 2045 | return False |
| 2046 | return True |
| 2047 | |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 2048 | def CMDLand(self, force, bypass_hooks, verbose, parallel): |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2049 | if git_common.is_dirty_git_tree('land'): |
| 2050 | return 1 |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2051 | |
tandrii | d60367b | 2016-06-22 05:25:12 -0700 | [diff] [blame] | 2052 | detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS']) |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2053 | if not force and self._IsCqConfigured(): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 2054 | confirm_or_exit('\nIt seems this repository has a CQ, ' |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2055 | 'which can test and land changes for you. ' |
| 2056 | 'Are you sure you wish to bypass it?\n', |
| 2057 | action='bypass CQ') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2058 | differs = True |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2059 | last_upload = self._GitGetBranchConfigValue('gerritsquashhash') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2060 | # Note: git diff outputs nothing if there is no diff. |
| 2061 | if not last_upload or RunGit(['diff', last_upload]).strip(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2062 | print('WARNING: Some changes from local branch haven\'t been uploaded.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2063 | else: |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2064 | if detail['current_revision'] == last_upload: |
| 2065 | differs = False |
| 2066 | else: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2067 | print('WARNING: Local branch contents differ from latest uploaded ' |
| 2068 | 'patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2069 | if differs: |
| 2070 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2071 | confirm_or_exit( |
| 2072 | 'Do you want to submit latest Gerrit patchset and bypass hooks?\n', |
| 2073 | action='submit') |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2074 | print('WARNING: Bypassing hooks and submitting latest uploaded patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2075 | elif not bypass_hooks: |
| 2076 | hook_results = self.RunHook( |
| 2077 | committing=True, |
| 2078 | may_prompt=not force, |
| 2079 | verbose=verbose, |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 2080 | change=self.GetChange(self.GetCommonAncestorWithUpstream(), None), |
| 2081 | parallel=parallel) |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2082 | if not hook_results.should_continue(): |
| 2083 | return 1 |
| 2084 | |
| 2085 | self.SubmitIssue(wait_for_merge=True) |
| 2086 | print('Issue %s has been submitted.' % self.GetIssueURL()) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2087 | links = self._GetChangeCommit().get('web_links', []) |
| 2088 | for link in links: |
Aaron Gable | 02cdbb4 | 2016-12-13 16:24:25 -0800 | [diff] [blame] | 2089 | if link.get('name') == 'gitiles' and link.get('url'): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2090 | print('Landed as: %s' % link.get('url')) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2091 | break |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2092 | return 0 |
| 2093 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2094 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2095 | assert parsed_issue_arg.valid |
| 2096 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2097 | self.issue = parsed_issue_arg.issue |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2098 | |
| 2099 | if parsed_issue_arg.hostname: |
| 2100 | self._gerrit_host = parsed_issue_arg.hostname |
| 2101 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 2102 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2103 | try: |
| 2104 | detail = self._GetChangeDetail(['ALL_REVISIONS']) |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2105 | except GerritChangeNotExists as e: |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2106 | DieWithError(str(e)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2107 | |
| 2108 | if not parsed_issue_arg.patchset: |
| 2109 | # Use current revision by default. |
| 2110 | revision_info = detail['revisions'][detail['current_revision']] |
| 2111 | patchset = int(revision_info['_number']) |
| 2112 | else: |
| 2113 | patchset = parsed_issue_arg.patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2114 | for revision_info in detail['revisions'].values(): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2115 | if int(revision_info['_number']) == parsed_issue_arg.patchset: |
| 2116 | break |
| 2117 | else: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2118 | DieWithError('Couldn\'t find patchset %i in change %i' % |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2119 | (parsed_issue_arg.patchset, self.GetIssue())) |
| 2120 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2121 | remote_url = self.GetRemoteUrl() |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2122 | if remote_url.endswith('.git'): |
| 2123 | remote_url = remote_url[:-len('.git')] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2124 | remote_url = remote_url.rstrip('/') |
| 2125 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2126 | fetch_info = revision_info['fetch']['http'] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2127 | fetch_info['url'] = fetch_info['url'].rstrip('/') |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2128 | |
| 2129 | if remote_url != fetch_info['url']: |
| 2130 | DieWithError('Trying to patch a change from %s but this repo appears ' |
| 2131 | 'to be %s.' % (fetch_info['url'], remote_url)) |
| 2132 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2133 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2134 | |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2135 | if force: |
| 2136 | RunGit(['reset', '--hard', 'FETCH_HEAD']) |
| 2137 | print('Checked out commit for change %i patchset %i locally' % |
| 2138 | (parsed_issue_arg.issue, patchset)) |
Stefan Zager | 2d5f039 | 2017-10-10 15:17:53 -0700 | [diff] [blame] | 2139 | elif nocommit: |
| 2140 | RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD']) |
| 2141 | print('Patch applied to index.') |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2142 | else: |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2143 | RunGit(['cherry-pick', 'FETCH_HEAD']) |
| 2144 | print('Committed patch for change %i patchset %i locally.' % |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2145 | (parsed_issue_arg.issue, patchset)) |
| 2146 | print('Note: this created a local commit which does not have ' |
| 2147 | 'the same hash as the one uploaded for review. This will make ' |
| 2148 | 'uploading changes based on top of this branch difficult.\n' |
| 2149 | 'If you want to do that, use "git cl patch --force" instead.') |
| 2150 | |
Stefan Zager | d08043c | 2017-10-12 12:07:02 -0700 | [diff] [blame] | 2151 | if self.GetBranch(): |
| 2152 | self.SetIssue(parsed_issue_arg.issue) |
| 2153 | self.SetPatchset(patchset) |
| 2154 | fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip() |
| 2155 | self._GitSetBranchConfigValue('last-upload-hash', fetched_hash) |
| 2156 | self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash) |
| 2157 | else: |
| 2158 | print('WARNING: You are in detached HEAD state.\n' |
| 2159 | 'The patch has been applied to your checkout, but you will not be ' |
| 2160 | 'able to upload a new patch set to the gerrit issue.\n' |
| 2161 | 'Try using the \'-b\' option if you would like to work on a ' |
| 2162 | 'branch and/or upload a new patch set.') |
| 2163 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2164 | return 0 |
| 2165 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2166 | def _GerritCommitMsgHookCheck(self, offer_removal): |
| 2167 | hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 2168 | if not os.path.exists(hook): |
| 2169 | return |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2170 | # Crude attempt to distinguish Gerrit Codereview hook from a potentially |
| 2171 | # custom developer-made one. |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2172 | data = gclient_utils.FileRead(hook) |
| 2173 | if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data): |
| 2174 | return |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2175 | print('WARNING: You have Gerrit commit-msg hook installed.\n' |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 2176 | 'It is not necessary for uploading with git cl in squash mode, ' |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2177 | 'and may interfere with it in subtle ways.\n' |
| 2178 | 'We recommend you remove the commit-msg hook.') |
| 2179 | if offer_removal: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2180 | if ask_for_explicit_yes('Do you want to remove it now?'): |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2181 | gclient_utils.rm_file_or_tree(hook) |
| 2182 | print('Gerrit commit-msg hook removed.') |
| 2183 | else: |
| 2184 | print('OK, will keep Gerrit commit-msg hook in place.') |
| 2185 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2186 | def _CleanUpOldTraces(self): |
| 2187 | """Keep only the last |MAX_TRACES| traces.""" |
| 2188 | try: |
| 2189 | traces = sorted([ |
| 2190 | os.path.join(TRACES_DIR, f) |
| 2191 | for f in os.listdir(TRACES_DIR) |
| 2192 | if (os.path.isfile(os.path.join(TRACES_DIR, f)) |
| 2193 | and not f.startswith('tmp')) |
| 2194 | ]) |
| 2195 | traces_to_delete = traces[:-MAX_TRACES] |
| 2196 | for trace in traces_to_delete: |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 2197 | os.remove(trace) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2198 | except OSError: |
| 2199 | print('WARNING: Failed to remove old git traces from\n' |
| 2200 | ' %s' |
| 2201 | 'Consider removing them manually.' % TRACES_DIR) |
Edward Lemur | dc8e23d | 2019-05-07 00:45:48 +0000 | [diff] [blame] | 2202 | |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2203 | def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata): |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2204 | """Zip and write the git push traces stored in traces_dir.""" |
| 2205 | gclient_utils.safe_makedirs(TRACES_DIR) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2206 | traces_zip = trace_name + '-traces' |
| 2207 | traces_readme = trace_name + '-README' |
Michael Moss | e7f0b4c | 2019-05-08 04:36:24 +0000 | [diff] [blame] | 2208 | # Create a temporary dir to store git config and gitcookies in. It will be |
| 2209 | # compressed and stored next to the traces. |
| 2210 | git_info_dir = tempfile.mkdtemp() |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2211 | git_info_zip = trace_name + '-git-info' |
| 2212 | |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2213 | git_push_metadata['now'] = datetime_now().strftime('%c') |
Eric Boren | 67c4820 | 2019-05-30 16:52:51 +0000 | [diff] [blame] | 2214 | if sys.stdin.encoding and sys.stdin.encoding != 'utf-8': |
sangwoo.ko | 7a61433 | 2019-05-22 02:46:19 +0000 | [diff] [blame] | 2215 | git_push_metadata['now'] = git_push_metadata['now'].decode( |
| 2216 | sys.stdin.encoding) |
| 2217 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2218 | git_push_metadata['trace_name'] = trace_name |
| 2219 | gclient_utils.FileWrite( |
| 2220 | traces_readme, TRACES_README_FORMAT % git_push_metadata) |
| 2221 | |
| 2222 | # Keep only the first 6 characters of the git hashes on the packet |
| 2223 | # trace. This greatly decreases size after compression. |
| 2224 | packet_traces = os.path.join(traces_dir, 'trace-packet') |
| 2225 | if os.path.isfile(packet_traces): |
| 2226 | contents = gclient_utils.FileRead(packet_traces) |
| 2227 | gclient_utils.FileWrite( |
| 2228 | packet_traces, GIT_HASH_RE.sub(r'\1', contents)) |
| 2229 | shutil.make_archive(traces_zip, 'zip', traces_dir) |
| 2230 | |
| 2231 | # Collect and compress the git config and gitcookies. |
| 2232 | git_config = RunGit(['config', '-l']) |
| 2233 | gclient_utils.FileWrite( |
| 2234 | os.path.join(git_info_dir, 'git-config'), |
| 2235 | git_config) |
| 2236 | |
| 2237 | cookie_auth = gerrit_util.Authenticator.get() |
| 2238 | if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
| 2239 | gitcookies_path = cookie_auth.get_gitcookies_path() |
| 2240 | if os.path.isfile(gitcookies_path): |
| 2241 | gitcookies = gclient_utils.FileRead(gitcookies_path) |
| 2242 | gclient_utils.FileWrite( |
| 2243 | os.path.join(git_info_dir, 'gitcookies'), |
| 2244 | GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies)) |
| 2245 | shutil.make_archive(git_info_zip, 'zip', git_info_dir) |
| 2246 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2247 | gclient_utils.rmtree(git_info_dir) |
| 2248 | |
| 2249 | def _RunGitPushWithTraces( |
| 2250 | self, change_desc, refspec, refspec_opts, git_push_metadata): |
| 2251 | """Run git push and collect the traces resulting from the execution.""" |
| 2252 | # Create a temporary directory to store traces in. Traces will be compressed |
| 2253 | # and stored in a 'traces' dir inside depot_tools. |
| 2254 | traces_dir = tempfile.mkdtemp() |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2255 | trace_name = os.path.join( |
| 2256 | TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f')) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2257 | |
| 2258 | env = os.environ.copy() |
| 2259 | env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy' |
| 2260 | env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Jonathan Nieder | 9779b14 | 2019-05-29 23:19:29 +0000 | [diff] [blame] | 2261 | env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2262 | env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl') |
| 2263 | env['GIT_TRACE_CURL_NO_DATA'] = '1' |
| 2264 | env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet') |
| 2265 | |
| 2266 | try: |
| 2267 | push_returncode = 0 |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2268 | remote_url = self.GetRemoteUrl() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2269 | before_push = time_time() |
| 2270 | push_stdout = gclient_utils.CheckCallAndFilter( |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2271 | ['git', 'push', remote_url, refspec], |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2272 | env=env, |
| 2273 | print_stdout=True, |
| 2274 | # Flush after every line: useful for seeing progress when running as |
| 2275 | # recipe. |
| 2276 | filter_fn=lambda _: sys.stdout.flush()) |
| 2277 | except subprocess2.CalledProcessError as e: |
| 2278 | push_returncode = e.returncode |
| 2279 | DieWithError('Failed to create a change. Please examine output above ' |
| 2280 | 'for the reason of the failure.\n' |
| 2281 | 'Hint: run command below to diagnose common Git/Gerrit ' |
| 2282 | 'credential problems:\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2283 | ' git cl creds-check\n' |
| 2284 | '\n' |
| 2285 | 'If git-cl is not working correctly, file a bug under the ' |
| 2286 | 'Infra>SDK component including the files below.\n' |
| 2287 | 'Review the files before upload, since they might contain ' |
| 2288 | 'sensitive information.\n' |
| 2289 | 'Set the Restrict-View-Google label so that they are not ' |
| 2290 | 'publicly accessible.\n' |
| 2291 | + TRACES_MESSAGE % {'trace_name': trace_name}, |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2292 | change_desc) |
| 2293 | finally: |
| 2294 | execution_time = time_time() - before_push |
| 2295 | metrics.collector.add_repeated('sub_commands', { |
| 2296 | 'command': 'git push', |
| 2297 | 'execution_time': execution_time, |
| 2298 | 'exit_code': push_returncode, |
| 2299 | 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts), |
| 2300 | }) |
| 2301 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2302 | git_push_metadata['execution_time'] = execution_time |
| 2303 | git_push_metadata['exit_code'] = push_returncode |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2304 | self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2305 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2306 | self._CleanUpOldTraces() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2307 | gclient_utils.rmtree(traces_dir) |
| 2308 | |
| 2309 | return push_stdout |
| 2310 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2311 | def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change): |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2312 | """Upload the current branch to Gerrit.""" |
Mike Frysinger | a989d55 | 2019-08-14 20:51:23 +0000 | [diff] [blame] | 2313 | if options.squash is None: |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 2314 | # Load default for user, repo, squash=true, in this order. |
| 2315 | options.squash = settings.GetSquashGerritUploads() |
tandrii | 26f3e4e | 2016-06-10 08:37:04 -0700 | [diff] [blame] | 2316 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2317 | remote, remote_branch = self.GetRemoteBranch() |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 2318 | branch = GetTargetRef(remote, remote_branch, options.target_branch) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2319 | # This may be None; default fallback value is determined in logic below. |
| 2320 | title = options.title |
| 2321 | |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 2322 | # Extract bug number from branch name. |
| 2323 | bug = options.bug |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2324 | fixed = options.fixed |
| 2325 | match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)', |
| 2326 | self.GetBranch()) |
| 2327 | if not bug and not fixed and match: |
| 2328 | if match.group('type') == 'bug': |
| 2329 | bug = match.group('bugnum') |
| 2330 | else: |
| 2331 | fixed = match.group('bugnum') |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 2332 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2333 | if options.squash: |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2334 | self._GerritCommitMsgHookCheck(offer_removal=not options.force) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2335 | if self.GetIssue(): |
| 2336 | # Try to get the message from a previous upload. |
| 2337 | message = self.GetDescription() |
| 2338 | if not message: |
| 2339 | DieWithError( |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2340 | 'failed to fetch description from current Gerrit change %d\n' |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2341 | '%s' % (self.GetIssue(), self.GetIssueURL())) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2342 | if not title: |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2343 | if options.message: |
Aaron Gable | 7303dcb | 2017-06-07 14:17:32 -0700 | [diff] [blame] | 2344 | # When uploading a subsequent patchset, -m|--message is taken |
| 2345 | # as the patchset title if --title was not provided. |
| 2346 | title = options.message.strip() |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2347 | else: |
| 2348 | default_title = RunGit( |
| 2349 | ['show', '-s', '--format=%s', 'HEAD']).strip() |
Aaron Gable | 7303dcb | 2017-06-07 14:17:32 -0700 | [diff] [blame] | 2350 | if options.force: |
| 2351 | title = default_title |
| 2352 | else: |
| 2353 | title = ask_for_data( |
| 2354 | 'Title for patchset [%s]: ' % default_title) or default_title |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2355 | change_id = self._GetChangeDetail()['change_id'] |
| 2356 | while True: |
| 2357 | footer_change_ids = git_footers.get_footer_change_id(message) |
| 2358 | if footer_change_ids == [change_id]: |
| 2359 | break |
| 2360 | if not footer_change_ids: |
| 2361 | message = git_footers.add_footer_change_id(message, change_id) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2362 | print('WARNING: appended missing Change-Id to change description.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2363 | continue |
| 2364 | # There is already a valid footer but with different or several ids. |
| 2365 | # Doing this automatically is non-trivial as we don't want to lose |
| 2366 | # existing other footers, yet we want to append just 1 desired |
| 2367 | # Change-Id. Thus, just create a new footer, but let user verify the |
| 2368 | # new description. |
| 2369 | message = '%s\n\nChange-Id: %s' % (message, change_id) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2370 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2371 | if not options.force: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2372 | print( |
| 2373 | 'WARNING: change %s has Change-Id footer(s):\n' |
| 2374 | ' %s\n' |
| 2375 | 'but change has Change-Id %s, according to Gerrit.\n' |
| 2376 | 'Please, check the proposed correction to the description, ' |
| 2377 | 'and edit it if necessary but keep the "Change-Id: %s" footer\n' |
| 2378 | % (self.GetIssue(), '\n '.join(footer_change_ids), change_id, |
| 2379 | change_id)) |
| 2380 | confirm_or_exit(action='edit') |
| 2381 | change_desc.prompt() |
| 2382 | |
| 2383 | message = change_desc.description |
| 2384 | if not message: |
| 2385 | DieWithError("Description is empty. Aborting...") |
| 2386 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2387 | # Continue the while loop. |
| 2388 | # Sanity check of this code - we should end up with proper message |
| 2389 | # footer. |
| 2390 | assert [change_id] == git_footers.get_footer_change_id(message) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2391 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2392 | else: # if not self.GetIssue() |
| 2393 | if options.message: |
| 2394 | message = options.message |
| 2395 | else: |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2396 | message = _create_description_from_log(git_diff_args) |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2397 | if options.title: |
| 2398 | message = options.title + '\n\n' + message |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2399 | change_desc = ChangeDescription(message, bug=bug, fixed=fixed) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2400 | if not options.force: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2401 | change_desc.prompt() |
| 2402 | |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2403 | # On first upload, patchset title is always this string, while |
| 2404 | # --title flag gets converted to first line of message. |
| 2405 | title = 'Initial upload' |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2406 | if not change_desc.description: |
| 2407 | DieWithError("Description is empty. Aborting...") |
Andrii Shyshkalov | 8c90d03 | 2017-04-19 21:27:26 +0200 | [diff] [blame] | 2408 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2409 | if len(change_ids) > 1: |
| 2410 | DieWithError('too many Change-Id footers, at most 1 allowed.') |
| 2411 | if not change_ids: |
| 2412 | # Generate the Change-Id automatically. |
Andrii Shyshkalov | 8c90d03 | 2017-04-19 21:27:26 +0200 | [diff] [blame] | 2413 | change_desc.set_description(git_footers.add_footer_change_id( |
| 2414 | change_desc.description, |
| 2415 | GenerateGerritChangeId(change_desc.description))) |
| 2416 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2417 | assert len(change_ids) == 1 |
| 2418 | change_id = change_ids[0] |
| 2419 | |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2420 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2421 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2422 | options.add_owners_to, change) |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 2423 | if options.preserve_tryjobs: |
| 2424 | change_desc.set_preserve_tryjobs() |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2425 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2426 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2427 | parent = self._ComputeParent(remote, upstream_branch, custom_cl_base, |
| 2428 | options.force, change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2429 | tree = RunGit(['rev-parse', 'HEAD:']).strip() |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 2430 | with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile: |
| 2431 | desc_tempfile.write(change_desc.description) |
| 2432 | desc_tempfile.close() |
| 2433 | ref_to_push = RunGit(['commit-tree', tree, '-p', parent, |
| 2434 | '-F', desc_tempfile.name]).strip() |
| 2435 | os.remove(desc_tempfile.name) |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2436 | else: # if not options.squash |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2437 | change_desc = ChangeDescription( |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2438 | options.message or _create_description_from_log(git_diff_args)) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2439 | if not change_desc.description: |
| 2440 | DieWithError("Description is empty. Aborting...") |
| 2441 | |
| 2442 | if not git_footers.get_footer_change_id(change_desc.description): |
| 2443 | DownloadGerritHook(False) |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2444 | change_desc.set_description( |
| 2445 | self._AddChangeIdToCommitMessage(options, git_diff_args)) |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2446 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2447 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2448 | options.add_owners_to, change) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2449 | ref_to_push = 'HEAD' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2450 | # For no-squash mode, we assume the remote called "origin" is the one we |
| 2451 | # want. It is not worthwhile to support different workflows for |
| 2452 | # no-squash mode. |
| 2453 | parent = 'origin/%s' % branch |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2454 | change_id = git_footers.get_footer_change_id(change_desc.description)[0] |
| 2455 | |
| 2456 | assert change_desc |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 2457 | SaveDescriptionBackup(change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2458 | commits = RunGitSilent(['rev-list', '%s..%s' % (parent, |
| 2459 | ref_to_push)]).splitlines() |
| 2460 | if len(commits) > 1: |
| 2461 | print('WARNING: This will upload %d commits. Run the following command ' |
| 2462 | 'to see which commits will be uploaded: ' % len(commits)) |
| 2463 | print('git log %s..%s' % (parent, ref_to_push)) |
| 2464 | print('You can also use `git squash-branch` to squash these into a ' |
| 2465 | 'single commit.') |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2466 | confirm_or_exit(action='upload') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2467 | |
Aaron Gable | 6dadfbf | 2017-05-09 14:27:58 -0700 | [diff] [blame] | 2468 | if options.reviewers or options.tbrs or options.add_owners_to: |
| 2469 | change_desc.update_reviewers(options.reviewers, options.tbrs, |
| 2470 | options.add_owners_to, change) |
| 2471 | |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2472 | reviewers = sorted(change_desc.get_reviewers()) |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2473 | cc = [] |
| 2474 | # Add CCs from WATCHLISTS and rietveld.cc git config unless this is |
| 2475 | # the initial upload, the CL is private, or auto-CCing has ben disabled. |
| 2476 | if not (self.GetIssue() or options.private or options.no_autocc): |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2477 | cc = self.GetCCList().split(',') |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2478 | # Add cc's from the --cc flag. |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2479 | if options.cc: |
| 2480 | cc.extend(options.cc) |
| 2481 | cc = filter(None, [email.strip() for email in cc]) |
| 2482 | if change_desc.get_cced(): |
| 2483 | cc.extend(change_desc.get_cced()) |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 2484 | if self._GetGerritHost() == 'chromium-review.googlesource.com': |
| 2485 | valid_accounts = set(reviewers + cc) |
| 2486 | # TODO(crbug/877717): relax this for all hosts. |
| 2487 | else: |
| 2488 | valid_accounts = gerrit_util.ValidAccounts( |
| 2489 | self._GetGerritHost(), reviewers + cc) |
Andrii Shyshkalov | f170af4 | 2018-10-30 07:00:44 +0000 | [diff] [blame] | 2490 | logging.info('accounts %s are recognized, %s invalid', |
| 2491 | sorted(valid_accounts), |
| 2492 | set(reviewers + cc).difference(set(valid_accounts))) |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2493 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2494 | # Extra options that can be specified at push time. Doc: |
| 2495 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2496 | refspec_opts = [] |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2497 | |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 2498 | # By default, new changes are started in WIP mode, and subsequent patchsets |
| 2499 | # don't send email. At any time, passing --send-mail will mark the change |
| 2500 | # ready and send email for that particular patch. |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2501 | if options.send_mail: |
| 2502 | refspec_opts.append('ready') |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 2503 | refspec_opts.append('notify=ALL') |
Jamie Madill | 276da0b | 2018-04-27 14:41:20 -0400 | [diff] [blame] | 2504 | elif not self.GetIssue() and options.squash: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2505 | refspec_opts.append('wip') |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2506 | else: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2507 | refspec_opts.append('notify=NONE') |
Aaron Gable | 70f4e24 | 2017-06-26 10:45:59 -0700 | [diff] [blame] | 2508 | |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2509 | # TODO(tandrii): options.message should be posted as a comment |
Aaron Gable | e5adf61 | 2017-07-14 10:43:58 -0700 | [diff] [blame] | 2510 | # 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] | 2511 | |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 2512 | if title: |
Nick Carter | 8692b18 | 2017-11-06 16:30:38 -0800 | [diff] [blame] | 2513 | # Punctuation and whitespace in |title| must be percent-encoded. |
| 2514 | refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title)) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2515 | |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2516 | if options.private: |
Aaron Gable | b02daf0 | 2017-05-23 11:53:46 -0700 | [diff] [blame] | 2517 | refspec_opts.append('private') |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2518 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2519 | for r in sorted(reviewers): |
| 2520 | if r in valid_accounts: |
| 2521 | refspec_opts.append('r=%s' % r) |
| 2522 | reviewers.remove(r) |
| 2523 | else: |
| 2524 | # TODO(tandrii): this should probably be a hard failure. |
| 2525 | print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping' |
| 2526 | % r) |
| 2527 | for c in sorted(cc): |
| 2528 | # refspec option will be rejected if cc doesn't correspond to an |
| 2529 | # account, even though REST call to add such arbitrary cc may succeed. |
| 2530 | if c in valid_accounts: |
| 2531 | refspec_opts.append('cc=%s' % c) |
| 2532 | cc.remove(c) |
| 2533 | |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2534 | if options.topic: |
| 2535 | # Documentation on Gerrit topics is here: |
| 2536 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2537 | refspec_opts.append('topic=%s' % options.topic) |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2538 | |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2539 | if options.enable_auto_submit: |
| 2540 | refspec_opts.append('l=Auto-Submit+1') |
| 2541 | if options.use_commit_queue: |
| 2542 | refspec_opts.append('l=Commit-Queue+2') |
| 2543 | elif options.cq_dry_run: |
| 2544 | refspec_opts.append('l=Commit-Queue+1') |
| 2545 | |
| 2546 | if change_desc.get_reviewers(tbr_only=True): |
| 2547 | score = gerrit_util.GetCodeReviewTbrScore( |
| 2548 | self._GetGerritHost(), |
| 2549 | self._GetGerritProject()) |
| 2550 | refspec_opts.append('l=Code-Review+%s' % score) |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 2551 | |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2552 | # Gerrit sorts hashtags, so order is not important. |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2553 | hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags} |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2554 | if not self.GetIssue(): |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2555 | hashtags.update(change_desc.get_hash_tags()) |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2556 | refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)] |
| 2557 | |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2558 | refspec_suffix = '' |
| 2559 | if refspec_opts: |
| 2560 | refspec_suffix = '%' + ','.join(refspec_opts) |
| 2561 | assert ' ' not in refspec_suffix, ( |
| 2562 | 'spaces not allowed in refspec: "%s"' % refspec_suffix) |
| 2563 | refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix) |
| 2564 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2565 | git_push_metadata = { |
| 2566 | 'gerrit_host': self._GetGerritHost(), |
| 2567 | 'title': title or '<untitled>', |
| 2568 | 'change_id': change_id, |
| 2569 | 'description': change_desc.description, |
| 2570 | } |
| 2571 | push_stdout = self._RunGitPushWithTraces( |
| 2572 | change_desc, refspec, refspec_opts, git_push_metadata) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2573 | |
| 2574 | if options.squash: |
Aaron Gable | 289b431 | 2017-09-13 14:06:16 -0700 | [diff] [blame] | 2575 | regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2576 | change_numbers = [m.group(1) |
| 2577 | for m in map(regex.match, push_stdout.splitlines()) |
| 2578 | if m] |
| 2579 | if len(change_numbers) != 1: |
| 2580 | DieWithError( |
| 2581 | ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 2582 | 'Change-Id: %s') % (len(change_numbers), change_id), change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2583 | self.SetIssue(change_numbers[0]) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2584 | self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push) |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2585 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2586 | if self.GetIssue() and (reviewers or cc): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 2587 | # GetIssue() is not set in case of non-squash uploads according to tests. |
| 2588 | # TODO(agable): non-squash uploads in git cl should be removed. |
| 2589 | gerrit_util.AddReviewers( |
| 2590 | self._GetGerritHost(), |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 2591 | self._GerritChangeIdentifier(), |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 2592 | reviewers, cc, |
| 2593 | notify=bool(options.send_mail)) |
Aaron Gable | 6dadfbf | 2017-05-09 14:27:58 -0700 | [diff] [blame] | 2594 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2595 | return 0 |
| 2596 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2597 | def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force, |
| 2598 | change_desc): |
| 2599 | """Computes parent of the generated commit to be uploaded to Gerrit. |
| 2600 | |
| 2601 | Returns revision or a ref name. |
| 2602 | """ |
| 2603 | if custom_cl_base: |
| 2604 | # Try to avoid creating additional unintended CLs when uploading, unless |
| 2605 | # user wants to take this risk. |
| 2606 | local_ref_of_target_remote = self.GetRemoteBranch()[1] |
| 2607 | code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base, |
| 2608 | local_ref_of_target_remote]) |
| 2609 | if code == 1: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2610 | print('\nWARNING: Manually specified base of this CL `%s` ' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2611 | 'doesn\'t seem to belong to target remote branch `%s`.\n\n' |
| 2612 | 'If you proceed with upload, more than 1 CL may be created by ' |
| 2613 | 'Gerrit as a result, in turn confusing or crashing git cl.\n\n' |
| 2614 | 'If you are certain that specified base `%s` has already been ' |
| 2615 | 'uploaded to Gerrit as another CL, you may proceed.\n' % |
| 2616 | (custom_cl_base, local_ref_of_target_remote, custom_cl_base)) |
| 2617 | if not force: |
| 2618 | confirm_or_exit( |
| 2619 | 'Do you take responsibility for cleaning up potential mess ' |
| 2620 | 'resulting from proceeding with upload?', |
| 2621 | action='upload') |
| 2622 | return custom_cl_base |
| 2623 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2624 | if remote != '.': |
| 2625 | return self.GetCommonAncestorWithUpstream() |
| 2626 | |
| 2627 | # If our upstream branch is local, we base our squashed commit on its |
| 2628 | # squashed version. |
| 2629 | upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch) |
| 2630 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2631 | if upstream_branch_name == 'master': |
Aaron Gable | 0bbd1c2 | 2017-05-08 14:37:08 -0700 | [diff] [blame] | 2632 | return self.GetCommonAncestorWithUpstream() |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2633 | |
| 2634 | # Check the squashed hash of the parent. |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2635 | # TODO(tandrii): consider checking parent change in Gerrit and using its |
| 2636 | # hash if tree hash of latest parent revision (patchset) in Gerrit matches |
| 2637 | # the tree hash of the parent branch. The upside is less likely bogus |
| 2638 | # requests to reupload parent change just because it's uploadhash is |
| 2639 | # missing, yet the downside likely exists, too (albeit unknown to me yet). |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2640 | parent = RunGit(['config', |
| 2641 | 'branch.%s.gerritsquashhash' % upstream_branch_name], |
| 2642 | error_ok=True).strip() |
| 2643 | # Verify that the upstream branch has been uploaded too, otherwise |
| 2644 | # Gerrit will create additional CLs when uploading. |
| 2645 | if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) != |
| 2646 | RunGitSilent(['rev-parse', parent + ':'])): |
| 2647 | DieWithError( |
| 2648 | '\nUpload upstream branch %s first.\n' |
| 2649 | 'It is likely that this branch has been rebased since its last ' |
| 2650 | 'upload, so you just need to upload it again.\n' |
| 2651 | '(If you uploaded it with --no-squash, then branch dependencies ' |
| 2652 | 'are not supported, and you should reupload with --squash.)' |
| 2653 | % upstream_branch_name, |
| 2654 | change_desc) |
| 2655 | return parent |
| 2656 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2657 | def _AddChangeIdToCommitMessage(self, options, args): |
| 2658 | """Re-commits using the current message, assumes the commit hook is in |
| 2659 | place. |
| 2660 | """ |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2661 | log_desc = options.message or _create_description_from_log(args) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2662 | git_command = ['commit', '--amend', '-m', log_desc] |
| 2663 | RunGit(git_command) |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 2664 | new_log_desc = _create_description_from_log(args) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2665 | if git_footers.get_footer_change_id(new_log_desc): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 2666 | print('git-cl: Added Change-Id to commit message.') |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 2667 | return new_log_desc |
| 2668 | else: |
tandrii@chromium.org | b067ec5 | 2016-05-31 15:24:44 +0000 | [diff] [blame] | 2669 | DieWithError('ERROR: Gerrit commit-msg hook not installed.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2670 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2671 | def CannotTriggerTryJobReason(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2672 | try: |
| 2673 | data = self._GetChangeDetail() |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2674 | except GerritChangeNotExists: |
| 2675 | return 'Gerrit doesn\'t know about your change %s' % self.GetIssue() |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2676 | |
| 2677 | if data['status'] in ('ABANDONED', 'MERGED'): |
| 2678 | return 'CL %s is closed' % self.GetIssue() |
| 2679 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2680 | def GetGerritChange(self, patchset=None): |
| 2681 | """Returns a buildbucket.v2.GerritChange message for the current issue.""" |
| 2682 | host = urlparse.urlparse(self.GetCodereviewServer()).hostname |
| 2683 | issue = self.GetIssue() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 2684 | patchset = int(patchset or self.GetPatchset()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2685 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2686 | |
| 2687 | assert host and issue and patchset, 'CL must be uploaded first' |
| 2688 | |
| 2689 | has_patchset = any( |
| 2690 | int(revision_data['_number']) == patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2691 | for revision_data in data['revisions'].values()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2692 | if not has_patchset: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2693 | raise Exception('Patchset %d is not known in Gerrit change %d' % |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2694 | (patchset, self.GetIssue())) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2695 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2696 | return { |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 2697 | 'host': host, |
| 2698 | 'change': issue, |
| 2699 | 'project': data['project'], |
| 2700 | 'patchset': patchset, |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2701 | } |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 2702 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2703 | def GetIssueOwner(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2704 | return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email'] |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2705 | |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 2706 | def GetReviewers(self): |
| 2707 | details = self._GetChangeDetail(['DETAILED_ACCOUNTS']) |
Mohamed Heikal | 171c074 | 2018-11-09 20:38:51 +0000 | [diff] [blame] | 2708 | return [r['email'] for r in details['reviewers'].get('REVIEWER', [])] |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 2709 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2710 | |
| 2711 | _CODEREVIEW_IMPLEMENTATIONS = { |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2712 | 'gerrit': Changelist, |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2713 | } |
| 2714 | |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2715 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2716 | def _add_codereview_issue_select_options(parser, extra=""): |
| 2717 | _add_codereview_select_options(parser) |
| 2718 | |
| 2719 | text = ('Operate on this issue number instead of the current branch\'s ' |
| 2720 | 'implicit issue.') |
| 2721 | if extra: |
| 2722 | text += ' '+extra |
| 2723 | parser.add_option('-i', '--issue', type=int, help=text) |
| 2724 | |
| 2725 | |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2726 | def _add_codereview_select_options(parser): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2727 | """Appends --gerrit option to force specific codereview.""" |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2728 | parser.codereview_group = optparse.OptionGroup( |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2729 | parser, 'DEPRECATED! Codereview override options') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2730 | parser.add_option_group(parser.codereview_group) |
| 2731 | parser.codereview_group.add_option( |
| 2732 | '--gerrit', action='store_true', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2733 | help='Deprecated. Noop. Do not use.') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2734 | |
| 2735 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2736 | def _get_bug_line_values(default_project, bugs): |
| 2737 | """Given default_project and comma separated list of bugs, yields bug line |
| 2738 | values. |
| 2739 | |
| 2740 | Each bug can be either: |
| 2741 | * a number, which is combined with default_project |
| 2742 | * string, which is left as is. |
| 2743 | |
| 2744 | This function may produce more than one line, because bugdroid expects one |
| 2745 | project per line. |
| 2746 | |
| 2747 | >>> list(_get_bug_line_values('v8', '123,chromium:789')) |
| 2748 | ['v8:123', 'chromium:789'] |
| 2749 | """ |
| 2750 | default_bugs = [] |
| 2751 | others = [] |
| 2752 | for bug in bugs.split(','): |
| 2753 | bug = bug.strip() |
| 2754 | if bug: |
| 2755 | try: |
| 2756 | default_bugs.append(int(bug)) |
| 2757 | except ValueError: |
| 2758 | others.append(bug) |
| 2759 | |
| 2760 | if default_bugs: |
| 2761 | default_bugs = ','.join(map(str, default_bugs)) |
| 2762 | if default_project: |
| 2763 | yield '%s:%s' % (default_project, default_bugs) |
| 2764 | else: |
| 2765 | yield default_bugs |
| 2766 | for other in sorted(others): |
| 2767 | # Don't bother finding common prefixes, CLs with >2 bugs are very very rare. |
| 2768 | yield other |
| 2769 | |
| 2770 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2771 | class ChangeDescription(object): |
| 2772 | """Contains a parsed form of the change description.""" |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 2773 | R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$' |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2774 | CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2775 | BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$' |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2776 | FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$' |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 2777 | 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] | 2778 | STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*' |
| 2779 | BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]' |
| 2780 | COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):' |
| 2781 | BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+' |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2782 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2783 | def __init__(self, description, bug=None, fixed=None): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2784 | self._description_lines = (description or '').strip().splitlines() |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2785 | if bug: |
| 2786 | regexp = re.compile(self.BUG_LINE) |
| 2787 | prefix = settings.GetBugPrefix() |
| 2788 | if not any((regexp.match(line) for line in self._description_lines)): |
| 2789 | values = list(_get_bug_line_values(prefix, bug)) |
| 2790 | self.append_footer('Bug: %s' % ', '.join(values)) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2791 | if fixed: |
| 2792 | regexp = re.compile(self.FIXED_LINE) |
| 2793 | prefix = settings.GetBugPrefix() |
| 2794 | if not any((regexp.match(line) for line in self._description_lines)): |
| 2795 | values = list(_get_bug_line_values(prefix, fixed)) |
| 2796 | self.append_footer('Fixed: %s' % ', '.join(values)) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2797 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2798 | @property # www.logilab.org/ticket/89786 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 2799 | def description(self): # pylint: disable=method-hidden |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2800 | return '\n'.join(self._description_lines) |
| 2801 | |
| 2802 | def set_description(self, desc): |
| 2803 | if isinstance(desc, basestring): |
| 2804 | lines = desc.splitlines() |
| 2805 | else: |
| 2806 | lines = [line.rstrip() for line in desc] |
| 2807 | while lines and not lines[0]: |
| 2808 | lines.pop(0) |
| 2809 | while lines and not lines[-1]: |
| 2810 | lines.pop(-1) |
| 2811 | self._description_lines = lines |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2812 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2813 | def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None): |
| 2814 | """Rewrites the R=/TBR= line(s) as a single line each. |
| 2815 | |
| 2816 | Args: |
| 2817 | reviewers (list(str)) - list of additional emails to use for reviewers. |
| 2818 | tbrs (list(str)) - list of additional emails to use for TBRs. |
| 2819 | add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in |
| 2820 | the change that are missing OWNER coverage. If this is not None, you |
| 2821 | must also pass a value for `change`. |
| 2822 | change (Change) - The Change that should be used for OWNERS lookups. |
| 2823 | """ |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2824 | assert isinstance(reviewers, list), reviewers |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2825 | assert isinstance(tbrs, list), tbrs |
| 2826 | |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2827 | assert add_owners_to in (None, 'TBR', 'R'), add_owners_to |
Robert Iannucci | a28592e | 2017-04-18 13:14:49 -0700 | [diff] [blame] | 2828 | assert not add_owners_to or change, add_owners_to |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2829 | |
| 2830 | if not reviewers and not tbrs and not add_owners_to: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2831 | return |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2832 | |
| 2833 | reviewers = set(reviewers) |
| 2834 | tbrs = set(tbrs) |
| 2835 | LOOKUP = { |
| 2836 | 'TBR': tbrs, |
| 2837 | 'R': reviewers, |
| 2838 | } |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2839 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2840 | # 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] | 2841 | regexp = re.compile(self.R_LINE) |
| 2842 | matches = [regexp.match(line) for line in self._description_lines] |
| 2843 | new_desc = [l for i, l in enumerate(self._description_lines) |
| 2844 | if not matches[i]] |
| 2845 | self.set_description(new_desc) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2846 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2847 | # Construct new unified R= and TBR= lines. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2848 | |
| 2849 | # 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] | 2850 | for match in matches: |
| 2851 | if not match: |
| 2852 | continue |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2853 | LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()])) |
| 2854 | |
| 2855 | # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers. |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2856 | if add_owners_to: |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2857 | owners_db = owners.Database(change.RepositoryRoot(), |
Jochen Eisinger | 72606f8 | 2017-04-04 10:44:18 +0200 | [diff] [blame] | 2858 | fopen=file, os_path=os.path) |
piman@chromium.org | 336f912 | 2014-09-04 02:16:55 +0000 | [diff] [blame] | 2859 | missing_files = owners_db.files_not_covered_by(change.LocalPaths(), |
Robert Iannucci | 100aa21 | 2017-04-18 17:28:26 -0700 | [diff] [blame] | 2860 | (tbrs | reviewers)) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2861 | LOOKUP[add_owners_to].update( |
| 2862 | owners_db.reviewers_for(missing_files, change.author_email)) |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2863 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2864 | # If any folks ended up in both groups, remove them from tbrs. |
| 2865 | tbrs -= reviewers |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 2866 | |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 2867 | new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None |
| 2868 | new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2869 | |
| 2870 | # Put the new lines in the description where the old first R= line was. |
| 2871 | line_loc = next((i for i, match in enumerate(matches) if match), -1) |
| 2872 | if 0 <= line_loc < len(self._description_lines): |
| 2873 | if new_tbr_line: |
| 2874 | self._description_lines.insert(line_loc, new_tbr_line) |
| 2875 | if new_r_line: |
| 2876 | self._description_lines.insert(line_loc, new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2877 | else: |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2878 | if new_r_line: |
| 2879 | self.append_footer(new_r_line) |
| 2880 | if new_tbr_line: |
| 2881 | self.append_footer(new_tbr_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2882 | |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 2883 | def set_preserve_tryjobs(self): |
| 2884 | """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'.""" |
| 2885 | footers = git_footers.parse_footers(self.description) |
| 2886 | for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []): |
| 2887 | if v.lower() == 'true': |
| 2888 | return |
| 2889 | self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true') |
| 2890 | |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2891 | def prompt(self): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2892 | """Asks the user to update the description.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2893 | self.set_description([ |
| 2894 | '# Enter a description of the change.', |
| 2895 | '# This will be displayed on the codereview site.', |
| 2896 | '# 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] | 2897 | '#--------------------This line is 72 characters long' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2898 | '--------------------', |
| 2899 | ] + self._description_lines) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2900 | bug_regexp = re.compile(self.BUG_LINE) |
| 2901 | fixed_regexp = re.compile(self.FIXED_LINE) |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 2902 | prefix = settings.GetBugPrefix() |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2903 | has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l) |
| 2904 | if not any((has_issue(line) for line in self._description_lines)): |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2905 | self.append_footer('Bug: %s' % prefix) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 2906 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2907 | content = gclient_utils.RunEditor(self.description, True, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2908 | git_editor=settings.GetGitEditor()) |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 2909 | if not content: |
| 2910 | DieWithError('Running editor failed') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2911 | lines = content.splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2912 | |
Bruce Dawson | 2377b01 | 2018-01-11 16:46:49 -0800 | [diff] [blame] | 2913 | # Strip off comments and default inserted "Bug:" line. |
| 2914 | clean_lines = [line.rstrip() for line in lines if not |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 2915 | (line.startswith('#') or |
| 2916 | line.rstrip() == "Bug:" or |
| 2917 | line.rstrip() == "Bug: " + prefix)] |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2918 | if not clean_lines: |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 2919 | DieWithError('No CL description, aborting') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2920 | self.set_description(clean_lines) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2921 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2922 | def append_footer(self, line): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2923 | """Adds a footer line to the description. |
| 2924 | |
| 2925 | Differentiates legacy "KEY=xxx" footers (used to be called tags) and |
| 2926 | Gerrit's footers in the form of "Footer-Key: footer any value" and ensures |
| 2927 | that Gerrit footers are always at the end. |
| 2928 | """ |
| 2929 | parsed_footer_line = git_footers.parse_footer(line) |
| 2930 | if parsed_footer_line: |
| 2931 | # Line is a gerrit footer in the form: Footer-Key: any value. |
| 2932 | # Thus, must be appended observing Gerrit footer rules. |
| 2933 | self.set_description( |
| 2934 | git_footers.add_footer(self.description, |
| 2935 | key=parsed_footer_line[0], |
| 2936 | value=parsed_footer_line[1])) |
| 2937 | return |
| 2938 | |
| 2939 | if not self._description_lines: |
| 2940 | self._description_lines.append(line) |
| 2941 | return |
| 2942 | |
| 2943 | top_lines, gerrit_footers, _ = git_footers.split_footers(self.description) |
| 2944 | if gerrit_footers: |
| 2945 | # git_footers.split_footers ensures that there is an empty line before |
| 2946 | # actual (gerrit) footers, if any. We have to keep it that way. |
| 2947 | assert top_lines and top_lines[-1] == '' |
| 2948 | top_lines, separator = top_lines[:-1], top_lines[-1:] |
| 2949 | else: |
| 2950 | separator = [] # No need for separator if there are no gerrit_footers. |
| 2951 | |
| 2952 | prev_line = top_lines[-1] if top_lines else '' |
| 2953 | if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or |
| 2954 | not presubmit_support.Change.TAG_LINE_RE.match(line)): |
| 2955 | top_lines.append('') |
| 2956 | top_lines.append(line) |
| 2957 | self._description_lines = top_lines + separator + gerrit_footers |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2958 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2959 | def get_reviewers(self, tbr_only=False): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 2960 | """Retrieves the list of reviewers.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 2961 | matches = [re.match(self.R_LINE, line) for line in self._description_lines] |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 2962 | reviewers = [match.group(2).strip() |
| 2963 | for match in matches |
| 2964 | 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] | 2965 | return cleanup_list(reviewers) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 2966 | |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 2967 | def get_cced(self): |
| 2968 | """Retrieves the list of reviewers.""" |
| 2969 | matches = [re.match(self.CC_LINE, line) for line in self._description_lines] |
| 2970 | cced = [match.group(2).strip() for match in matches if match] |
| 2971 | return cleanup_list(cced) |
| 2972 | |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2973 | def get_hash_tags(self): |
| 2974 | """Extracts and sanitizes a list of Gerrit hashtags.""" |
| 2975 | subject = (self._description_lines or ('',))[0] |
| 2976 | subject = re.sub( |
| 2977 | self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE) |
| 2978 | |
| 2979 | tags = [] |
| 2980 | start = 0 |
| 2981 | bracket_exp = re.compile(self.BRACKET_HASH_TAG) |
| 2982 | while True: |
| 2983 | m = bracket_exp.match(subject, start) |
| 2984 | if not m: |
| 2985 | break |
| 2986 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 2987 | start = m.end() |
| 2988 | |
| 2989 | if not tags: |
| 2990 | # Try "Tag: " prefix. |
| 2991 | m = re.match(self.COLON_SEPARATED_HASH_TAG, subject) |
| 2992 | if m: |
| 2993 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 2994 | return tags |
| 2995 | |
| 2996 | @classmethod |
| 2997 | def sanitize_hash_tag(cls, tag): |
| 2998 | """Returns a sanitized Gerrit hash tag. |
| 2999 | |
| 3000 | A sanitized hashtag can be used as a git push refspec parameter value. |
| 3001 | """ |
| 3002 | return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower() |
| 3003 | |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3004 | def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref): |
| 3005 | """Updates this commit description given the parent. |
| 3006 | |
| 3007 | This is essentially what Gnumbd used to do. |
| 3008 | Consult https://goo.gl/WMmpDe for more details. |
| 3009 | """ |
| 3010 | assert parent_msg # No, orphan branch creation isn't supported. |
| 3011 | assert parent_hash |
| 3012 | assert dest_ref |
| 3013 | parent_footer_map = git_footers.parse_footers(parent_msg) |
| 3014 | # This will also happily parse svn-position, which GnumbD is no longer |
| 3015 | # supporting. While we'd generate correct footers, the verifier plugin |
| 3016 | # installed in Gerrit will block such commit (ie git push below will fail). |
| 3017 | parent_position = git_footers.get_position(parent_footer_map) |
| 3018 | |
| 3019 | # Cherry-picks may have last line obscuring their prior footers, |
| 3020 | # from git_footers perspective. This is also what Gnumbd did. |
| 3021 | cp_line = None |
| 3022 | if (self._description_lines and |
| 3023 | re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])): |
| 3024 | cp_line = self._description_lines.pop() |
| 3025 | |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3026 | top_lines, footer_lines, _ = git_footers.split_footers(self.description) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3027 | |
| 3028 | # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just |
| 3029 | # user interference with actual footers we'd insert below. |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3030 | for i, line in enumerate(footer_lines): |
| 3031 | k, v = git_footers.parse_footer(line) or (None, None) |
| 3032 | if k and k.startswith('Cr-'): |
| 3033 | footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3034 | |
| 3035 | # Add Position and Lineage footers based on the parent. |
Andrii Shyshkalov | b5effa1 | 2016-12-14 19:35:12 +0100 | [diff] [blame] | 3036 | lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', []))) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3037 | if parent_position[0] == dest_ref: |
| 3038 | # Same branch as parent. |
| 3039 | number = int(parent_position[1]) + 1 |
| 3040 | else: |
| 3041 | number = 1 # New branch, and extra lineage. |
| 3042 | lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0], |
| 3043 | int(parent_position[1]))) |
| 3044 | |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3045 | footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number)) |
| 3046 | footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3047 | |
| 3048 | self._description_lines = top_lines |
| 3049 | if cp_line: |
| 3050 | self._description_lines.append(cp_line) |
| 3051 | if self._description_lines[-1] != '': |
| 3052 | self._description_lines.append('') # Ensure footer separator. |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 3053 | self._description_lines.extend(footer_lines) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3054 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3055 | |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3056 | def get_approving_reviewers(props, disapproval=False): |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3057 | """Retrieves the reviewers that approved a CL from the issue properties with |
| 3058 | messages. |
| 3059 | |
| 3060 | Note that the list may contain reviewers that are not committer, thus are not |
| 3061 | considered by the CQ. |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3062 | |
| 3063 | 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] | 3064 | """ |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3065 | approval_type = 'disapproval' if disapproval else 'approval' |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3066 | return sorted( |
| 3067 | set( |
| 3068 | message['sender'] |
| 3069 | for message in props['messages'] |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3070 | if message[approval_type] and message['sender'] in props['reviewers'] |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3071 | ) |
| 3072 | ) |
| 3073 | |
| 3074 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3075 | def FindCodereviewSettingsFile(filename='codereview.settings'): |
| 3076 | """Finds the given file starting in the cwd and going up. |
| 3077 | |
| 3078 | Only looks up to the top of the repository unless an |
| 3079 | 'inherit-review-settings-ok' file exists in the root of the repository. |
| 3080 | """ |
| 3081 | inherit_ok_file = 'inherit-review-settings-ok' |
| 3082 | cwd = os.getcwd() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 3083 | root = settings.GetRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3084 | if os.path.isfile(os.path.join(root, inherit_ok_file)): |
| 3085 | root = '/' |
| 3086 | while True: |
| 3087 | if filename in os.listdir(cwd): |
| 3088 | if os.path.isfile(os.path.join(cwd, filename)): |
| 3089 | return open(os.path.join(cwd, filename)) |
| 3090 | if cwd == root: |
| 3091 | break |
| 3092 | cwd = os.path.dirname(cwd) |
| 3093 | |
| 3094 | |
| 3095 | def LoadCodereviewSettingsFromFile(fileobj): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3096 | """Parses a codereview.settings file and updates hooks.""" |
maruel@chromium.org | 99ac1c5 | 2012-01-16 14:52:12 +0000 | [diff] [blame] | 3097 | keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3098 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3099 | def SetProperty(name, setting, unset_error_ok=False): |
| 3100 | fullname = 'rietveld.' + name |
| 3101 | if setting in keyvals: |
| 3102 | RunGit(['config', fullname, keyvals[setting]]) |
| 3103 | else: |
| 3104 | RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) |
| 3105 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 3106 | if not keyvals.get('GERRIT_HOST', False): |
| 3107 | SetProperty('server', 'CODE_REVIEW_SERVER') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3108 | # Only server setting is required. Other settings can be absent. |
| 3109 | # In that case, we ignore errors raised during option deletion attempt. |
| 3110 | SetProperty('cc', 'CC_LIST', unset_error_ok=True) |
| 3111 | SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) |
| 3112 | SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 3113 | SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3114 | SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True) |
| 3115 | SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 3116 | SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK', |
| 3117 | unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3118 | |
ukai@chromium.org | 7044efc | 2013-11-28 01:51:21 +0000 | [diff] [blame] | 3119 | if 'GERRIT_HOST' in keyvals: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3120 | RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3121 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3122 | if 'GERRIT_SQUASH_UPLOADS' in keyvals: |
tandrii | 8dd81ea | 2016-06-16 13:24:23 -0700 | [diff] [blame] | 3123 | RunGit(['config', 'gerrit.squash-uploads', |
| 3124 | keyvals['GERRIT_SQUASH_UPLOADS']]) |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3125 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3126 | if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals: |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 3127 | RunGit(['config', 'gerrit.skip-ensure-authenticated', |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3128 | keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']]) |
| 3129 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3130 | if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 3131 | # should be of the form |
| 3132 | # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof |
| 3133 | # ORIGIN_URL_CONFIG: http://src.chromium.org/git |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3134 | RunGit(['config', keyvals['PUSH_URL_CONFIG'], |
| 3135 | keyvals['ORIGIN_URL_CONFIG']]) |
| 3136 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3137 | |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3138 | def urlretrieve(source, destination): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3139 | """Downloads a network object to a local file, like urllib.urlretrieve. |
| 3140 | |
| 3141 | This is necessary because urllib is broken for SSL connections via a proxy. |
| 3142 | """ |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3143 | with open(destination, 'w') as f: |
| 3144 | f.write(urllib2.urlopen(source).read()) |
| 3145 | |
| 3146 | |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3147 | def hasSheBang(fname): |
| 3148 | """Checks fname is a #! script.""" |
| 3149 | with open(fname) as f: |
| 3150 | return f.read(2).startswith('#!') |
| 3151 | |
| 3152 | |
bpastene@chromium.org | 917f0ff | 2016-04-05 00:45:30 +0000 | [diff] [blame] | 3153 | # TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself. |
| 3154 | def DownloadHooks(*args, **kwargs): |
| 3155 | pass |
| 3156 | |
| 3157 | |
tandrii@chromium.org | 18630d6 | 2016-03-04 12:06:02 +0000 | [diff] [blame] | 3158 | def DownloadGerritHook(force): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3159 | """Downloads and installs a Gerrit commit-msg hook. |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3160 | |
| 3161 | Args: |
| 3162 | force: True to update hooks. False to install hooks if not present. |
| 3163 | """ |
| 3164 | if not settings.GetIsGerrit(): |
| 3165 | return |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3166 | src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg' |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3167 | dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 3168 | if not os.access(dst, os.X_OK): |
| 3169 | if os.path.exists(dst): |
| 3170 | if not force: |
| 3171 | return |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3172 | try: |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3173 | urlretrieve(src, dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3174 | if not hasSheBang(dst): |
| 3175 | DieWithError('Not a script: %s\n' |
| 3176 | 'You need to download from\n%s\n' |
| 3177 | 'into .git/hooks/commit-msg and ' |
| 3178 | 'chmod +x .git/hooks/commit-msg' % (dst, src)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3179 | os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) |
| 3180 | except Exception: |
| 3181 | if os.path.exists(dst): |
| 3182 | os.remove(dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3183 | DieWithError('\nFailed to download hooks.\n' |
| 3184 | 'You need to download from\n%s\n' |
| 3185 | 'into .git/hooks/commit-msg and ' |
| 3186 | 'chmod +x .git/hooks/commit-msg' % src) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3187 | |
| 3188 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3189 | class _GitCookiesChecker(object): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3190 | """Provides facilities for validating and suggesting fixes to .gitcookies.""" |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3191 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3192 | _GOOGLESOURCE = 'googlesource.com' |
| 3193 | |
| 3194 | def __init__(self): |
| 3195 | # Cached list of [host, identity, source], where source is either |
| 3196 | # .gitcookies or .netrc. |
| 3197 | self._all_hosts = None |
| 3198 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3199 | def ensure_configured_gitcookies(self): |
| 3200 | """Runs checks and suggests fixes to make git use .gitcookies from default |
| 3201 | path.""" |
| 3202 | default = gerrit_util.CookiesAuthenticator.get_gitcookies_path() |
| 3203 | configured_path = RunGitSilent( |
| 3204 | ['config', '--global', 'http.cookiefile']).strip() |
Andrii Shyshkalov | 1e250cd | 2017-05-10 15:39:31 +0200 | [diff] [blame] | 3205 | configured_path = os.path.expanduser(configured_path) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3206 | if configured_path: |
| 3207 | self._ensure_default_gitcookies_path(configured_path, default) |
| 3208 | else: |
| 3209 | self._configure_gitcookies_path(default) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3210 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3211 | @staticmethod |
| 3212 | def _ensure_default_gitcookies_path(configured_path, default_path): |
| 3213 | assert configured_path |
| 3214 | if configured_path == default_path: |
| 3215 | print('git is already configured to use your .gitcookies from %s' % |
| 3216 | configured_path) |
| 3217 | return |
| 3218 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3219 | print('WARNING: You have configured custom path to .gitcookies: %s\n' |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3220 | 'Gerrit and other depot_tools expect .gitcookies at %s\n' % |
| 3221 | (configured_path, default_path)) |
| 3222 | |
| 3223 | if not os.path.exists(configured_path): |
| 3224 | print('However, your configured .gitcookies file is missing.') |
| 3225 | confirm_or_exit('Reconfigure git to use default .gitcookies?', |
| 3226 | action='reconfigure') |
| 3227 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3228 | return |
| 3229 | |
| 3230 | if os.path.exists(default_path): |
| 3231 | print('WARNING: default .gitcookies file already exists %s' % |
| 3232 | default_path) |
| 3233 | DieWithError('Please delete %s manually and re-run git cl creds-check' % |
| 3234 | default_path) |
| 3235 | |
| 3236 | confirm_or_exit('Move existing .gitcookies to default location?', |
| 3237 | action='move') |
| 3238 | shutil.move(configured_path, default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3239 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3240 | print('Moved and reconfigured git to use .gitcookies from %s' % |
| 3241 | default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3242 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3243 | @staticmethod |
| 3244 | def _configure_gitcookies_path(default_path): |
| 3245 | netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path() |
| 3246 | if os.path.exists(netrc_path): |
| 3247 | print('You seem to be using outdated .netrc for git credentials: %s' % |
| 3248 | netrc_path) |
| 3249 | print('This tool will guide you through setting up recommended ' |
| 3250 | '.gitcookies store for git credentials.\n' |
| 3251 | '\n' |
| 3252 | 'IMPORTANT: If something goes wrong and you decide to go back, do:\n' |
| 3253 | ' git config --global --unset http.cookiefile\n' |
| 3254 | ' mv %s %s.backup\n\n' % (default_path, default_path)) |
| 3255 | confirm_or_exit(action='setup .gitcookies') |
| 3256 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3257 | print('Configured git to use .gitcookies from %s' % default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3258 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3259 | def get_hosts_with_creds(self, include_netrc=False): |
| 3260 | if self._all_hosts is None: |
| 3261 | a = gerrit_util.CookiesAuthenticator() |
| 3262 | self._all_hosts = [ |
| 3263 | (h, u, s) |
| 3264 | for h, u, s in itertools.chain( |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3265 | ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), |
| 3266 | ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()) |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3267 | ) |
| 3268 | if h.endswith(self._GOOGLESOURCE) |
| 3269 | ] |
| 3270 | |
| 3271 | if include_netrc: |
| 3272 | return self._all_hosts |
| 3273 | return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc'] |
| 3274 | |
| 3275 | def print_current_creds(self, include_netrc=False): |
| 3276 | hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc)) |
| 3277 | if not hosts: |
| 3278 | print('No Git/Gerrit credentials found') |
| 3279 | return |
| 3280 | lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)] |
| 3281 | header = [('Host', 'User', 'Which file'), |
| 3282 | ['=' * l for l in lengths]] |
| 3283 | for row in (header + hosts): |
| 3284 | print('\t'.join((('%%+%ds' % l) % s) |
| 3285 | for l, s in zip(lengths, row))) |
| 3286 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3287 | @staticmethod |
| 3288 | def _parse_identity(identity): |
Lei Zhang | d3f769a | 2017-12-15 15:16:14 -0800 | [diff] [blame] | 3289 | """Parses identity "git-<username>.domain" into <username> and domain.""" |
| 3290 | # Special case: usernames that contain ".", which are generally not |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 3291 | # distinguishable from sub-domains. But we do know typical domains: |
| 3292 | if identity.endswith('.chromium.org'): |
| 3293 | domain = 'chromium.org' |
| 3294 | username = identity[:-len('.chromium.org')] |
| 3295 | else: |
| 3296 | username, domain = identity.split('.', 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3297 | if username.startswith('git-'): |
| 3298 | username = username[len('git-'):] |
| 3299 | return username, domain |
| 3300 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3301 | def _canonical_git_googlesource_host(self, host): |
| 3302 | """Normalizes Gerrit hosts (with '-review') to Git host.""" |
| 3303 | assert host.endswith(self._GOOGLESOURCE) |
| 3304 | # Prefix doesn't include '.' at the end. |
| 3305 | prefix = host[:-(1 + len(self._GOOGLESOURCE))] |
| 3306 | if prefix.endswith('-review'): |
| 3307 | prefix = prefix[:-len('-review')] |
| 3308 | return prefix + '.' + self._GOOGLESOURCE |
| 3309 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3310 | def _canonical_gerrit_googlesource_host(self, host): |
| 3311 | git_host = self._canonical_git_googlesource_host(host) |
| 3312 | prefix = git_host.split('.', 1)[0] |
| 3313 | return prefix + '-review.' + self._GOOGLESOURCE |
| 3314 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3315 | def _get_counterpart_host(self, host): |
| 3316 | assert host.endswith(self._GOOGLESOURCE) |
| 3317 | git = self._canonical_git_googlesource_host(host) |
| 3318 | gerrit = self._canonical_gerrit_googlesource_host(git) |
| 3319 | return git if gerrit == host else gerrit |
| 3320 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3321 | def has_generic_host(self): |
| 3322 | """Returns whether generic .googlesource.com has been configured. |
| 3323 | |
| 3324 | Chrome Infra recommends to use explicit ${host}.googlesource.com instead. |
| 3325 | """ |
| 3326 | for host, _, _ in self.get_hosts_with_creds(include_netrc=False): |
| 3327 | if host == '.' + self._GOOGLESOURCE: |
| 3328 | return True |
| 3329 | return False |
| 3330 | |
| 3331 | def _get_git_gerrit_identity_pairs(self): |
| 3332 | """Returns map from canonic host to pair of identities (Git, Gerrit). |
| 3333 | |
| 3334 | One of identities might be None, meaning not configured. |
| 3335 | """ |
| 3336 | host_to_identity_pairs = {} |
| 3337 | for host, identity, _ in self.get_hosts_with_creds(): |
| 3338 | canonical = self._canonical_git_googlesource_host(host) |
| 3339 | pair = host_to_identity_pairs.setdefault(canonical, [None, None]) |
| 3340 | idx = 0 if canonical == host else 1 |
| 3341 | pair[idx] = identity |
| 3342 | return host_to_identity_pairs |
| 3343 | |
| 3344 | def get_partially_configured_hosts(self): |
| 3345 | return set( |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3346 | (host if i1 else self._canonical_gerrit_googlesource_host(host)) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3347 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3348 | if None in (i1, i2) and host != '.' + self._GOOGLESOURCE) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3349 | |
| 3350 | def get_conflicting_hosts(self): |
| 3351 | return set( |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3352 | host |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3353 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3354 | if None not in (i1, i2) and i1 != i2) |
| 3355 | |
| 3356 | def get_duplicated_hosts(self): |
| 3357 | 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] | 3358 | return set(host for host, count in counters.items() if count > 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3359 | |
| 3360 | _EXPECTED_HOST_IDENTITY_DOMAINS = { |
| 3361 | 'chromium.googlesource.com': 'chromium.org', |
| 3362 | 'chrome-internal.googlesource.com': 'google.com', |
| 3363 | } |
| 3364 | |
| 3365 | def get_hosts_with_wrong_identities(self): |
| 3366 | """Finds hosts which **likely** reference wrong identities. |
| 3367 | |
| 3368 | Note: skips hosts which have conflicting identities for Git and Gerrit. |
| 3369 | """ |
| 3370 | hosts = set() |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3371 | for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items(): |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3372 | pair = self._get_git_gerrit_identity_pairs().get(host) |
| 3373 | if pair and pair[0] == pair[1]: |
| 3374 | _, domain = self._parse_identity(pair[0]) |
| 3375 | if domain != expected: |
| 3376 | hosts.add(host) |
| 3377 | return hosts |
| 3378 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3379 | @staticmethod |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3380 | def _format_hosts(hosts, extra_column_func=None): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3381 | hosts = sorted(hosts) |
| 3382 | assert hosts |
| 3383 | if extra_column_func is None: |
| 3384 | extras = [''] * len(hosts) |
| 3385 | else: |
| 3386 | extras = [extra_column_func(host) for host in hosts] |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3387 | tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras))) |
| 3388 | lines = [] |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3389 | for he in zip(hosts, extras): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3390 | lines.append(tmpl % he) |
| 3391 | return lines |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3392 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3393 | def _find_problems(self): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3394 | if self.has_generic_host(): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3395 | yield ('.googlesource.com wildcard record detected', |
| 3396 | ['Chrome Infrastructure team recommends to list full host names ' |
| 3397 | 'explicitly.'], |
| 3398 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3399 | |
| 3400 | dups = self.get_duplicated_hosts() |
| 3401 | if dups: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3402 | yield ('The following hosts were defined twice', |
| 3403 | self._format_hosts(dups), |
| 3404 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3405 | |
| 3406 | partial = self.get_partially_configured_hosts() |
| 3407 | if partial: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3408 | yield ('Credentials should come in pairs for Git and Gerrit hosts. ' |
| 3409 | 'These hosts are missing', |
| 3410 | self._format_hosts(partial, lambda host: 'but %s defined' % |
| 3411 | self._get_counterpart_host(host)), |
| 3412 | partial) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3413 | |
| 3414 | conflicting = self.get_conflicting_hosts() |
| 3415 | if conflicting: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3416 | yield ('The following Git hosts have differing credentials from their ' |
| 3417 | 'Gerrit counterparts', |
| 3418 | self._format_hosts(conflicting, lambda host: '%s vs %s' % |
| 3419 | tuple(self._get_git_gerrit_identity_pairs()[host])), |
| 3420 | conflicting) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3421 | |
| 3422 | wrong = self.get_hosts_with_wrong_identities() |
| 3423 | if wrong: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3424 | yield ('These hosts likely use wrong identity', |
| 3425 | self._format_hosts(wrong, lambda host: '%s but %s recommended' % |
| 3426 | (self._get_git_gerrit_identity_pairs()[host][0], |
| 3427 | self._EXPECTED_HOST_IDENTITY_DOMAINS[host])), |
| 3428 | wrong) |
| 3429 | |
| 3430 | def find_and_report_problems(self): |
| 3431 | """Returns True if there was at least one problem, else False.""" |
| 3432 | found = False |
| 3433 | bad_hosts = set() |
| 3434 | for title, sublines, hosts in self._find_problems(): |
| 3435 | if not found: |
| 3436 | found = True |
| 3437 | print('\n\n.gitcookies problem report:\n') |
| 3438 | bad_hosts.update(hosts or []) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3439 | print(' %s%s' % (title, (':' if sublines else ''))) |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3440 | if sublines: |
| 3441 | print() |
| 3442 | print(' %s' % '\n '.join(sublines)) |
| 3443 | print() |
| 3444 | |
| 3445 | if bad_hosts: |
| 3446 | assert found |
| 3447 | print(' You can manually remove corresponding lines in your %s file and ' |
| 3448 | 'visit the following URLs with correct account to generate ' |
| 3449 | 'correct credential lines:\n' % |
| 3450 | gerrit_util.CookiesAuthenticator.get_gitcookies_path()) |
| 3451 | print(' %s' % '\n '.join(sorted(set( |
| 3452 | gerrit_util.CookiesAuthenticator().get_new_password_url( |
| 3453 | self._canonical_git_googlesource_host(host)) |
| 3454 | for host in bad_hosts |
| 3455 | )))) |
| 3456 | return found |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3457 | |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3458 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3459 | @metrics.collector.collect_metrics('git cl creds-check') |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3460 | def CMDcreds_check(parser, args): |
| 3461 | """Checks credentials and suggests changes.""" |
| 3462 | _, _ = parser.parse_args(args) |
| 3463 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3464 | # Code below checks .gitcookies. Abort if using something else. |
| 3465 | authn = gerrit_util.Authenticator.get() |
| 3466 | if not isinstance(authn, gerrit_util.CookiesAuthenticator): |
| 3467 | if isinstance(authn, gerrit_util.GceAuthenticator): |
| 3468 | DieWithError( |
| 3469 | 'This command is not designed for GCE, are you on a bot?\n' |
| 3470 | 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 ' |
| 3471 | 'in your env.') |
Aaron Gable | d10ca0e | 2017-09-11 11:24:10 -0700 | [diff] [blame] | 3472 | DieWithError( |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3473 | 'This command is not designed for bot environment. It checks ' |
| 3474 | '~/.gitcookies file not generally used on bots.') |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3475 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3476 | checker = _GitCookiesChecker() |
| 3477 | checker.ensure_configured_gitcookies() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3478 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3479 | print('Your .netrc and .gitcookies have credentials for these hosts:') |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3480 | checker.print_current_creds(include_netrc=True) |
| 3481 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3482 | if not checker.find_and_report_problems(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3483 | print('\nNo problems detected in your .gitcookies file.') |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3484 | return 0 |
| 3485 | return 1 |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3486 | |
| 3487 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3488 | @metrics.collector.collect_metrics('git cl baseurl') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3489 | def CMDbaseurl(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3490 | """Gets or sets base-url for this branch.""" |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3491 | branchref = RunGit(['symbolic-ref', 'HEAD']).strip() |
| 3492 | branch = ShortBranchName(branchref) |
| 3493 | _, args = parser.parse_args(args) |
| 3494 | if not args: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3495 | print('Current base-url:') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3496 | return RunGit(['config', 'branch.%s.base-url' % branch], |
| 3497 | error_ok=False).strip() |
| 3498 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3499 | print('Setting base-url to %s' % args[0]) |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3500 | return RunGit(['config', 'branch.%s.base-url' % branch, args[0]], |
| 3501 | error_ok=False).strip() |
| 3502 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3503 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3504 | def color_for_status(status): |
| 3505 | """Maps a Changelist status to color, for CMDstatus and other tools.""" |
| 3506 | return { |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3507 | 'unsent': Fore.YELLOW, |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3508 | 'waiting': Fore.BLUE, |
| 3509 | 'reply': Fore.YELLOW, |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3510 | 'not lgtm': Fore.RED, |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3511 | 'lgtm': Fore.GREEN, |
| 3512 | 'commit': Fore.MAGENTA, |
| 3513 | 'closed': Fore.CYAN, |
| 3514 | 'error': Fore.WHITE, |
| 3515 | }.get(status, Fore.WHITE) |
| 3516 | |
tandrii@chromium.org | 04ea846 | 2016-04-25 19:51:21 +0000 | [diff] [blame] | 3517 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3518 | def get_cl_statuses(changes, fine_grained, max_processes=None): |
| 3519 | """Returns a blocking iterable of (cl, status) for given branches. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3520 | |
| 3521 | If fine_grained is true, this will fetch CL statuses from the server. |
| 3522 | Otherwise, simply indicate if there's a matching url for the given branches. |
| 3523 | |
| 3524 | If max_processes is specified, it is used as the maximum number of processes |
| 3525 | to spawn to fetch CL status from the server. Otherwise 1 process per branch is |
| 3526 | spawned. |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3527 | |
| 3528 | See GetStatus() for a list of possible statuses. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3529 | """ |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3530 | if not changes: |
| 3531 | raise StopIteration() |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3532 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3533 | if not fine_grained: |
| 3534 | # Fast path which doesn't involve querying codereview servers. |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3535 | # 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] | 3536 | for cl in changes: |
| 3537 | yield (cl, 'waiting' if cl.GetIssueURL() else 'error') |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3538 | return |
| 3539 | |
| 3540 | # First, sort out authentication issues. |
| 3541 | logging.debug('ensuring credentials exist') |
| 3542 | for cl in changes: |
| 3543 | cl.EnsureAuthenticated(force=False, refresh=True) |
| 3544 | |
| 3545 | def fetch(cl): |
| 3546 | try: |
| 3547 | return (cl, cl.GetStatus()) |
| 3548 | except: |
| 3549 | # See http://crbug.com/629863. |
Andrii Shyshkalov | 9882423 | 2018-04-19 11:37:15 -0700 | [diff] [blame] | 3550 | logging.exception('failed to fetch status for cl %s:', cl.GetIssue()) |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3551 | raise |
| 3552 | |
| 3553 | threads_count = len(changes) |
| 3554 | if max_processes: |
| 3555 | threads_count = max(1, min(threads_count, max_processes)) |
| 3556 | logging.debug('querying %d CLs using %d threads', len(changes), threads_count) |
| 3557 | |
| 3558 | pool = ThreadPool(threads_count) |
| 3559 | fetched_cls = set() |
| 3560 | try: |
| 3561 | it = pool.imap_unordered(fetch, changes).__iter__() |
| 3562 | while True: |
| 3563 | try: |
| 3564 | cl, status = it.next(timeout=5) |
| 3565 | except multiprocessing.TimeoutError: |
| 3566 | break |
| 3567 | fetched_cls.add(cl) |
| 3568 | yield cl, status |
| 3569 | finally: |
| 3570 | pool.close() |
| 3571 | |
| 3572 | # Add any branches that failed to fetch. |
| 3573 | for cl in set(changes) - fetched_cls: |
| 3574 | yield (cl, 'error') |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3575 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3576 | |
| 3577 | def upload_branch_deps(cl, args): |
| 3578 | """Uploads CLs of local branches that are dependents of the current branch. |
| 3579 | |
| 3580 | If the local branch dependency tree looks like: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3581 | |
| 3582 | test1 -> test2.1 -> test3.1 |
| 3583 | -> test3.2 |
| 3584 | -> test2.2 -> test3.3 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3585 | |
| 3586 | and you run "git cl upload --dependencies" from test1 then "git cl upload" is |
| 3587 | run on the dependent branches in this order: |
| 3588 | test2.1, test3.1, test3.2, test2.2, test3.3 |
| 3589 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3590 | Note: This function does not rebase your local dependent branches. Use it |
| 3591 | when you make a change to the parent branch that will not conflict |
| 3592 | with its dependent branches, and you would like their dependencies |
| 3593 | updated in Rietveld. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3594 | """ |
| 3595 | if git_common.is_dirty_git_tree('upload-branch-deps'): |
| 3596 | return 1 |
| 3597 | |
| 3598 | root_branch = cl.GetBranch() |
| 3599 | if root_branch is None: |
| 3600 | DieWithError('Can\'t find dependent branches from detached HEAD state. ' |
| 3601 | 'Get on a branch!') |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 3602 | if not cl.GetIssue(): |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3603 | DieWithError('Current branch does not have an uploaded CL. We cannot set ' |
| 3604 | 'patchset dependencies without an uploaded CL.') |
| 3605 | |
| 3606 | branches = RunGit(['for-each-ref', |
| 3607 | '--format=%(refname:short) %(upstream:short)', |
| 3608 | 'refs/heads']) |
| 3609 | if not branches: |
| 3610 | print('No local branches found.') |
| 3611 | return 0 |
| 3612 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3613 | # Create a dictionary of all local branches to the branches that are |
| 3614 | # dependent on it. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3615 | tracked_to_dependents = collections.defaultdict(list) |
| 3616 | for b in branches.splitlines(): |
| 3617 | tokens = b.split() |
| 3618 | if len(tokens) == 2: |
| 3619 | branch_name, tracked = tokens |
| 3620 | tracked_to_dependents[tracked].append(branch_name) |
| 3621 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3622 | print() |
| 3623 | print('The dependent local branches of %s are:' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3624 | dependents = [] |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3625 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3626 | def traverse_dependents_preorder(branch, padding=''): |
| 3627 | dependents_to_process = tracked_to_dependents.get(branch, []) |
| 3628 | padding += ' ' |
| 3629 | for dependent in dependents_to_process: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3630 | print('%s%s' % (padding, dependent)) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3631 | dependents.append(dependent) |
| 3632 | traverse_dependents_preorder(dependent, padding) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3633 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3634 | traverse_dependents_preorder(root_branch) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3635 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3636 | |
| 3637 | if not dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3638 | print('There are no dependent local branches for %s' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3639 | return 0 |
| 3640 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 3641 | confirm_or_exit('This command will checkout all dependent branches and run ' |
| 3642 | '"git cl upload".', action='continue') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3643 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3644 | # Record all dependents that failed to upload. |
| 3645 | failures = {} |
| 3646 | # Go through all dependents, checkout the branch and upload. |
| 3647 | try: |
| 3648 | for dependent_branch in dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3649 | print() |
| 3650 | print('--------------------------------------') |
| 3651 | print('Running "git cl upload" from %s:' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3652 | RunGit(['checkout', '-q', dependent_branch]) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3653 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3654 | try: |
| 3655 | if CMDupload(OptionParser(), args) != 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3656 | print('Upload failed for %s!' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3657 | failures[dependent_branch] = 1 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 3658 | except: # pylint: disable=bare-except |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3659 | failures[dependent_branch] = 1 |
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 | finally: |
| 3662 | # Swap back to the original root branch. |
| 3663 | RunGit(['checkout', '-q', root_branch]) |
| 3664 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3665 | print() |
| 3666 | print('Upload complete for dependent branches!') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3667 | for dependent_branch in dependents: |
| 3668 | upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3669 | print(' %s : %s' % (dependent_branch, upload_status)) |
| 3670 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3671 | |
| 3672 | return 0 |
| 3673 | |
| 3674 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3675 | @metrics.collector.collect_metrics('git cl archive') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3676 | def CMDarchive(parser, args): |
| 3677 | """Archives and deletes branches associated with closed changelists.""" |
| 3678 | parser.add_option( |
| 3679 | '-j', '--maxjobs', action='store', type=int, |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3680 | help='The maximum number of jobs to use when retrieving review status.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3681 | parser.add_option( |
| 3682 | '-f', '--force', action='store_true', |
| 3683 | help='Bypasses the confirmation prompt.') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3684 | parser.add_option( |
| 3685 | '-d', '--dry-run', action='store_true', |
| 3686 | help='Skip the branch tagging and removal steps.') |
| 3687 | parser.add_option( |
| 3688 | '-t', '--notags', action='store_true', |
| 3689 | help='Do not tag archived branches. ' |
| 3690 | 'Note: local commit history may be lost.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3691 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3692 | options, args = parser.parse_args(args) |
| 3693 | if args: |
| 3694 | parser.error('Unsupported args: %s' % ' '.join(args)) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3695 | |
| 3696 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3697 | if not branches: |
| 3698 | return 0 |
| 3699 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3700 | print('Finding all branches associated with closed issues...') |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3701 | changes = [Changelist(branchref=b) |
| 3702 | for b in branches.splitlines()] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3703 | alignment = max(5, max(len(c.GetBranch()) for c in changes)) |
| 3704 | statuses = get_cl_statuses(changes, |
| 3705 | fine_grained=True, |
| 3706 | max_processes=options.maxjobs) |
| 3707 | proposal = [(cl.GetBranch(), |
| 3708 | 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch())) |
| 3709 | for cl, status in statuses |
Andrii Shyshkalov | 51bdf8c | 2018-10-18 01:07:58 +0000 | [diff] [blame] | 3710 | if status in ('closed', 'rietveld-not-supported')] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3711 | proposal.sort() |
| 3712 | |
| 3713 | if not proposal: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3714 | print('No branches with closed codereview issues found.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3715 | return 0 |
| 3716 | |
| 3717 | current_branch = GetCurrentBranch() |
| 3718 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3719 | print('\nBranches with closed issues that will be archived:\n') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3720 | if options.notags: |
| 3721 | for next_item in proposal: |
| 3722 | print(' ' + next_item[0]) |
| 3723 | else: |
| 3724 | print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name')) |
| 3725 | for next_item in proposal: |
| 3726 | print('%*s %s' % (alignment, next_item[0], next_item[1])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3727 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3728 | # Quit now on precondition failure or if instructed by the user, either |
| 3729 | # via an interactive prompt or by command line flags. |
| 3730 | if options.dry_run: |
| 3731 | print('\nNo changes were made (dry run).\n') |
| 3732 | return 0 |
| 3733 | elif any(branch == current_branch for branch, _ in proposal): |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3734 | print('You are currently on a branch \'%s\' which is associated with a ' |
| 3735 | 'closed codereview issue, so archive cannot proceed. Please ' |
| 3736 | 'checkout another branch and run this command again.' % |
| 3737 | current_branch) |
| 3738 | return 1 |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3739 | elif not options.force: |
sergiyb | 4a5ecbe | 2016-06-20 09:46:00 -0700 | [diff] [blame] | 3740 | answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower() |
| 3741 | if answer not in ('y', ''): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3742 | print('Aborted.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3743 | return 1 |
| 3744 | |
| 3745 | for branch, tagname in proposal: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3746 | if not options.notags: |
| 3747 | RunGit(['tag', tagname, branch]) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3748 | RunGit(['branch', '-D', branch]) |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3749 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3750 | print('\nJob\'s done!') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3751 | |
| 3752 | return 0 |
| 3753 | |
| 3754 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3755 | @metrics.collector.collect_metrics('git cl status') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3756 | def CMDstatus(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3757 | """Show status of changelists. |
| 3758 | |
| 3759 | 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] | 3760 | - Blue waiting for review |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3761 | - 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] | 3762 | - Green LGTM'ed |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3763 | - Red 'not LGTM'ed |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 3764 | - Magenta in the CQ |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3765 | - Cyan was committed, branch can be deleted |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3766 | - White error, or unknown status |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3767 | |
| 3768 | Also see 'git cl comments'. |
| 3769 | """ |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3770 | parser.add_option( |
| 3771 | '--no-branch-color', |
| 3772 | action='store_true', |
| 3773 | help='Disable colorized branch names') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3774 | parser.add_option('--field', |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3775 | help='print only specific field (desc|id|patch|status|url)') |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3776 | parser.add_option('-f', '--fast', action='store_true', |
| 3777 | help='Do not retrieve review status') |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3778 | parser.add_option( |
| 3779 | '-j', '--maxjobs', action='store', type=int, |
| 3780 | help='The maximum number of jobs to use when retrieving review status') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3781 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3782 | _add_codereview_issue_select_options( |
| 3783 | parser, 'Must be in conjunction with --field.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 3784 | options, args = parser.parse_args(args) |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3785 | if args: |
| 3786 | parser.error('Unsupported args: %s' % args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3787 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 3788 | if options.issue is not None and not options.field: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 3789 | parser.error('--field must be specified with --issue.') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 3790 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3791 | if options.field: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3792 | cl = Changelist(issue=options.issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3793 | if options.field.startswith('desc'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3794 | print(cl.GetDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3795 | elif options.field == 'id': |
| 3796 | issueid = cl.GetIssue() |
| 3797 | if issueid: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3798 | print(issueid) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3799 | elif options.field == 'patch': |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 3800 | patchset = cl.GetMostRecentPatchset() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3801 | if patchset: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3802 | print(patchset) |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3803 | elif options.field == 'status': |
| 3804 | print(cl.GetStatus()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3805 | elif options.field == 'url': |
| 3806 | url = cl.GetIssueURL() |
| 3807 | if url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3808 | print(url) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 3809 | return 0 |
| 3810 | |
| 3811 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3812 | if not branches: |
| 3813 | print('No local branch found.') |
| 3814 | return 0 |
| 3815 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3816 | changes = [ |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3817 | Changelist(branchref=b) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3818 | for b in branches.splitlines()] |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3819 | print('Branches associated with reviews:') |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3820 | output = get_cl_statuses(changes, |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3821 | fine_grained=not options.fast, |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3822 | max_processes=options.maxjobs) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3823 | |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3824 | current_branch = GetCurrentBranch() |
| 3825 | |
| 3826 | def FormatBranchName(branch, colorize=False): |
| 3827 | """Simulates 'git branch' behavior. Colorizes and prefixes branch name with |
| 3828 | an asterisk when it is the current branch.""" |
| 3829 | |
| 3830 | asterisk = "" |
| 3831 | color = Fore.RESET |
| 3832 | if branch == current_branch: |
| 3833 | asterisk = "* " |
| 3834 | color = Fore.GREEN |
| 3835 | branch_name = ShortBranchName(branch) |
| 3836 | |
| 3837 | if colorize: |
| 3838 | return asterisk + color + branch_name + Fore.RESET |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3839 | return asterisk + branch_name |
| 3840 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3841 | branch_statuses = {} |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3842 | |
| 3843 | 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] | 3844 | for cl in sorted(changes, key=lambda c: c.GetBranch()): |
| 3845 | branch = cl.GetBranch() |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3846 | while branch not in branch_statuses: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3847 | c, status = output.next() |
| 3848 | branch_statuses[c.GetBranch()] = status |
| 3849 | status = branch_statuses.pop(branch) |
| 3850 | url = cl.GetIssueURL() |
| 3851 | if url and (not status or status == 'error'): |
| 3852 | # The issue probably doesn't exist anymore. |
| 3853 | url += ' (broken)' |
| 3854 | |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3855 | color = color_for_status(status) |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3856 | reset = Fore.RESET |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 3857 | if not setup_color.IS_TTY: |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 3858 | color = '' |
| 3859 | reset = '' |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 3860 | status_str = '(%s)' % status if status else '' |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3861 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3862 | branch_display = FormatBranchName(branch) |
| 3863 | padding = ' ' * (alignment - len(branch_display)) |
| 3864 | if not options.no_branch_color: |
| 3865 | branch_display = FormatBranchName(branch, colorize=True) |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 3866 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3867 | print(' %s : %s%s %s%s' % (padding + branch_display, color, url, |
| 3868 | status_str, reset)) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3869 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3870 | print() |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3871 | print('Current branch: %s' % current_branch) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3872 | for cl in changes: |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 3873 | if cl.GetBranch() == current_branch: |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 3874 | break |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3875 | if not cl.GetIssue(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3876 | print('No issue assigned.') |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 3877 | return 0 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3878 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 3879 | if not options.fast: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3880 | print('Issue description:') |
| 3881 | print(cl.GetDescription(pretty=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3882 | return 0 |
| 3883 | |
| 3884 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3885 | def colorize_CMDstatus_doc(): |
| 3886 | """To be called once in main() to add colors to git cl status help.""" |
| 3887 | colors = [i for i in dir(Fore) if i[0].isupper()] |
| 3888 | |
| 3889 | def colorize_line(line): |
| 3890 | for color in colors: |
| 3891 | if color in line.upper(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3892 | # Extract whitespace first and the leading '-'. |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 3893 | indent = len(line) - len(line.lstrip(' ')) + 1 |
| 3894 | return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET |
| 3895 | return line |
| 3896 | |
| 3897 | lines = CMDstatus.__doc__.splitlines() |
| 3898 | CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines) |
| 3899 | |
| 3900 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3901 | def write_json(path, contents): |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 3902 | if path == '-': |
| 3903 | json.dump(contents, sys.stdout) |
| 3904 | else: |
| 3905 | with open(path, 'w') as f: |
| 3906 | json.dump(contents, f) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3907 | |
| 3908 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 3909 | @subcommand.usage('[issue_number]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3910 | @metrics.collector.collect_metrics('git cl issue') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3911 | def CMDissue(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3912 | """Sets or displays the current code review issue number. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3913 | |
| 3914 | Pass issue number 0 to clear the current issue. |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3915 | """ |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3916 | parser.add_option('-r', '--reverse', action='store_true', |
| 3917 | help='Lookup the branch(es) for the specified issues. If ' |
| 3918 | 'no issues are specified, all branches with mapped ' |
| 3919 | 'issues will be listed.') |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 3920 | parser.add_option('--json', |
| 3921 | help='Path to JSON output file, or "-" for stdout.') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 3922 | _add_codereview_select_options(parser) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3923 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3924 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3925 | if options.reverse: |
| 3926 | branches = RunGit(['for-each-ref', 'refs/heads', |
Aaron Gable | ad64abd | 2017-12-04 09:49:13 -0800 | [diff] [blame] | 3927 | '--format=%(refname)']).splitlines() |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3928 | # Reverse issue lookup. |
| 3929 | issue_branch_map = {} |
Daniel Bratell | b56a43a | 2018-09-06 15:49:03 +0000 | [diff] [blame] | 3930 | |
| 3931 | git_config = {} |
| 3932 | for config in RunGit(['config', '--get-regexp', |
| 3933 | r'branch\..*issue']).splitlines(): |
| 3934 | name, _space, val = config.partition(' ') |
| 3935 | git_config[name] = val |
| 3936 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3937 | for branch in branches: |
Daniel Bratell | b56a43a | 2018-09-06 15:49:03 +0000 | [diff] [blame] | 3938 | for cls in _CODEREVIEW_IMPLEMENTATIONS.values(): |
| 3939 | config_key = _git_branch_config_key(ShortBranchName(branch), |
| 3940 | cls.IssueConfigKey()) |
| 3941 | issue = git_config.get(config_key) |
| 3942 | if issue: |
| 3943 | issue_branch_map.setdefault(int(issue), []).append(branch) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3944 | if not args: |
| 3945 | args = sorted(issue_branch_map.iterkeys()) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3946 | result = {} |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3947 | for issue in args: |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3948 | try: |
| 3949 | issue_num = int(issue) |
| 3950 | except ValueError: |
| 3951 | print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3952 | continue |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3953 | result[issue_num] = issue_branch_map.get(issue_num) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3954 | print('Branch for issue number %s: %s' % ( |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 3955 | issue, ', '.join(issue_branch_map.get(issue_num) or ('None',)))) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 3956 | if options.json: |
| 3957 | write_json(options.json, result) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3958 | return 0 |
| 3959 | |
| 3960 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3961 | issue = ParseIssueNumberArgument(args[0]) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3962 | if not issue.valid: |
| 3963 | DieWithError('Pass a url or number to set the issue, 0 to unset it, ' |
| 3964 | 'or no argument to list it.\n' |
| 3965 | 'Maybe you want to run git cl status?') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3966 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3967 | cl.SetIssue(issue.issue) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 3968 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3969 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 3970 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
| 3971 | if options.json: |
| 3972 | write_json(options.json, { |
| 3973 | 'issue': cl.GetIssue(), |
| 3974 | 'issue_url': cl.GetIssueURL(), |
| 3975 | }) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3976 | return 0 |
| 3977 | |
| 3978 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3979 | @metrics.collector.collect_metrics('git cl comments') |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 3980 | def CMDcomments(parser, args): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3981 | """Shows or posts review comments for any changelist.""" |
| 3982 | parser.add_option('-a', '--add-comment', dest='comment', |
| 3983 | help='comment to add to an issue') |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 3984 | parser.add_option('-p', '--publish', action='store_true', |
| 3985 | help='marks CL as ready and sends comment to reviewers') |
Andrii Shyshkalov | 0d6b46e | 2017-03-17 22:23:22 +0100 | [diff] [blame] | 3986 | parser.add_option('-i', '--issue', dest='issue', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 3987 | help='review issue id (defaults to current issue).') |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 3988 | parser.add_option('-m', '--machine-readable', dest='readable', |
| 3989 | action='store_false', default=True, |
| 3990 | help='output comments in a format compatible with ' |
| 3991 | 'editor parsing') |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 3992 | parser.add_option('-j', '--json-file', |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 3993 | help='File to write JSON summary to, or "-" for stdout') |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 3994 | _add_codereview_select_options(parser) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3995 | options, args = parser.parse_args(args) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 3996 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 3997 | issue = None |
| 3998 | if options.issue: |
| 3999 | try: |
| 4000 | issue = int(options.issue) |
| 4001 | except ValueError: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4002 | DieWithError('A review issue ID is expected to be a number.') |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4003 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4004 | cl = Changelist(issue=issue) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4005 | |
| 4006 | if options.comment: |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 4007 | cl.AddComment(options.comment, options.publish) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4008 | return 0 |
| 4009 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 4010 | summary = sorted(cl.GetCommentsSummary(readable=options.readable), |
| 4011 | key=lambda c: c.date) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4012 | for comment in summary: |
| 4013 | if comment.disapproval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4014 | color = Fore.RED |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4015 | elif comment.approval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4016 | color = Fore.GREEN |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4017 | elif comment.sender == cl.GetIssueOwner(): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4018 | color = Fore.MAGENTA |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 4019 | elif comment.autogenerated: |
| 4020 | color = Fore.CYAN |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4021 | else: |
| 4022 | color = Fore.BLUE |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4023 | print('\n%s%s %s%s\n%s' % ( |
| 4024 | color, |
| 4025 | comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'), |
| 4026 | comment.sender, |
| 4027 | Fore.RESET, |
| 4028 | '\n'.join(' ' + l for l in comment.message.strip().splitlines()))) |
| 4029 | |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 4030 | if options.json_file: |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4031 | def pre_serialize(c): |
| 4032 | dct = c.__dict__.copy() |
| 4033 | dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f') |
| 4034 | return dct |
Leszek Swirski | 45b20c4 | 2018-09-17 17:05:26 +0000 | [diff] [blame] | 4035 | write_json(options.json_file, map(pre_serialize, summary)) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4036 | return 0 |
| 4037 | |
| 4038 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4039 | @subcommand.usage('[codereview url or issue id]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4040 | @metrics.collector.collect_metrics('git cl description') |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4041 | def CMDdescription(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4042 | """Brings up the editor for the current CL's description.""" |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4043 | parser.add_option('-d', '--display', action='store_true', |
| 4044 | help='Display the description instead of opening an editor') |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4045 | parser.add_option('-n', '--new-description', |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4046 | help='New description to set for this issue (- for stdin, ' |
| 4047 | '+ to load from local commit HEAD)') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4048 | parser.add_option('-f', '--force', action='store_true', |
| 4049 | help='Delete any unpublished Gerrit edits for this issue ' |
| 4050 | 'without prompting') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4051 | |
| 4052 | _add_codereview_select_options(parser) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4053 | options, args = parser.parse_args(args) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4054 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4055 | target_issue_arg = None |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4056 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4057 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4058 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4059 | parser.error('Invalid issue ID or URL.') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4060 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4061 | kwargs = {} |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4062 | if target_issue_arg: |
| 4063 | kwargs['issue'] = target_issue_arg.issue |
| 4064 | kwargs['codereview_host'] = target_issue_arg.hostname |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 4065 | |
| 4066 | cl = Changelist(**kwargs) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4067 | if not cl.GetIssue(): |
| 4068 | DieWithError('This branch has no associated changelist.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4069 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4070 | if args and not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4071 | logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4072 | |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4073 | description = ChangeDescription(cl.GetDescription()) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4074 | |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4075 | if options.display: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4076 | print(description.description) |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4077 | return 0 |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4078 | |
| 4079 | if options.new_description: |
| 4080 | text = options.new_description |
| 4081 | if text == '-': |
| 4082 | text = '\n'.join(l.rstrip() for l in sys.stdin) |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4083 | elif text == '+': |
| 4084 | base_branch = cl.GetCommonAncestorWithUpstream() |
| 4085 | change = cl.GetChange(base_branch, None, local_description=True) |
| 4086 | text = change.FullDescriptionText() |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4087 | |
| 4088 | description.set_description(text) |
| 4089 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4090 | description.prompt() |
Andrii Shyshkalov | 680253d | 2017-03-15 21:07:36 +0100 | [diff] [blame] | 4091 | if cl.GetDescription().strip() != description.description: |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4092 | cl.UpdateDescription(description.description, force=options.force) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4093 | return 0 |
| 4094 | |
| 4095 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4096 | @metrics.collector.collect_metrics('git cl lint') |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4097 | def CMDlint(parser, args): |
| 4098 | """Runs cpplint on the current changelist.""" |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4099 | parser.add_option('--filter', action='append', metavar='-x,+y', |
| 4100 | help='Comma-separated list of cpplint\'s category-filters') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4101 | options, args = parser.parse_args(args) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4102 | |
| 4103 | # Access to a protected member _XX of a client class |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 4104 | # pylint: disable=protected-access |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4105 | try: |
| 4106 | import cpplint |
| 4107 | import cpplint_chromium |
| 4108 | except ImportError: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4109 | 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] | 4110 | return 1 |
| 4111 | |
| 4112 | # Change the current working directory before calling lint so that it |
| 4113 | # shows the correct base. |
| 4114 | previous_cwd = os.getcwd() |
| 4115 | os.chdir(settings.GetRoot()) |
| 4116 | try: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4117 | cl = Changelist() |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4118 | change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None) |
| 4119 | files = [f.LocalPath() for f in change.AffectedFiles()] |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4120 | if not files: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4121 | print('Cannot lint an empty CL') |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4122 | return 1 |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4123 | |
| 4124 | # Process cpplints arguments if any. |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4125 | command = args + files |
| 4126 | if options.filter: |
| 4127 | command = ['--filter=' + ','.join(options.filter)] + command |
| 4128 | filenames = cpplint.ParseArguments(command) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4129 | |
| 4130 | white_regex = re.compile(settings.GetLintRegex()) |
| 4131 | black_regex = re.compile(settings.GetLintIgnoreRegex()) |
| 4132 | extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace] |
| 4133 | for filename in filenames: |
| 4134 | if white_regex.match(filename): |
| 4135 | if black_regex.match(filename): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4136 | print('Ignoring file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4137 | else: |
| 4138 | cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level, |
| 4139 | extra_check_functions) |
| 4140 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4141 | print('Skipping file %s' % filename) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4142 | finally: |
| 4143 | os.chdir(previous_cwd) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4144 | print('Total errors found: %d\n' % cpplint._cpplint_state.error_count) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4145 | if cpplint._cpplint_state.error_count != 0: |
| 4146 | return 1 |
| 4147 | return 0 |
| 4148 | |
| 4149 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4150 | @metrics.collector.collect_metrics('git cl presubmit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4151 | def CMDpresubmit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4152 | """Runs presubmit tests on the current changelist.""" |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4153 | parser.add_option('-u', '--upload', action='store_true', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4154 | help='Run upload hook instead of the push hook') |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4155 | parser.add_option('-f', '--force', action='store_true', |
sbc@chromium.org | 495ad15 | 2012-09-04 23:07:42 +0000 | [diff] [blame] | 4156 | help='Run checks even if tree is dirty') |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4157 | parser.add_option('--all', action='store_true', |
| 4158 | help='Run checks against all files, not just modified ones') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4159 | parser.add_option('--parallel', action='store_true', |
| 4160 | help='Run all tests specified by input_api.RunTests in all ' |
| 4161 | 'PRESUBMIT files in parallel.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4162 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4163 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4164 | if not options.force and git_common.is_dirty_git_tree('presubmit'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4165 | print('use --force to check even if tree is dirty.') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4166 | return 1 |
| 4167 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4168 | cl = Changelist() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4169 | if args: |
| 4170 | base_branch = args[0] |
| 4171 | else: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 4172 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4173 | base_branch = cl.GetCommonAncestorWithUpstream() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4174 | |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4175 | if options.all: |
| 4176 | base_change = cl.GetChange(base_branch, None) |
| 4177 | files = [('M', f) for f in base_change.AllFiles()] |
| 4178 | change = presubmit_support.GitChange( |
| 4179 | base_change.Name(), |
| 4180 | base_change.FullDescriptionText(), |
| 4181 | base_change.RepositoryRoot(), |
| 4182 | files, |
| 4183 | base_change.issue, |
| 4184 | base_change.patchset, |
| 4185 | base_change.author_email, |
| 4186 | base_change._upstream) |
| 4187 | else: |
| 4188 | change = cl.GetChange(base_branch, None) |
| 4189 | |
ilevy@chromium.org | 051ad0e | 2013-03-04 21:57:34 +0000 | [diff] [blame] | 4190 | cl.RunHook( |
| 4191 | committing=not options.upload, |
| 4192 | may_prompt=False, |
| 4193 | verbose=options.verbose, |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4194 | change=change, |
| 4195 | parallel=options.parallel) |
dpranke@chromium.org | 0a2bb37 | 2011-03-25 01:16:22 +0000 | [diff] [blame] | 4196 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4197 | |
| 4198 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4199 | def GenerateGerritChangeId(message): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4200 | """Returns the Change ID footer value (Ixxxxxx...xxx). |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4201 | |
| 4202 | Works the same way as |
| 4203 | https://gerrit-review.googlesource.com/tools/hooks/commit-msg |
| 4204 | but can be called on demand on all platforms. |
| 4205 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4206 | The basic idea is to generate git hash of a state of the tree, original |
| 4207 | commit message, author/committer info and timestamps. |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4208 | """ |
| 4209 | lines = [] |
| 4210 | tree_hash = RunGitSilent(['write-tree']) |
| 4211 | lines.append('tree %s' % tree_hash.strip()) |
| 4212 | code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False) |
| 4213 | if code == 0: |
| 4214 | lines.append('parent %s' % parent.strip()) |
| 4215 | author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT']) |
| 4216 | lines.append('author %s' % author.strip()) |
| 4217 | committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT']) |
| 4218 | lines.append('committer %s' % committer.strip()) |
| 4219 | lines.append('') |
| 4220 | # Note: Gerrit's commit-hook actually cleans message of some lines and |
| 4221 | # whitespace. This code is not doing this, but it clearly won't decrease |
| 4222 | # entropy. |
| 4223 | lines.append(message) |
| 4224 | change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'], |
Raul Tambre | b946b23 | 2019-03-26 14:48:46 +0000 | [diff] [blame] | 4225 | stdin=('\n'.join(lines)).encode()) |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4226 | return 'I%s' % change_hash.strip() |
| 4227 | |
| 4228 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 4229 | def GetTargetRef(remote, remote_branch, target_branch): |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4230 | """Computes the remote branch ref to use for the CL. |
| 4231 | |
| 4232 | Args: |
| 4233 | remote (str): The git remote for the CL. |
| 4234 | remote_branch (str): The git remote branch for the CL. |
| 4235 | target_branch (str): The target branch specified by the user. |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4236 | """ |
| 4237 | if not (remote and remote_branch): |
| 4238 | return None |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4239 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4240 | if target_branch: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 4241 | # Canonicalize branch references to the equivalent local full symbolic |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4242 | # refs, which are then translated into the remote full symbolic refs |
| 4243 | # below. |
| 4244 | if '/' not in target_branch: |
| 4245 | remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch) |
| 4246 | else: |
| 4247 | prefix_replacements = ( |
| 4248 | ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'), |
| 4249 | ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote), |
| 4250 | ('^(refs/)?heads/', 'refs/remotes/%s/' % remote), |
| 4251 | ) |
| 4252 | match = None |
| 4253 | for regex, replacement in prefix_replacements: |
| 4254 | match = re.search(regex, target_branch) |
| 4255 | if match: |
| 4256 | remote_branch = target_branch.replace(match.group(0), replacement) |
| 4257 | break |
| 4258 | if not match: |
| 4259 | # This is a branch path but not one we recognize; use as-is. |
| 4260 | remote_branch = target_branch |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 4261 | elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS: |
| 4262 | # Handle the refs that need to land in different refs. |
| 4263 | remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4264 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4265 | # Create the true path to the remote branch. |
| 4266 | # Does the following translation: |
| 4267 | # * refs/remotes/origin/refs/diff/test -> refs/diff/test |
| 4268 | # * refs/remotes/origin/master -> refs/heads/master |
| 4269 | # * refs/remotes/branch-heads/test -> refs/branch-heads/test |
| 4270 | if remote_branch.startswith('refs/remotes/%s/refs/' % remote): |
| 4271 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '') |
| 4272 | elif remote_branch.startswith('refs/remotes/%s/' % remote): |
| 4273 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, |
| 4274 | 'refs/heads/') |
| 4275 | elif remote_branch.startswith('refs/remotes/branch-heads'): |
| 4276 | remote_branch = remote_branch.replace('refs/remotes/', 'refs/') |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 4277 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4278 | return remote_branch |
| 4279 | |
| 4280 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4281 | def cleanup_list(l): |
| 4282 | """Fixes a list so that comma separated items are put as individual items. |
| 4283 | |
| 4284 | So that "--reviewers joe@c,john@c --reviewers joa@c" results in |
| 4285 | options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']). |
| 4286 | """ |
| 4287 | items = sum((i.split(',') for i in l), []) |
| 4288 | stripped_items = (i.strip() for i in items) |
| 4289 | return sorted(filter(None, stripped_items)) |
| 4290 | |
| 4291 | |
Aaron Gable | 4db38df | 2017-11-03 14:59:07 -0700 | [diff] [blame] | 4292 | @subcommand.usage('[flags]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4293 | @metrics.collector.collect_metrics('git cl upload') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4294 | def CMDupload(parser, args): |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4295 | """Uploads the current changelist to codereview. |
| 4296 | |
| 4297 | Can skip dependency patchset uploads for a branch by running: |
| 4298 | git config branch.branch_name.skip-deps-uploads True |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4299 | To unset, run: |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4300 | git config --unset branch.branch_name.skip-deps-uploads |
| 4301 | Can also set the above globally by using the --global flag. |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 4302 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4303 | If the name of the checked out branch starts with "bug-" or "fix-" followed |
| 4304 | 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] | 4305 | description. |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4306 | |
| 4307 | If subject contains text in square brackets or has "<text>: " prefix, such |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4308 | text(s) is treated as Gerrit hashtags. For example, CLs with subjects: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4309 | [git-cl] add support for hashtags |
| 4310 | Foo bar: implement foo |
| 4311 | will be hashtagged with "git-cl" and "foo-bar" respectively. |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4312 | """ |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4313 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4314 | help='bypass upload presubmit hook') |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 4315 | parser.add_option('--bypass-watchlists', action='store_true', |
| 4316 | dest='bypass_watchlists', |
| 4317 | help='bypass watchlists auto CC-ing reviewers') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4318 | parser.add_option('-f', '--force', action='store_true', dest='force', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4319 | help="force yes to questions (don't prompt)") |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4320 | parser.add_option('--message', '-m', dest='message', |
| 4321 | help='message for patchset') |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 4322 | parser.add_option('-b', '--bug', |
| 4323 | help='pre-populate the bug number(s) for this issue. ' |
| 4324 | 'If several, separate with commas') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4325 | parser.add_option('--message-file', dest='message_file', |
| 4326 | help='file which contains message for patchset') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4327 | parser.add_option('--title', '-t', dest='title', |
| 4328 | help='title for patchset') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4329 | parser.add_option('-r', '--reviewers', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4330 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4331 | help='reviewer email addresses') |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 4332 | parser.add_option('--tbrs', |
| 4333 | action='append', default=[], |
| 4334 | help='TBR email addresses') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4335 | parser.add_option('--cc', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4336 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4337 | help='cc email addresses') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4338 | parser.add_option('--hashtag', dest='hashtags', |
| 4339 | action='append', default=[], |
| 4340 | help=('Gerrit hashtag for new CL; ' |
| 4341 | 'can be applied multiple times')) |
adamk@chromium.org | 36f4730 | 2013-04-05 01:08:31 +0000 | [diff] [blame] | 4342 | parser.add_option('-s', '--send-mail', action='store_true', |
Aaron Gable | 59f4851 | 2017-01-12 10:54:46 -0800 | [diff] [blame] | 4343 | help='send email to reviewer(s) and cc(s) immediately') |
ukai@chromium.org | 8ef7ab2 | 2012-11-28 04:24:52 +0000 | [diff] [blame] | 4344 | parser.add_option('--target_branch', |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 4345 | '--target-branch', |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4346 | metavar='TARGET', |
| 4347 | help='Apply CL to remote ref TARGET. ' + |
| 4348 | 'Default: remote branch head, or master') |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4349 | parser.add_option('--squash', action='store_true', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4350 | help='Squash multiple commits into one') |
Mike Frysinger | a989d55 | 2019-08-14 20:51:23 +0000 | [diff] [blame] | 4351 | parser.add_option('--no-squash', action='store_false', dest='squash', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4352 | help='Don\'t squash multiple commits into one') |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 4353 | parser.add_option('--topic', default=None, |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4354 | help='Topic to specify when uploading') |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 4355 | parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const', |
| 4356 | const='TBR', help='add a set of OWNERS to TBR') |
| 4357 | parser.add_option('--r-owners', dest='add_owners_to', action='store_const', |
| 4358 | const='R', help='add a set of OWNERS to R') |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4359 | parser.add_option('-c', '--use-commit-queue', action='store_true', |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4360 | default=False, |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4361 | help='tell the CQ to commit this patchset; ' |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4362 | 'implies --send-mail') |
| 4363 | parser.add_option('-d', '--cq-dry-run', |
| 4364 | action='store_true', default=False, |
rmistry@google.com | ef96622 | 2015-04-07 11:15:01 +0000 | [diff] [blame] | 4365 | help='Send the patchset to do a CQ dry run right after ' |
| 4366 | 'upload.') |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 4367 | parser.add_option('--preserve-tryjobs', action='store_true', |
| 4368 | help='instruct the CQ to let tryjobs running even after ' |
| 4369 | 'new patchsets are uploaded instead of canceling ' |
| 4370 | 'prior patchset\' tryjobs') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4371 | parser.add_option('--dependencies', action='store_true', |
| 4372 | help='Uploads CLs of all the local branches that depend on ' |
| 4373 | 'the current branch') |
Ravi Mistry | 31e7d56 | 2018-04-02 12:53:57 -0400 | [diff] [blame] | 4374 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4375 | help='Sends your change to the CQ after an approval. Only ' |
| 4376 | 'works on repos that have the Auto-Submit label ' |
| 4377 | 'enabled') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4378 | parser.add_option('--parallel', action='store_true', |
| 4379 | help='Run all tests specified by input_api.RunTests in all ' |
| 4380 | 'PRESUBMIT files in parallel.') |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4381 | parser.add_option('--no-autocc', action='store_true', |
| 4382 | help='Disables automatic addition of CC emails') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4383 | parser.add_option('--private', action='store_true', |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4384 | help='Set the review private. This implies --no-autocc.') |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4385 | parser.add_option('-R', '--retry-failed', action='store_true', |
| 4386 | help='Retry failed tryjobs from old patchset immediately ' |
| 4387 | 'after uploading new patchset. Cannot be used with ' |
| 4388 | '--use-commit-queue or --cq-dry-run.') |
| 4389 | parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4390 | help='Host of buildbucket. The default host is %default.') |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 4391 | parser.add_option('--fixed', '-x', |
| 4392 | help='List of bugs that will be commented on and marked ' |
| 4393 | 'fixed (pre-populates "Fixed:" tag). Same format as ' |
| 4394 | '-b option / "Bug:" tag. If fixing several issues, ' |
| 4395 | 'separate with commas.') |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4396 | auth.add_auth_options(parser) |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4397 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4398 | orig_args = args |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4399 | _add_codereview_select_options(parser) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4400 | (options, args) = parser.parse_args(args) |
| 4401 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4402 | if git_common.is_dirty_git_tree('upload'): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4403 | return 1 |
| 4404 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4405 | options.reviewers = cleanup_list(options.reviewers) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 4406 | options.tbrs = cleanup_list(options.tbrs) |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4407 | options.cc = cleanup_list(options.cc) |
| 4408 | |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4409 | if options.message_file: |
| 4410 | if options.message: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4411 | parser.error('Only one of --message and --message-file allowed.') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4412 | options.message = gclient_utils.FileRead(options.message_file) |
| 4413 | options.message_file = None |
| 4414 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4415 | if ([options.cq_dry_run, |
| 4416 | options.use_commit_queue, |
| 4417 | options.retry_failed].count(True) > 1): |
| 4418 | parser.error('Only one of --use-commit-queue, --cq-dry-run, or ' |
| 4419 | '--retry-failed is allowed.') |
tandrii | 4d0545a | 2016-07-06 03:56:49 -0700 | [diff] [blame] | 4420 | |
Aaron Gable | edbc413 | 2017-09-11 13:22:28 -0700 | [diff] [blame] | 4421 | if options.use_commit_queue: |
| 4422 | options.send_mail = True |
| 4423 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 4424 | # For sanity of test expectations, do this otherwise lazy-loading *now*. |
| 4425 | settings.GetIsGerrit() |
| 4426 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4427 | cl = Changelist() |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4428 | if options.retry_failed and not cl.GetIssue(): |
| 4429 | print('No previous patchsets, so --retry-failed has no effect.') |
| 4430 | options.retry_failed = False |
| 4431 | # cl.GetMostRecentPatchset uses cached information, and can return the last |
| 4432 | # patchset before upload. Calling it here makes it clear that it's the |
| 4433 | # last patchset before upload. Note that GetMostRecentPatchset will fail |
| 4434 | # if no CL has been uploaded yet. |
| 4435 | if options.retry_failed: |
| 4436 | patchset = cl.GetMostRecentPatchset() |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 4437 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4438 | ret = cl.CMDUpload(options, args, orig_args) |
| 4439 | |
| 4440 | if options.retry_failed: |
| 4441 | if ret != 0: |
| 4442 | print('Upload failed, so --retry-failed has no effect.') |
| 4443 | return ret |
| 4444 | auth_config = auth.extract_auth_config_from_options(options) |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 4445 | builds, _ = _fetch_latest_builds( |
| 4446 | auth_config, cl, options.buildbucket_host, |
| 4447 | latest_patchset=patchset) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 4448 | buckets = _filter_failed_for_retry(builds) |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4449 | if len(buckets) == 0: |
| 4450 | print('No failed tryjobs, so --retry-failed has no effect.') |
| 4451 | return ret |
| 4452 | _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1) |
| 4453 | |
| 4454 | return ret |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4455 | |
| 4456 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4457 | @subcommand.usage('--description=<description file>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4458 | @metrics.collector.collect_metrics('git cl split') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4459 | def CMDsplit(parser, args): |
| 4460 | """Splits a branch into smaller branches and uploads CLs. |
| 4461 | |
| 4462 | Creates a branch and uploads a CL for each group of files modified in the |
| 4463 | current branch that share a common OWNERS file. In the CL description and |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 4464 | comment, the string '$directory', is replaced with the directory containing |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4465 | the shared OWNERS file. |
| 4466 | """ |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4467 | parser.add_option('-d', '--description', dest='description_file', |
| 4468 | help='A text file containing a CL description in which ' |
| 4469 | '$directory will be replaced by each CL\'s directory.') |
| 4470 | parser.add_option('-c', '--comment', dest='comment_file', |
| 4471 | help='A text file containing a CL comment.') |
| 4472 | parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true', |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 4473 | default=False, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4474 | help='List the files and reviewers for each CL that would ' |
| 4475 | 'be created, but don\'t create branches or CLs.') |
| 4476 | parser.add_option('--cq-dry-run', action='store_true', |
| 4477 | help='If set, will do a cq dry run for each uploaded CL. ' |
| 4478 | 'Please be careful when doing this; more than ~10 CLs ' |
| 4479 | 'has the potential to overload our build ' |
| 4480 | 'infrastructure. Try to upload these not during high ' |
| 4481 | 'load times (usually 11-3 Mountain View time). Email ' |
| 4482 | 'infra-dev@chromium.org with any questions.') |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 4483 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4484 | default=True, |
| 4485 | help='Sends your change to the CQ after an approval. Only ' |
| 4486 | 'works on repos that have the Auto-Submit label ' |
| 4487 | 'enabled') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4488 | options, _ = parser.parse_args(args) |
| 4489 | |
| 4490 | if not options.description_file: |
| 4491 | parser.error('No --description flag specified.') |
| 4492 | |
| 4493 | def WrappedCMDupload(args): |
| 4494 | return CMDupload(OptionParser(), args) |
| 4495 | |
| 4496 | return split_cl.SplitCl(options.description_file, options.comment_file, |
Stephen Martinis | cb32668 | 2018-08-29 21:06:30 +0000 | [diff] [blame] | 4497 | Changelist, WrappedCMDupload, options.dry_run, |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 4498 | options.cq_dry_run, options.enable_auto_submit) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4499 | |
| 4500 | |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4501 | @subcommand.usage('DEPRECATED') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4502 | @metrics.collector.collect_metrics('git cl commit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4503 | def CMDdcommit(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4504 | """DEPRECATED: Used to commit the current changelist via git-svn.""" |
| 4505 | message = ('git-cl no longer supports committing to SVN repositories via ' |
| 4506 | 'git-svn. You probably want to use `git cl land` instead.') |
| 4507 | print(message) |
| 4508 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4509 | |
| 4510 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4511 | @subcommand.usage('[upstream branch to apply against]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4512 | @metrics.collector.collect_metrics('git cl land') |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 4513 | def CMDland(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4514 | """Commits the current changelist via git. |
| 4515 | |
| 4516 | In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes |
| 4517 | upstream and closes the issue automatically and atomically. |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4518 | """ |
| 4519 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4520 | help='bypass upload presubmit hook') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4521 | parser.add_option('-f', '--force', action='store_true', dest='force', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4522 | help="force yes to questions (don't prompt)") |
Edward Lesmes | 67b3faa | 2018-04-13 17:50:52 -0400 | [diff] [blame] | 4523 | parser.add_option('--parallel', action='store_true', |
| 4524 | help='Run all tests specified by input_api.RunTests in all ' |
| 4525 | 'PRESUBMIT files in parallel.') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4526 | (options, args) = parser.parse_args(args) |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4527 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4528 | cl = Changelist() |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4529 | |
Robert Iannucci | 2e73d43 | 2018-03-14 01:10:47 -0700 | [diff] [blame] | 4530 | if not cl.GetIssue(): |
| 4531 | DieWithError('You must upload the change first to Gerrit.\n' |
| 4532 | ' If you would rather have `git cl land` upload ' |
| 4533 | 'automatically for you, see http://crbug.com/642759') |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 4534 | return cl.CMDLand(options.force, options.bypass_hooks, |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 4535 | options.verbose, options.parallel) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4536 | |
| 4537 | |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4538 | @subcommand.usage('<patch url or issue id or issue url>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4539 | @metrics.collector.collect_metrics('git cl patch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4540 | def CMDpatch(parser, args): |
marq@chromium.org | e5e5900 | 2013-10-02 23:21:25 +0000 | [diff] [blame] | 4541 | """Patches in a code review.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4542 | parser.add_option('-b', dest='newbranch', |
| 4543 | help='create a new branch off trunk for the patch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4544 | parser.add_option('-f', '--force', action='store_true', |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 4545 | help='overwrite state on the current or chosen branch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4546 | parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4547 | help='don\'t commit after patch applies.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4548 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4549 | group = optparse.OptionGroup( |
| 4550 | parser, |
| 4551 | 'Options for continuing work on the current issue uploaded from a ' |
| 4552 | 'different clone (e.g. different machine). Must be used independently ' |
| 4553 | 'from the other options. No issue number should be specified, and the ' |
| 4554 | 'branch must have an issue number associated with it') |
| 4555 | group.add_option('--reapply', action='store_true', dest='reapply', |
| 4556 | help='Reset the branch and reapply the issue.\n' |
| 4557 | 'CAUTION: This will undo any local changes in this ' |
| 4558 | 'branch') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4559 | |
| 4560 | group.add_option('--pull', action='store_true', dest='pull', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4561 | help='Performs a pull before reapplying.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4562 | parser.add_option_group(group) |
| 4563 | |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 4564 | _add_codereview_select_options(parser) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4565 | (options, args) = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4566 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4567 | if options.reapply: |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4568 | if options.newbranch: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4569 | parser.error('--reapply works on the current branch only.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4570 | if len(args) > 0: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4571 | parser.error('--reapply implies no additional arguments.') |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4572 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4573 | cl = Changelist() |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4574 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4575 | parser.error('Current branch must have an associated issue.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4576 | |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4577 | upstream = cl.GetUpstreamBranch() |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4578 | if upstream is None: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4579 | parser.error('No upstream branch specified. Cannot reset branch.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4580 | |
| 4581 | RunGit(['reset', '--hard', upstream]) |
| 4582 | if options.pull: |
| 4583 | RunGit(['pull']) |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4584 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4585 | target_issue_arg = ParseIssueNumberArgument(cl.GetIssue()) |
| 4586 | return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4587 | |
| 4588 | if len(args) != 1 or not args[0]: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4589 | parser.error('Must specify issue number or URL.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4590 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4591 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4592 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4593 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4594 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4595 | # We don't want uncommitted changes mixed up with the patch. |
| 4596 | if git_common.is_dirty_git_tree('patch'): |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4597 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4598 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4599 | if options.newbranch: |
| 4600 | if options.force: |
| 4601 | RunGit(['branch', '-D', options.newbranch], |
| 4602 | stderr=subprocess2.PIPE, error_ok=True) |
| 4603 | RunGit(['new-branch', options.newbranch]) |
| 4604 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4605 | cl = Changelist( |
| 4606 | codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4607 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4608 | if not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4609 | print('canonical issue/change URL: %s\n' % cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4610 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4611 | return cl.CMDPatchWithParsedIssue( |
| 4612 | target_issue_arg, options.nocommit, options.force) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4613 | |
| 4614 | |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4615 | def GetTreeStatus(url=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4616 | """Fetches the tree status and returns either 'open', 'closed', |
| 4617 | 'unknown' or 'unset'.""" |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 4618 | url = url or settings.GetTreeStatusUrl(error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4619 | if url: |
| 4620 | status = urllib2.urlopen(url).read().lower() |
| 4621 | if status.find('closed') != -1 or status == '0': |
| 4622 | return 'closed' |
| 4623 | elif status.find('open') != -1 or status == '1': |
| 4624 | return 'open' |
| 4625 | return 'unknown' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4626 | return 'unset' |
| 4627 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4628 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4629 | def GetTreeStatusReason(): |
| 4630 | """Fetches the tree status from a json url and returns the message |
| 4631 | with the reason for the tree to be opened or closed.""" |
msb@chromium.org | bf1a7ba | 2011-02-01 16:21:46 +0000 | [diff] [blame] | 4632 | url = settings.GetTreeStatusUrl() |
| 4633 | json_url = urlparse.urljoin(url, '/current?format=json') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4634 | connection = urllib2.urlopen(json_url) |
| 4635 | status = json.loads(connection.read()) |
| 4636 | connection.close() |
| 4637 | return status['message'] |
| 4638 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 4639 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4640 | @metrics.collector.collect_metrics('git cl tree') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4641 | def CMDtree(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4642 | """Shows the status of the tree.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4643 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4644 | status = GetTreeStatus() |
| 4645 | if 'unset' == status: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4646 | 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] | 4647 | return 2 |
| 4648 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4649 | print('The tree is %s' % status) |
| 4650 | print() |
| 4651 | print(GetTreeStatusReason()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4652 | if status != 'open': |
| 4653 | return 1 |
| 4654 | return 0 |
| 4655 | |
| 4656 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4657 | @metrics.collector.collect_metrics('git cl try') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4658 | def CMDtry(parser, args): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4659 | """Triggers tryjobs using either Buildbucket or CQ dry run.""" |
| 4660 | group = optparse.OptionGroup(parser, 'Tryjob options') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4661 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4662 | '-b', '--bot', action='append', |
| 4663 | help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple ' |
| 4664 | 'times to specify multiple builders. ex: ' |
| 4665 | '"-b win_rel -b win_layout". See ' |
| 4666 | 'the try server waterfall for the builders name and the tests ' |
| 4667 | 'available.')) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4668 | group.add_option( |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 4669 | '-B', '--bucket', default='', |
| 4670 | help=('Buildbucket bucket to send the try requests.')) |
| 4671 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4672 | '-r', '--revision', |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4673 | help='Revision to use for the tryjob; default: the revision will ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4674 | 'be determined by the try recipe that builder runs, which usually ' |
| 4675 | 'defaults to HEAD of origin/master') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4676 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4677 | '-c', '--clobber', action='store_true', default=False, |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4678 | help='Force a clobber before building; that is don\'t do an ' |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4679 | 'incremental build') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4680 | group.add_option( |
Andrii Shyshkalov | f9648b5 | 2018-02-21 22:32:42 -0800 | [diff] [blame] | 4681 | '--category', default='git_cl_try', help='Specify custom build category.') |
| 4682 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4683 | '--project', |
| 4684 | help='Override which project to use. Projects are defined ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4685 | 'in recipe to determine to which repository or directory to ' |
| 4686 | 'apply the patch') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4687 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4688 | '-p', '--property', dest='properties', action='append', default=[], |
| 4689 | help='Specify generic properties in the form -p key1=value1 -p ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 4690 | 'key2=value2 etc. The value will be treated as ' |
| 4691 | 'json if decodable, or as string otherwise. ' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4692 | 'NOTE: using this may make your tryjob not usable for CQ, ' |
| 4693 | 'which will then schedule another tryjob with default properties') |
sheyang@chromium.org | db37557 | 2015-08-17 19:22:23 +0000 | [diff] [blame] | 4694 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4695 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4696 | help='Host of buildbucket. The default host is %default.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4697 | parser.add_option_group(group) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4698 | parser.add_option( |
| 4699 | '-R', '--retry-failed', action='store_true', default=False, |
| 4700 | help='Retry failed jobs from the latest set of tryjobs. ' |
| 4701 | 'Not allowed with --bucket and --bot options.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4702 | auth.add_auth_options(parser) |
Koji Ishii | 31c1478 | 2018-01-08 17:17:33 +0900 | [diff] [blame] | 4703 | _add_codereview_issue_select_options(parser) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4704 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4705 | auth_config = auth.extract_auth_config_from_options(options) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4706 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 4707 | # Make sure that all properties are prop=value pairs. |
| 4708 | bad_params = [x for x in options.properties if '=' not in x] |
| 4709 | if bad_params: |
| 4710 | parser.error('Got properties with missing "=": %s' % bad_params) |
| 4711 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4712 | if args: |
| 4713 | parser.error('Unknown arguments: %s' % args) |
| 4714 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4715 | cl = Changelist(issue=options.issue) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4716 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4717 | parser.error('Need to upload first.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4718 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4719 | # HACK: warm up Gerrit change detail cache to save on RPCs. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 4720 | cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS']) |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 4721 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 4722 | error_message = cl.CannotTriggerTryJobReason() |
| 4723 | if error_message: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4724 | parser.error('Can\'t trigger tryjobs: %s' % error_message) |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 4725 | |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4726 | if options.retry_failed: |
| 4727 | if options.bot or options.bucket: |
| 4728 | print('ERROR: The option --retry-failed is not compatible with ' |
| 4729 | '-B, -b, --bucket, or --bot.', file=sys.stderr) |
| 4730 | return 1 |
| 4731 | print('Searching for failed tryjobs...') |
| 4732 | builds, patchset = _fetch_latest_builds( |
| 4733 | auth_config, cl, options.buildbucket_host) |
| 4734 | if options.verbose: |
| 4735 | print('Got %d builds in patchset #%d' % (len(builds), patchset)) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 4736 | buckets = _filter_failed_for_retry(builds) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4737 | if not buckets: |
| 4738 | print('There are no failed jobs in the latest set of jobs ' |
| 4739 | '(patchset #%d), doing nothing.' % patchset) |
| 4740 | return 0 |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 4741 | num_builders = sum(map(len, buckets.values())) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 4742 | if num_builders > 10: |
| 4743 | confirm_or_exit('There are %d builders with failed builds.' |
| 4744 | % num_builders, action='continue') |
| 4745 | else: |
| 4746 | buckets = _get_bucket_map(cl, options, parser) |
| 4747 | if buckets and any(b.startswith('master.') for b in buckets): |
| 4748 | print('ERROR: Buildbot masters are not supported.') |
| 4749 | return 1 |
phajdan.jr@chromium.org | 8da7f27 | 2014-03-14 01:28:39 +0000 | [diff] [blame] | 4750 | |
qyearsley | dd49f94 | 2016-10-28 11:57:22 -0700 | [diff] [blame] | 4751 | # If no bots are listed and we couldn't get a list based on PRESUBMIT files, |
| 4752 | # 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] | 4753 | if not buckets: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 4754 | if options.verbose: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 4755 | print('git cl try with no bots now defaults to CQ dry run.') |
| 4756 | print('Scheduling CQ dry run on: %s' % cl.GetIssueURL()) |
| 4757 | return cl.SetCQState(_CQState.DRY_RUN) |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 4758 | |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 4759 | for builders in buckets.values(): |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4760 | if any('triggered' in b for b in builders): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4761 | 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] | 4762 | 'of bot requires an initial job from a parent (usually a builder). ' |
| 4763 | 'Instead send your job to the parent.\n' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4764 | 'Bot list: %s' % builders, file=sys.stderr) |
machenbach@chromium.org | 58a69cb | 2014-03-01 02:08:29 +0000 | [diff] [blame] | 4765 | return 1 |
ilevy@chromium.org | f3b2123 | 2012-09-24 20:48:55 +0000 | [diff] [blame] | 4766 | |
ilevy@chromium.org | 36e420b | 2013-08-06 23:21:12 +0000 | [diff] [blame] | 4767 | patchset = cl.GetMostRecentPatchset() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 4768 | try: |
| 4769 | _trigger_try_jobs(auth_config, cl, buckets, options, patchset) |
| 4770 | except BuildbucketResponseException as ex: |
| 4771 | print('ERROR: %s' % ex) |
| 4772 | return 1 |
| 4773 | return 0 |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 4774 | |
| 4775 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4776 | @metrics.collector.collect_metrics('git cl try-results') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4777 | def CMDtry_results(parser, args): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 4778 | """Prints info about results for tryjobs associated with the current CL.""" |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4779 | group = optparse.OptionGroup(parser, 'Tryjob results options') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4780 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4781 | '-p', '--patchset', type=int, help='patchset number if not current.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4782 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4783 | '--print-master', action='store_true', help='print master name as well.') |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 4784 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4785 | '--color', action='store_true', default=setup_color.IS_TTY, |
| 4786 | help='force color output, useful when piping output.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4787 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 4788 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4789 | help='Host of buildbucket. The default host is %default.') |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4790 | group.add_option( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4791 | '--json', help=('Path of JSON output file to write tryjob results to,' |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4792 | 'or "-" for stdout.')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4793 | parser.add_option_group(group) |
| 4794 | auth.add_auth_options(parser) |
Stefan Zager | 27db3f2 | 2017-10-10 15:15:01 -0700 | [diff] [blame] | 4795 | _add_codereview_issue_select_options(parser) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4796 | options, args = parser.parse_args(args) |
| 4797 | if args: |
| 4798 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4799 | |
| 4800 | auth_config = auth.extract_auth_config_from_options(options) |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4801 | cl = Changelist(issue=options.issue) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4802 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4803 | parser.error('Need to upload first.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4804 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4805 | patchset = options.patchset |
| 4806 | if not patchset: |
| 4807 | patchset = cl.GetMostRecentPatchset() |
| 4808 | if not patchset: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4809 | parser.error('Code review host doesn\'t know about issue %s. ' |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4810 | 'No access to issue or wrong issue number?\n' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4811 | 'Either upload first, or pass --patchset explicitly.' % |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4812 | cl.GetIssue()) |
| 4813 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4814 | try: |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 4815 | jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4816 | except BuildbucketResponseException as ex: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4817 | print('Buildbucket error: %s' % ex) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4818 | return 1 |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4819 | if options.json: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 4820 | write_json(options.json, jobs) |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 4821 | else: |
| 4822 | print_try_jobs(options, jobs) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 4823 | return 0 |
| 4824 | |
| 4825 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4826 | @subcommand.usage('[new upstream branch]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4827 | @metrics.collector.collect_metrics('git cl upstream') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4828 | def CMDupstream(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4829 | """Prints or sets the name of the upstream branch, if any.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 4830 | _, args = parser.parse_args(args) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4831 | if len(args) > 1: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4832 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4833 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4834 | cl = Changelist() |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4835 | if args: |
| 4836 | # One arg means set upstream branch. |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4837 | branch = cl.GetBranch() |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 4838 | RunGit(['branch', '--set-upstream-to', args[0], branch]) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4839 | cl = Changelist() |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4840 | print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),)) |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 4841 | |
| 4842 | # Clear configured merge-base, if there is one. |
| 4843 | git_common.remove_merge_base(branch) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 4844 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4845 | print(cl.GetUpstreamBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4846 | return 0 |
| 4847 | |
| 4848 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4849 | @metrics.collector.collect_metrics('git cl web') |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4850 | def CMDweb(parser, args): |
| 4851 | """Opens the current CL in the web browser.""" |
| 4852 | _, args = parser.parse_args(args) |
| 4853 | if args: |
| 4854 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 4855 | |
| 4856 | issue_url = Changelist().GetIssueURL() |
| 4857 | if not issue_url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4858 | print('ERROR No issue to open', file=sys.stderr) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4859 | return 1 |
| 4860 | |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4861 | # 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] | 4862 | # allows us to hide the "Created new window in existing browser session." |
| 4863 | # message from Chrome. Based on https://stackoverflow.com/a/2323563. |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4864 | saved_stdout = os.dup(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4865 | saved_stderr = os.dup(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4866 | os.close(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4867 | os.close(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 4868 | os.open(os.devnull, os.O_RDWR) |
| 4869 | try: |
| 4870 | webbrowser.open(issue_url) |
| 4871 | finally: |
| 4872 | os.dup2(saved_stdout, 1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 4873 | os.dup2(saved_stderr, 2) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 4874 | return 0 |
| 4875 | |
| 4876 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4877 | @metrics.collector.collect_metrics('git cl set-commit') |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4878 | def CMDset_commit(parser, args): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4879 | """Sets the commit bit to trigger the CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4880 | parser.add_option('-d', '--dry-run', action='store_true', |
| 4881 | help='trigger in dry run mode') |
| 4882 | parser.add_option('-c', '--clear', action='store_true', |
| 4883 | help='stop CQ run, if any') |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 4884 | _add_codereview_issue_select_options(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4885 | options, args = parser.parse_args(args) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4886 | if args: |
| 4887 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4888 | if options.dry_run and options.clear: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4889 | parser.error('Only one of --dry-run and --clear are allowed.') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4890 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4891 | cl = Changelist(issue=options.issue) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4892 | if options.clear: |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 4893 | state = _CQState.NONE |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 4894 | elif options.dry_run: |
| 4895 | state = _CQState.DRY_RUN |
| 4896 | else: |
| 4897 | state = _CQState.COMMIT |
| 4898 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4899 | parser.error('Must upload the issue first.') |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 4900 | cl.SetCQState(state) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 4901 | return 0 |
| 4902 | |
| 4903 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4904 | @metrics.collector.collect_metrics('git cl set-close') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4905 | def CMDset_close(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4906 | """Closes the issue.""" |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 4907 | _add_codereview_issue_select_options(parser) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4908 | options, args = parser.parse_args(args) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4909 | if args: |
| 4910 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4911 | cl = Changelist(issue=options.issue) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4912 | # Ensure there actually is an issue to close. |
Aaron Gable | 7139a4e | 2017-09-05 17:53:09 -0700 | [diff] [blame] | 4913 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4914 | DieWithError('ERROR: No issue to close.') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 4915 | cl.CloseIssue() |
| 4916 | return 0 |
| 4917 | |
| 4918 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4919 | @metrics.collector.collect_metrics('git cl diff') |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4920 | def CMDdiff(parser, args): |
wychen@chromium.org | 37b2ec0 | 2015-04-03 00:49:15 +0000 | [diff] [blame] | 4921 | """Shows differences between local tree and last upload.""" |
thomasanderson | 074beb2 | 2016-08-29 14:03:20 -0700 | [diff] [blame] | 4922 | parser.add_option( |
| 4923 | '--stat', |
| 4924 | action='store_true', |
| 4925 | dest='stat', |
| 4926 | help='Generate a diffstat') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4927 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4928 | if args: |
| 4929 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 4930 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4931 | cl = Changelist() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 4932 | issue = cl.GetIssue() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4933 | branch = cl.GetBranch() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 4934 | if not issue: |
| 4935 | DieWithError('No issue found for current branch (%s)' % branch) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4936 | |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 4937 | base = cl._GitGetBranchConfigValue('last-upload-hash') |
| 4938 | if not base: |
| 4939 | base = cl._GitGetBranchConfigValue('gerritsquashhash') |
| 4940 | if not base: |
| 4941 | detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT']) |
| 4942 | revision_info = detail['revisions'][detail['current_revision']] |
| 4943 | fetch_info = revision_info['fetch']['http'] |
| 4944 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
| 4945 | base = 'FETCH_HEAD' |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4946 | |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 4947 | cmd = ['git', 'diff'] |
| 4948 | if options.stat: |
| 4949 | cmd.append('--stat') |
| 4950 | cmd.append(base) |
| 4951 | subprocess2.check_call(cmd) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 4952 | |
| 4953 | return 0 |
| 4954 | |
| 4955 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4956 | @metrics.collector.collect_metrics('git cl owners') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4957 | def CMDowners(parser, args): |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 4958 | """Finds potential owners for reviewing.""" |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4959 | parser.add_option( |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 4960 | '--ignore-current', |
| 4961 | action='store_true', |
| 4962 | help='Ignore the CL\'s current reviewers and start from scratch.') |
| 4963 | parser.add_option( |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 4964 | '--ignore-self', |
| 4965 | action='store_true', |
| 4966 | help='Do not consider CL\'s author as an owners.') |
| 4967 | parser.add_option( |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4968 | '--no-color', |
| 4969 | action='store_true', |
| 4970 | help='Use this option to disable color output') |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 4971 | parser.add_option( |
| 4972 | '--batch', |
| 4973 | action='store_true', |
| 4974 | help='Do not run interactively, just suggest some') |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 4975 | # TODO: Consider moving this to another command, since other |
| 4976 | # git-cl owners commands deal with owners for a given CL. |
| 4977 | parser.add_option( |
| 4978 | '--show-all', |
| 4979 | action='store_true', |
| 4980 | help='Show all owners for a particular file') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4981 | options, args = parser.parse_args(args) |
| 4982 | |
| 4983 | author = RunGit(['config', 'user.email']).strip() or None |
| 4984 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4985 | cl = Changelist() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4986 | |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 4987 | if options.show_all: |
| 4988 | for arg in args: |
| 4989 | base_branch = cl.GetCommonAncestorWithUpstream() |
| 4990 | change = cl.GetChange(base_branch, None) |
| 4991 | database = owners.Database(change.RepositoryRoot(), file, os.path) |
| 4992 | database.load_data_needed_for([arg]) |
| 4993 | print('Owners for %s:' % arg) |
| 4994 | for owner in sorted(database.all_possible_owners([arg], None)): |
| 4995 | print(' - %s' % owner) |
| 4996 | return 0 |
| 4997 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 4998 | if args: |
| 4999 | if len(args) > 1: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5000 | parser.error('Unknown args.') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5001 | base_branch = args[0] |
| 5002 | else: |
| 5003 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5004 | base_branch = cl.GetCommonAncestorWithUpstream() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5005 | |
| 5006 | change = cl.GetChange(base_branch, None) |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5007 | affected_files = [f.LocalPath() for f in change.AffectedFiles()] |
| 5008 | |
| 5009 | if options.batch: |
| 5010 | db = owners.Database(change.RepositoryRoot(), file, os.path) |
| 5011 | print('\n'.join(db.reviewers_for(affected_files, author))) |
| 5012 | return 0 |
| 5013 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5014 | return owners_finder.OwnersFinder( |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5015 | affected_files, |
Jochen Eisinger | 72606f8 | 2017-04-04 10:44:18 +0200 | [diff] [blame] | 5016 | change.RepositoryRoot(), |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 5017 | author, |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 5018 | [] if options.ignore_current else cl.GetReviewers(), |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 5019 | fopen=file, os_path=os.path, |
Jochen Eisinger | d0573ec | 2017-04-13 10:55:06 +0200 | [diff] [blame] | 5020 | disable_color=options.no_color, |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 5021 | override_files=change.OriginalOwnersFiles(), |
| 5022 | ignore_author=options.ignore_self).run() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5023 | |
| 5024 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5025 | def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5026 | """Generates a diff command.""" |
| 5027 | # Generate diff for the current branch's changes. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5028 | diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff'] |
| 5029 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 5030 | if allow_prefix: |
| 5031 | # explicitly setting --src-prefix and --dst-prefix is necessary in the |
| 5032 | # case that diff.noprefix is set in the user's git config. |
| 5033 | diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/'] |
| 5034 | else: |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5035 | diff_cmd += ['--no-prefix'] |
| 5036 | |
| 5037 | diff_cmd += [diff_type, upstream_commit, '--'] |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5038 | |
| 5039 | if args: |
| 5040 | for arg in args: |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5041 | if os.path.isdir(arg) or os.path.isfile(arg): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5042 | diff_cmd.append(arg) |
| 5043 | else: |
| 5044 | DieWithError('Argument "%s" is not a file or a directory' % arg) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5045 | |
| 5046 | return diff_cmd |
| 5047 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5048 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5049 | def MatchingFileType(file_name, extensions): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 5050 | """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] | 5051 | 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] | 5052 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5053 | |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 5054 | @subcommand.usage('[files or directories to diff]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5055 | @metrics.collector.collect_metrics('git cl format') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5056 | def CMDformat(parser, args): |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5057 | """Runs auto-formatting tools (clang-format etc.) on the diff.""" |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5058 | CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java'] |
kylechar | 58edce2 | 2016-06-17 06:07:51 -0700 | [diff] [blame] | 5059 | GN_EXTS = ['.gn', '.gni', '.typemap'] |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 5060 | parser.add_option('--full', action='store_true', |
| 5061 | help='Reformat the full content of all touched files') |
| 5062 | parser.add_option('--dry-run', action='store_true', |
| 5063 | help='Don\'t modify any file on disk.') |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5064 | parser.add_option( |
| 5065 | '--python', |
| 5066 | action='store_true', |
| 5067 | default=None, |
| 5068 | help='Enables python formatting on all python files.') |
| 5069 | parser.add_option( |
| 5070 | '--no-python', |
| 5071 | action='store_true', |
| 5072 | dest='python', |
| 5073 | help='Disables python formatting on all python files. ' |
| 5074 | 'Takes precedence over --python. ' |
| 5075 | 'If neither --python or --no-python are set, python ' |
| 5076 | 'files that have a .style.yapf file in an ancestor ' |
| 5077 | 'directory will be formatted.') |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5078 | parser.add_option('--js', action='store_true', |
| 5079 | help='Format javascript code with clang-format.') |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 5080 | parser.add_option('--diff', action='store_true', |
| 5081 | help='Print diff to stdout rather than modifying files.') |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5082 | parser.add_option('--presubmit', action='store_true', |
| 5083 | help='Used when running the script from a presubmit.') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5084 | opts, args = parser.parse_args(args) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5085 | |
Daniel Cheng | c55eecf | 2016-12-30 03:11:02 -0800 | [diff] [blame] | 5086 | # Normalize any remaining args against the current path, so paths relative to |
| 5087 | # the current directory are still resolved as expected. |
| 5088 | args = [os.path.join(os.getcwd(), arg) for arg in args] |
| 5089 | |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5090 | # git diff generates paths against the root of the repository. Change |
| 5091 | # 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] | 5092 | rel_base_path = settings.GetRelativeRoot() |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5093 | if rel_base_path: |
| 5094 | os.chdir(rel_base_path) |
| 5095 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5096 | # Grab the merge-base commit, i.e. the upstream commit of the current |
| 5097 | # branch when it was created or the last time it was rebased. This is |
| 5098 | # to cover the case where the user may have called "git fetch origin", |
| 5099 | # moving the origin branch to a newer commit, but hasn't rebased yet. |
| 5100 | upstream_commit = None |
| 5101 | cl = Changelist() |
| 5102 | upstream_branch = cl.GetUpstreamBranch() |
| 5103 | if upstream_branch: |
| 5104 | upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch]) |
| 5105 | upstream_commit = upstream_commit.strip() |
| 5106 | |
| 5107 | if not upstream_commit: |
| 5108 | DieWithError('Could not find base commit for this branch. ' |
| 5109 | 'Are you in detached state?') |
| 5110 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5111 | changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args) |
| 5112 | diff_output = RunGit(changed_files_cmd) |
| 5113 | diff_files = diff_output.splitlines() |
jkarlin@chromium.org | ad21b92 | 2016-01-28 17:48:42 +0000 | [diff] [blame] | 5114 | # Filter out files deleted by this CL |
| 5115 | 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] | 5116 | |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5117 | if opts.js: |
Deepanjan Roy | 605dd31 | 2018-07-02 17:48:54 +0000 | [diff] [blame] | 5118 | CLANG_EXTS.extend(['.js', '.ts']) |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5119 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5120 | clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)] |
| 5121 | python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])] |
| 5122 | 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] | 5123 | 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] | 5124 | |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 5125 | top_dir = os.path.normpath( |
| 5126 | RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n')) |
| 5127 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5128 | # Set to 2 to signal to CheckPatchFormatted() that this patch isn't |
| 5129 | # formatted. This is used to block during the presubmit. |
| 5130 | return_value = 0 |
| 5131 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5132 | if clang_diff_files: |
techtonik@gmail.com | 5573df1 | 2016-04-12 18:34:10 +0000 | [diff] [blame] | 5133 | # Locate the clang-format binary in the checkout |
| 5134 | try: |
| 5135 | clang_format_tool = clang_format.FindClangFormatToolInChromiumTree() |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5136 | except clang_format.NotFoundError as e: |
techtonik@gmail.com | 5573df1 | 2016-04-12 18:34:10 +0000 | [diff] [blame] | 5137 | DieWithError(e) |
| 5138 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5139 | if opts.full: |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5140 | cmd = [clang_format_tool] |
| 5141 | if not opts.dry_run and not opts.diff: |
| 5142 | cmd.append('-i') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5143 | stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5144 | if opts.diff: |
| 5145 | sys.stdout.write(stdout) |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5146 | else: |
| 5147 | env = os.environ.copy() |
| 5148 | env['PATH'] = str(os.path.dirname(clang_format_tool)) |
| 5149 | try: |
| 5150 | script = clang_format.FindClangFormatScriptInChromiumTree( |
| 5151 | 'clang-format-diff.py') |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5152 | except clang_format.NotFoundError as e: |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5153 | DieWithError(e) |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 5154 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5155 | cmd = [sys.executable, script, '-p0'] |
| 5156 | if not opts.dry_run and not opts.diff: |
| 5157 | cmd.append('-i') |
digit@chromium.org | d6ddc1c | 2013-10-25 15:36:32 +0000 | [diff] [blame] | 5158 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5159 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files) |
| 5160 | diff_output = RunGit(diff_cmd) |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5161 | |
sammc@chromium.org | 0b35f5d | 2016-02-25 22:39:23 +0000 | [diff] [blame] | 5162 | stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env) |
| 5163 | if opts.diff: |
| 5164 | sys.stdout.write(stdout) |
| 5165 | if opts.dry_run and len(stdout) > 0: |
| 5166 | return_value = 2 |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5167 | |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5168 | # Similar code to above, but using yapf on .py files rather than clang-format |
| 5169 | # on C/C++ files |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5170 | py_explicitly_disabled = opts.python is not None and not opts.python |
| 5171 | if python_diff_files and not py_explicitly_disabled: |
Aiden Benner | e47ac15 | 2018-11-20 16:44:03 +0000 | [diff] [blame] | 5172 | depot_tools_path = os.path.dirname(os.path.abspath(__file__)) |
| 5173 | yapf_tool = os.path.join(depot_tools_path, 'yapf') |
| 5174 | if sys.platform.startswith('win'): |
| 5175 | yapf_tool += '.bat' |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5176 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5177 | # If we couldn't find a yapf file we'll default to the chromium style |
| 5178 | # specified in depot_tools. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5179 | chromium_default_yapf_style = os.path.join(depot_tools_path, |
| 5180 | YAPF_CONFIG_FILENAME) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5181 | # Used for caching. |
| 5182 | yapf_configs = {} |
| 5183 | for f in python_diff_files: |
| 5184 | # Find the yapf style config for the current file, defaults to depot |
| 5185 | # tools default. |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5186 | _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5187 | |
| 5188 | # Turn on python formatting by default if a yapf config is specified. |
| 5189 | # This breaks in the case of this repo though since the specified |
| 5190 | # style file is also the global default. |
| 5191 | if opts.python is None: |
| 5192 | filtered_py_files = [] |
| 5193 | for f in python_diff_files: |
| 5194 | if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None: |
| 5195 | filtered_py_files.append(f) |
| 5196 | else: |
| 5197 | filtered_py_files = python_diff_files |
| 5198 | |
| 5199 | # Note: yapf still seems to fix indentation of the entire file |
| 5200 | # even if line ranges are specified. |
| 5201 | # See https://github.com/google/yapf/issues/499 |
| 5202 | if not opts.full and filtered_py_files: |
| 5203 | py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit) |
| 5204 | |
| 5205 | for f in filtered_py_files: |
| 5206 | yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5207 | if yapf_config is None: |
| 5208 | yapf_config = chromium_default_yapf_style |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5209 | |
| 5210 | cmd = [yapf_tool, '--style', yapf_config, f] |
| 5211 | |
| 5212 | has_formattable_lines = False |
| 5213 | if not opts.full: |
| 5214 | # Only run yapf over changed line ranges. |
| 5215 | for diff_start, diff_len in py_line_diffs[f]: |
| 5216 | diff_end = diff_start + diff_len - 1 |
| 5217 | # Yapf errors out if diff_end < diff_start but this |
| 5218 | # is a valid line range diff for a removal. |
| 5219 | if diff_end >= diff_start: |
| 5220 | has_formattable_lines = True |
| 5221 | cmd += ['-l', '{}-{}'.format(diff_start, diff_end)] |
| 5222 | # If all line diffs were removals we have nothing to format. |
| 5223 | if not has_formattable_lines: |
| 5224 | continue |
| 5225 | |
| 5226 | if opts.diff or opts.dry_run: |
| 5227 | cmd += ['--diff'] |
| 5228 | # Will return non-zero exit code if non-empty diff. |
| 5229 | stdout = RunCommand(cmd, error_ok=True, cwd=top_dir) |
| 5230 | if opts.diff: |
| 5231 | sys.stdout.write(stdout) |
| 5232 | elif len(stdout) > 0: |
| 5233 | return_value = 2 |
| 5234 | else: |
| 5235 | cmd += ['-i'] |
| 5236 | RunCommand(cmd, cwd=top_dir) |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5237 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5238 | # Dart's formatter does not have the nice property of only operating on |
| 5239 | # modified chunks, so hard code full. |
| 5240 | if dart_diff_files: |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5241 | try: |
| 5242 | command = [dart_format.FindDartFmtToolInChromiumTree()] |
| 5243 | if not opts.dry_run and not opts.diff: |
| 5244 | command.append('-w') |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5245 | command.extend(dart_diff_files) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5246 | |
ppi@chromium.org | 6593d93 | 2016-03-03 15:41:15 +0000 | [diff] [blame] | 5247 | stdout = RunCommand(command, cwd=top_dir) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5248 | if opts.dry_run and stdout: |
| 5249 | return_value = 2 |
| 5250 | except dart_format.NotFoundError as e: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5251 | print('Warning: Unable to check Dart code formatting. Dart SDK not ' |
| 5252 | 'found in this checkout. Files in other languages are still ' |
| 5253 | 'formatted.') |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5254 | |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5255 | # Format GN build files. Always run on full build files for canonical form. |
| 5256 | if gn_diff_files: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5257 | cmd = ['gn', 'format'] |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5258 | if opts.dry_run or opts.diff: |
| 5259 | cmd.append('--dry-run') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5260 | for gn_diff_file in gn_diff_files: |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5261 | gn_ret = subprocess2.call(cmd + [gn_diff_file], |
| 5262 | shell=sys.platform == 'win32', |
| 5263 | cwd=top_dir) |
| 5264 | if opts.dry_run and gn_ret == 2: |
| 5265 | return_value = 2 # Not formatted. |
| 5266 | elif opts.diff and gn_ret == 2: |
| 5267 | # TODO this should compute and print the actual diff. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5268 | print('This change has GN build file diff for ' + gn_diff_file) |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5269 | elif gn_ret != 0: |
| 5270 | # For non-dry run cases (and non-2 return values for dry-run), a |
| 5271 | # nonzero error code indicates a failure, probably because the file |
| 5272 | # doesn't parse. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5273 | DieWithError('gn format failed on ' + gn_diff_file + |
| 5274 | '\nTry running `gn format` on this file manually.') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5275 | |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5276 | # Skip the metrics formatting from the global presubmit hook. These files have |
| 5277 | # a separate presubmit hook that issues an error if the files need formatting, |
| 5278 | # whereas the top-level presubmit script merely issues a warning. Formatting |
| 5279 | # these files is somewhat slow, so it's important not to duplicate the work. |
| 5280 | if not opts.presubmit: |
| 5281 | for xml_dir in GetDirtyMetricsDirs(diff_files): |
| 5282 | tool_dir = os.path.join(top_dir, xml_dir) |
| 5283 | cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive'] |
| 5284 | if opts.dry_run or opts.diff: |
| 5285 | cmd.append('--diff') |
Ilya Sherman | 235b70d | 2017-08-22 17:46:38 -0700 | [diff] [blame] | 5286 | stdout = RunCommand(cmd, cwd=top_dir) |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5287 | if opts.diff: |
| 5288 | sys.stdout.write(stdout) |
| 5289 | if opts.dry_run and stdout: |
| 5290 | return_value = 2 # Not formatted. |
Alexei Svitkine | f3cac41 | 2017-02-06 11:08:50 -0500 | [diff] [blame] | 5291 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5292 | return return_value |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5293 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5294 | |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5295 | def GetDirtyMetricsDirs(diff_files): |
| 5296 | xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])] |
| 5297 | metrics_xml_dirs = [ |
| 5298 | os.path.join('tools', 'metrics', 'actions'), |
| 5299 | os.path.join('tools', 'metrics', 'histograms'), |
| 5300 | os.path.join('tools', 'metrics', 'rappor'), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5301 | os.path.join('tools', 'metrics', 'ukm'), |
| 5302 | ] |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5303 | for xml_dir in metrics_xml_dirs: |
| 5304 | if any(file.startswith(xml_dir) for file in xml_diff_files): |
| 5305 | yield xml_dir |
| 5306 | |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5307 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5308 | @subcommand.usage('<codereview url or issue id>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5309 | @metrics.collector.collect_metrics('git cl checkout') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5310 | def CMDcheckout(parser, args): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5311 | """Checks out a branch associated with a given Gerrit issue.""" |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5312 | _, args = parser.parse_args(args) |
| 5313 | |
| 5314 | if len(args) != 1: |
| 5315 | parser.print_help() |
| 5316 | return 1 |
| 5317 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5318 | issue_arg = ParseIssueNumberArgument(args[0]) |
tandrii@chromium.org | de6c9a1 | 2016-04-11 15:33:53 +0000 | [diff] [blame] | 5319 | if not issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5320 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5321 | |
tandrii@chromium.org | abd27e5 | 2016-04-11 15:43:32 +0000 | [diff] [blame] | 5322 | target_issue = str(issue_arg.issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5323 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5324 | def find_issues(issueprefix): |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 5325 | output = RunGit(['config', '--local', '--get-regexp', |
| 5326 | r'branch\..*\.%s' % issueprefix], |
| 5327 | error_ok=True) |
| 5328 | for key, issue in [x.split() for x in output.splitlines()]: |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5329 | if issue == target_issue: |
| 5330 | yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5331 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5332 | branches = [] |
| 5333 | for cls in _CODEREVIEW_IMPLEMENTATIONS.values(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 5334 | branches.extend(find_issues(cls.IssueConfigKey())) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5335 | if len(branches) == 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5336 | print('No branch found for issue %s.' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5337 | return 1 |
| 5338 | if len(branches) == 1: |
| 5339 | RunGit(['checkout', branches[0]]) |
| 5340 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5341 | print('Multiple branches match issue %s:' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5342 | for i in range(len(branches)): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5343 | print('%d: %s' % (i, branches[i])) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5344 | which = raw_input('Choose by index: ') |
| 5345 | try: |
| 5346 | RunGit(['checkout', branches[int(which)]]) |
| 5347 | except (IndexError, ValueError): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5348 | print('Invalid selection, not checking out any branch.') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5349 | return 1 |
| 5350 | |
| 5351 | return 0 |
| 5352 | |
| 5353 | |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5354 | def CMDlol(parser, args): |
| 5355 | # This command is intentionally undocumented. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5356 | print(zlib.decompress(base64.b64decode( |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 5357 | 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE' |
| 5358 | 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9' |
| 5359 | 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5360 | 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))) |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5361 | return 0 |
| 5362 | |
| 5363 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5364 | class OptionParser(optparse.OptionParser): |
| 5365 | """Creates the option parse and add --verbose support.""" |
| 5366 | def __init__(self, *args, **kwargs): |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5367 | optparse.OptionParser.__init__( |
| 5368 | self, *args, prog='git cl', version=__version__, **kwargs) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5369 | self.add_option( |
| 5370 | '-v', '--verbose', action='count', default=0, |
| 5371 | help='Use 2 times for more debugging info') |
| 5372 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5373 | def parse_args(self, args=None, _values=None): |
Andrii Shyshkalov | 46f20cd | 2018-10-30 06:42:54 +0000 | [diff] [blame] | 5374 | try: |
| 5375 | return self._parse_args(args) |
| 5376 | finally: |
| 5377 | # Regardless of success or failure of args parsing, we want to report |
| 5378 | # metrics, but only after logging has been initialized (if parsing |
| 5379 | # succeeded). |
| 5380 | global settings |
| 5381 | settings = Settings() |
| 5382 | |
| 5383 | if not metrics.DISABLE_METRICS_COLLECTION: |
| 5384 | # GetViewVCUrl ultimately calls logging method. |
| 5385 | project_url = settings.GetViewVCUrl().strip('/+') |
| 5386 | if project_url in metrics_utils.KNOWN_PROJECT_URLS: |
| 5387 | metrics.collector.add('project_urls', [project_url]) |
| 5388 | |
| 5389 | def _parse_args(self, args=None): |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5390 | # Create an optparse.Values object that will store only the actual passed |
| 5391 | # options, without the defaults. |
| 5392 | actual_options = optparse.Values() |
| 5393 | _, args = optparse.OptionParser.parse_args(self, args, actual_options) |
| 5394 | # Create an optparse.Values object with the default options. |
| 5395 | options = optparse.Values(self.get_default_values().__dict__) |
| 5396 | # Update it with the options passed by the user. |
| 5397 | options._update_careful(actual_options.__dict__) |
| 5398 | # Store the options passed by the user in an _actual_options attribute. |
| 5399 | # We store only the keys, and not the values, since the values can contain |
| 5400 | # arbitrary information, which might be PII. |
| 5401 | metrics.collector.add('arguments', actual_options.__dict__.keys()) |
| 5402 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5403 | levels = [logging.WARNING, logging.INFO, logging.DEBUG] |
Andrii Shyshkalov | 5b04a57 | 2017-01-23 17:44:41 +0100 | [diff] [blame] | 5404 | logging.basicConfig( |
| 5405 | level=levels[min(options.verbose, len(levels) - 1)], |
| 5406 | format='[%(levelname).1s%(asctime)s %(process)d %(thread)d ' |
| 5407 | '%(filename)s] %(message)s') |
Edward Lemur | 83bd7f4 | 2018-10-10 00:14:21 +0000 | [diff] [blame] | 5408 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5409 | return options, args |
| 5410 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5411 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5412 | def main(argv): |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5413 | if sys.hexversion < 0x02060000: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5414 | print('\nYour Python version %s is unsupported, please upgrade.\n' % |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5415 | (sys.version.split(' ', 1)[0],), file=sys.stderr) |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 5416 | return 2 |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 5417 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 5418 | colorize_CMDstatus_doc() |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5419 | dispatcher = subcommand.CommandDispatcher(__name__) |
| 5420 | try: |
| 5421 | return dispatcher.execute(OptionParser(), argv) |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 5422 | except auth.AuthenticationError as e: |
| 5423 | DieWithError(str(e)) |
vapier | fd77ac7 | 2016-06-16 08:33:57 -0700 | [diff] [blame] | 5424 | except urllib2.HTTPError as e: |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5425 | if e.code != 500: |
| 5426 | raise |
| 5427 | DieWithError( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5428 | ('App Engine is misbehaving and returned HTTP %d, again. Keep faith ' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5429 | '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] | 5430 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5431 | |
| 5432 | |
| 5433 | if __name__ == '__main__': |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5434 | # These affect sys.stdout, so do it outside of main() to simplify mocks in |
| 5435 | # the unit tests. |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 5436 | fix_encoding.fix_encoding() |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 5437 | setup_color.init() |
Edward Lemur | 6f812e1 | 2018-07-31 22:45:57 +0000 | [diff] [blame] | 5438 | with metrics.collector.print_notice_and_exit(): |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 5439 | sys.exit(main(sys.argv[1:])) |