Josip Sokcevic | 4de5dea | 2022-03-23 21:15:14 +0000 | [diff] [blame] | 1 | #!/usr/bin/env vpython3 |
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 | |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 12 | import base64 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 13 | import collections |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 14 | import datetime |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 15 | import fnmatch |
Edward Lemur | 202c559 | 2019-10-21 22:44:52 +0000 | [diff] [blame] | 16 | import httplib2 |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 17 | import itertools |
maruel@chromium.org | 4f6852c | 2012-04-20 20:39:20 +0000 | [diff] [blame] | 18 | import json |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 19 | import logging |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 20 | import multiprocessing |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 21 | import optparse |
| 22 | import os |
| 23 | import re |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 24 | import shutil |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 25 | import stat |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 26 | import sys |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 27 | import tempfile |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 28 | import textwrap |
Edward Lemur | fec80c4 | 2018-11-01 23:14:14 +0000 | [diff] [blame] | 29 | import time |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 30 | import uuid |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 31 | import webbrowser |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 32 | import zlib |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 33 | |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 34 | from third_party import colorama |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 35 | import auth |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 36 | import clang_format |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 37 | import fix_encoding |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 38 | import gclient_utils |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 39 | import gerrit_util |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 40 | import git_common |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 41 | import git_footers |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 42 | import git_new_branch |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 43 | import metrics |
Edward Lesmes | 93277a7 | 2018-10-18 22:04:26 +0000 | [diff] [blame] | 44 | import metrics_utils |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 45 | import owners_client |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 46 | import owners_finder |
Lei Zhang | b8c62cf | 2020-07-15 20:09:37 +0000 | [diff] [blame] | 47 | import presubmit_canned_checks |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 48 | import presubmit_support |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 49 | import rustfmt |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 50 | import scm |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 51 | import setup_color |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 52 | import split_cl |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 53 | import subcommand |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 54 | import subprocess2 |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 55 | import swift_format |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 56 | import watchlists |
| 57 | |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 58 | from third_party import six |
| 59 | from six.moves import urllib |
| 60 | |
| 61 | |
| 62 | if sys.version_info.major == 3: |
| 63 | basestring = (str,) # pylint: disable=redefined-builtin |
| 64 | |
Edward Lemur | b983024 | 2019-10-30 22:19:20 +0000 | [diff] [blame] | 65 | |
tandrii | 7400cf0 | 2016-06-21 08:48:07 -0700 | [diff] [blame] | 66 | __version__ = '2.0' |
maruel@chromium.org | 2a74d37 | 2011-03-29 19:05:50 +0000 | [diff] [blame] | 67 | |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 68 | # Traces for git push will be stored in a traces directory inside the |
| 69 | # depot_tools checkout. |
| 70 | DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__)) |
| 71 | TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces') |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 72 | PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 73 | |
| 74 | # When collecting traces, Git hashes will be reduced to 6 characters to reduce |
| 75 | # the size after compression. |
| 76 | GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I) |
| 77 | # Used to redact the cookies from the gitcookies file. |
| 78 | GITCOOKIES_REDACT_RE = re.compile(r'1/.*') |
| 79 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 80 | MAX_ATTEMPTS = 3 |
| 81 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 82 | # The maximum number of traces we will keep. Multiplied by 3 since we store |
| 83 | # 3 files per trace. |
| 84 | MAX_TRACES = 3 * 10 |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 85 | # Message to be displayed to the user to inform where to find the traces for a |
| 86 | # git-cl upload execution. |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 87 | TRACES_MESSAGE = ( |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 88 | '\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 89 | 'The traces of this git-cl execution have been recorded at:\n' |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 90 | ' %(trace_name)s-traces.zip\n' |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 91 | 'Copies of your gitcookies file and git config have been recorded at:\n' |
| 92 | ' %(trace_name)s-git-info.zip\n') |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 93 | # Format of the message to be stored as part of the traces to give developers a |
| 94 | # better context when they go through traces. |
| 95 | TRACES_README_FORMAT = ( |
| 96 | 'Date: %(now)s\n' |
| 97 | '\n' |
| 98 | 'Change: https://%(gerrit_host)s/q/%(change_id)s\n' |
| 99 | 'Title: %(title)s\n' |
| 100 | '\n' |
| 101 | '%(description)s\n' |
| 102 | '\n' |
| 103 | 'Execution time: %(execution_time)s\n' |
| 104 | 'Exit code: %(exit_code)s\n') + TRACES_MESSAGE |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 105 | |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 106 | POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land' |
Henrique Ferreiro | ff24962 | 2019-11-28 23:19:29 +0000 | [diff] [blame] | 107 | DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup' |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 108 | REFS_THAT_ALIAS_TO_OTHER_REFS = { |
Josip Sokcevic | 7e133ff | 2021-07-13 17:44:53 +0000 | [diff] [blame] | 109 | 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main', |
| 110 | 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main', |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 111 | } |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 112 | |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 113 | DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master' |
| 114 | DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main' |
| 115 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 116 | # Valid extensions for files we want to lint. |
| 117 | DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)" |
| 118 | DEFAULT_LINT_IGNORE_REGEX = r"$^" |
| 119 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 120 | # File name for yapf style config files. |
| 121 | YAPF_CONFIG_FILENAME = '.style.yapf' |
| 122 | |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 123 | # The issue, patchset and codereview server are stored on git config for each |
| 124 | # branch under branch.<branch-name>.<config-key>. |
| 125 | ISSUE_CONFIG_KEY = 'gerritissue' |
| 126 | PATCHSET_CONFIG_KEY = 'gerritpatchset' |
| 127 | CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver' |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 128 | # When using squash workflow, _CMDUploadChange doesn't simply push the commit(s) |
| 129 | # you make to Gerrit. Instead, it creates a new commit object that contains all |
| 130 | # changes you've made, diffed against a parent/merge base. |
| 131 | # This is the hash of the new squashed commit and you can find this on Gerrit. |
| 132 | GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash' |
| 133 | # This is the latest uploaded local commit hash. |
| 134 | LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash' |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 135 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 136 | # Shortcut since it quickly becomes repetitive. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 137 | Fore = colorama.Fore |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 138 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 139 | # Initialized in main() |
| 140 | settings = None |
| 141 | |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 142 | # Used by tests/git_cl_test.py to add extra logging. |
| 143 | # Inside the weirdly failing test, add this: |
| 144 | # >>> self.mock(git_cl, '_IS_BEING_TESTED', True) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 145 | # And scroll up to see the stack trace printed. |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 146 | _IS_BEING_TESTED = False |
| 147 | |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 148 | _GOOGLESOURCE = 'googlesource.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 149 | |
Andrii Shyshkalov | 1ee78cd | 2020-03-12 01:31:53 +0000 | [diff] [blame] | 150 | _KNOWN_GERRIT_TO_SHORT_URLS = { |
| 151 | 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i', |
| 152 | 'https://chromium-review.googlesource.com': 'https://crrev.com/c', |
| 153 | } |
Andrii Shyshkalov | 8aebb60 | 2020-04-16 22:10:27 +0000 | [diff] [blame] | 154 | assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len( |
| 155 | set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values' |
Andrii Shyshkalov | 1ee78cd | 2020-03-12 01:31:53 +0000 | [diff] [blame] | 156 | |
| 157 | |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 158 | # Maximum number of branches in a stack that can be traversed and uploaded |
| 159 | # at once. Picked arbitrarily. |
| 160 | _MAX_STACKED_BRANCHES_UPLOAD = 20 |
| 161 | |
| 162 | |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 163 | class GitPushError(Exception): |
| 164 | pass |
| 165 | |
| 166 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 167 | def DieWithError(message, change_desc=None): |
| 168 | if change_desc: |
| 169 | SaveDescriptionBackup(change_desc) |
Josip Sokcevic | 953278a | 2020-02-28 19:46:36 +0000 | [diff] [blame] | 170 | print('\n ** Content of CL description **\n' + |
| 171 | '='*72 + '\n' + |
| 172 | change_desc.description + '\n' + |
| 173 | '='*72 + '\n') |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 174 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 175 | print(message, file=sys.stderr) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 176 | sys.exit(1) |
| 177 | |
| 178 | |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 179 | def SaveDescriptionBackup(change_desc): |
Henrique Ferreiro | 5ae4817 | 2019-11-29 16:14:42 +0000 | [diff] [blame] | 180 | backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE) |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 181 | print('\nsaving CL description to %s\n' % backup_path) |
sokcevic | 0715280 | 2021-08-18 00:06:34 +0000 | [diff] [blame] | 182 | with open(backup_path, 'wb') as backup_file: |
| 183 | backup_file.write(change_desc.description.encode('utf-8')) |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 184 | |
| 185 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 186 | def GetNoGitPagerEnv(): |
| 187 | env = os.environ.copy() |
| 188 | # 'cat' is a magical git string that disables pagers on all platforms. |
| 189 | env['GIT_PAGER'] = 'cat' |
| 190 | return env |
| 191 | |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 192 | |
bsep@chromium.org | 627d900 | 2016-04-29 00:00:52 +0000 | [diff] [blame] | 193 | 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] | 194 | try: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 195 | stdout = subprocess2.check_output(args, shell=shell, **kwargs) |
| 196 | return stdout.decode('utf-8', 'replace') |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 197 | except subprocess2.CalledProcessError as e: |
| 198 | logging.debug('Failed running %s', args) |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 199 | if not error_ok: |
Alan Cutter | 594fd33 | 2020-07-21 23:55:27 +0000 | [diff] [blame] | 200 | message = error_message or e.stdout.decode('utf-8', 'replace') or '' |
| 201 | DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message)) |
Josip Sokcevic | 673e8ed | 2021-10-27 23:46:18 +0000 | [diff] [blame] | 202 | out = e.stdout.decode('utf-8', 'replace') |
| 203 | if e.stderr: |
| 204 | out += e.stderr.decode('utf-8', 'replace') |
| 205 | return out |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 206 | |
| 207 | |
| 208 | def RunGit(args, **kwargs): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 209 | """Returns stdout.""" |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 210 | return RunCommand(['git'] + args, **kwargs) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 211 | |
| 212 | |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 213 | def RunGitWithCode(args, suppress_stderr=False): |
maruel@chromium.org | 32f9f5e | 2011-09-14 13:41:47 +0000 | [diff] [blame] | 214 | """Returns return code and stdout.""" |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 215 | if suppress_stderr: |
Edward Lesmes | cf06cad | 2020-12-14 22:03:23 +0000 | [diff] [blame] | 216 | stderr = subprocess2.DEVNULL |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 217 | else: |
| 218 | stderr = sys.stderr |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 219 | try: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 220 | (out, _), code = subprocess2.communicate(['git'] + args, |
| 221 | env=GetNoGitPagerEnv(), |
| 222 | stdout=subprocess2.PIPE, |
| 223 | stderr=stderr) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 224 | return code, out.decode('utf-8', 'replace') |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 225 | except subprocess2.CalledProcessError as e: |
Yoshisato Yanagisawa | 81e3ff5 | 2017-09-26 15:33:34 +0900 | [diff] [blame] | 226 | logging.debug('Failed running %s', ['git'] + args) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 227 | return e.returncode, e.stdout.decode('utf-8', 'replace') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 228 | |
| 229 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 230 | def RunGitSilent(args): |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 231 | """Returns stdout, suppresses stderr and ignores the return code.""" |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 232 | return RunGitWithCode(args, suppress_stderr=True)[1] |
| 233 | |
| 234 | |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 235 | def time_sleep(seconds): |
| 236 | # Use this so that it can be mocked in tests without interfering with python |
| 237 | # system machinery. |
tandrii | 2a16b95 | 2016-10-19 07:09:44 -0700 | [diff] [blame] | 238 | return time.sleep(seconds) |
| 239 | |
| 240 | |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 241 | def time_time(): |
| 242 | # Use this so that it can be mocked in tests without interfering with python |
| 243 | # system machinery. |
| 244 | return time.time() |
| 245 | |
| 246 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 247 | def datetime_now(): |
| 248 | # Use this so that it can be mocked in tests without interfering with python |
| 249 | # system machinery. |
| 250 | return datetime.datetime.now() |
| 251 | |
| 252 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 253 | def confirm_or_exit(prefix='', action='confirm'): |
| 254 | """Asks user to press enter to continue or press Ctrl+C to abort.""" |
| 255 | if not prefix or prefix.endswith('\n'): |
| 256 | mid = 'Press' |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 257 | elif prefix.endswith('.') or prefix.endswith('?'): |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 258 | mid = ' Press' |
| 259 | elif prefix.endswith(' '): |
| 260 | mid = 'press' |
| 261 | else: |
| 262 | mid = ' press' |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 263 | gclient_utils.AskForData( |
| 264 | '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action)) |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 265 | |
| 266 | |
| 267 | def ask_for_explicit_yes(prompt): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 268 | """Returns whether user typed 'y' or 'yes' to confirm the given prompt.""" |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 269 | result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower() |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 270 | while True: |
| 271 | if 'yes'.startswith(result): |
| 272 | return True |
| 273 | if 'no'.startswith(result): |
| 274 | return False |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 275 | result = gclient_utils.AskForData('Please, type yes or no: ').lower() |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 276 | |
| 277 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 278 | def _get_properties_from_options(options): |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 279 | prop_list = getattr(options, 'properties', []) |
| 280 | properties = dict(x.split('=', 1) for x in prop_list) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 281 | for key, val in properties.items(): |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 282 | try: |
| 283 | properties[key] = json.loads(val) |
| 284 | except ValueError: |
| 285 | pass # If a value couldn't be evaluated, treat it as a string. |
| 286 | return properties |
| 287 | |
| 288 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 289 | def _call_buildbucket(http, buildbucket_host, method, request): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 290 | """Calls a buildbucket v2 method and returns the parsed json response.""" |
| 291 | headers = { |
| 292 | 'Accept': 'application/json', |
| 293 | 'Content-Type': 'application/json', |
| 294 | } |
| 295 | request = json.dumps(request) |
| 296 | url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method) |
| 297 | |
| 298 | logging.info('POST %s with %s' % (url, request)) |
| 299 | |
| 300 | attempts = 1 |
| 301 | time_to_sleep = 1 |
| 302 | while True: |
| 303 | response, content = http.request(url, 'POST', body=request, headers=headers) |
| 304 | if response.status == 200: |
| 305 | return json.loads(content[4:]) |
| 306 | if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500: |
| 307 | msg = '%s error when calling POST %s with %s: %s' % ( |
| 308 | response.status, url, request, content) |
| 309 | raise BuildbucketResponseException(msg) |
| 310 | logging.debug( |
| 311 | '%s error when calling POST %s with %s. ' |
| 312 | 'Sleeping for %d seconds and retrying...' % ( |
| 313 | response.status, url, request, time_to_sleep)) |
| 314 | time.sleep(time_to_sleep) |
| 315 | time_to_sleep *= 2 |
| 316 | attempts += 1 |
| 317 | |
| 318 | assert False, 'unreachable' |
| 319 | |
| 320 | |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 321 | def _parse_bucket(raw_bucket): |
| 322 | legacy = True |
| 323 | project = bucket = None |
| 324 | if '/' in raw_bucket: |
| 325 | legacy = False |
| 326 | project, bucket = raw_bucket.split('/', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 327 | # Assume luci.<project>.<bucket>. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 328 | elif raw_bucket.startswith('luci.'): |
| 329 | project, bucket = raw_bucket[len('luci.'):].split('.', 1) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 330 | # Otherwise, assume prefix is also the project name. |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 331 | elif '.' in raw_bucket: |
| 332 | project = raw_bucket.split('.')[0] |
| 333 | bucket = raw_bucket |
| 334 | # Legacy buckets. |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 335 | if legacy and project and bucket: |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 336 | print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket)) |
| 337 | return project, bucket |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 338 | |
| 339 | |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 340 | def _canonical_git_googlesource_host(host): |
| 341 | """Normalizes Gerrit hosts (with '-review') to Git host.""" |
| 342 | assert host.endswith(_GOOGLESOURCE) |
| 343 | # Prefix doesn't include '.' at the end. |
| 344 | prefix = host[:-(1 + len(_GOOGLESOURCE))] |
| 345 | if prefix.endswith('-review'): |
| 346 | prefix = prefix[:-len('-review')] |
| 347 | return prefix + '.' + _GOOGLESOURCE |
| 348 | |
| 349 | |
| 350 | def _canonical_gerrit_googlesource_host(host): |
| 351 | git_host = _canonical_git_googlesource_host(host) |
| 352 | prefix = git_host.split('.', 1)[0] |
| 353 | return prefix + '-review.' + _GOOGLESOURCE |
| 354 | |
| 355 | |
| 356 | def _get_counterpart_host(host): |
| 357 | assert host.endswith(_GOOGLESOURCE) |
| 358 | git = _canonical_git_googlesource_host(host) |
| 359 | gerrit = _canonical_gerrit_googlesource_host(git) |
| 360 | return git if gerrit == host else gerrit |
| 361 | |
| 362 | |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 363 | def _trigger_tryjobs(changelist, jobs, options, patchset): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 364 | """Sends a request to Buildbucket to trigger tryjobs for a changelist. |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 365 | |
| 366 | Args: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 367 | changelist: Changelist that the tryjobs are associated with. |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 368 | jobs: A list of (project, bucket, builder). |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 369 | options: Command-line options. |
| 370 | """ |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 371 | print('Scheduling jobs on:') |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 372 | for project, bucket, builder in jobs: |
| 373 | print(' %s/%s: %s' % (project, bucket, builder)) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 374 | print('To see results here, run: git cl try-results') |
| 375 | print('To see results in browser, run: git cl web') |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 376 | |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 377 | requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset) |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 378 | if not requests: |
| 379 | return |
| 380 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 381 | http = auth.Authenticator().authorize(httplib2.Http()) |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 382 | http.force_exception_to_status_code = True |
| 383 | |
| 384 | batch_request = {'requests': requests} |
| 385 | batch_response = _call_buildbucket( |
| 386 | http, options.buildbucket_host, 'Batch', batch_request) |
| 387 | |
| 388 | errors = [ |
| 389 | ' ' + response['error']['message'] |
| 390 | for response in batch_response.get('responses', []) |
| 391 | if 'error' in response |
| 392 | ] |
| 393 | if errors: |
| 394 | raise BuildbucketResponseException( |
| 395 | 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors)) |
| 396 | |
| 397 | |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 398 | def _make_tryjob_schedule_requests(changelist, jobs, options, patchset): |
Quinten Yearsley | ee8be8a | 2020-03-05 21:48:32 +0000 | [diff] [blame] | 399 | """Constructs requests for Buildbucket to trigger tryjobs.""" |
Edward Lemur | f0faf48 | 2019-09-25 20:40:17 +0000 | [diff] [blame] | 400 | gerrit_changes = [changelist.GetGerritChange(patchset)] |
Quinten Yearsley | ee8be8a | 2020-03-05 21:48:32 +0000 | [diff] [blame] | 401 | shared_properties = { |
| 402 | 'category': options.ensure_value('category', 'git_cl_try') |
| 403 | } |
| 404 | if options.ensure_value('clobber', False): |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 405 | shared_properties['clobber'] = True |
| 406 | shared_properties.update(_get_properties_from_options(options) or {}) |
| 407 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 408 | shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}] |
Quinten Yearsley | ee8be8a | 2020-03-05 21:48:32 +0000 | [diff] [blame] | 409 | if options.ensure_value('retry_failed', False): |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 410 | shared_tags.append({'key': 'retry_failed', |
| 411 | 'value': '1'}) |
| 412 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 413 | requests = [] |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 414 | for (project, bucket, builder) in jobs: |
| 415 | properties = shared_properties.copy() |
| 416 | if 'presubmit' in builder.lower(): |
| 417 | properties['dry_run'] = 'true' |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 418 | |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 419 | requests.append({ |
| 420 | 'scheduleBuild': { |
| 421 | 'requestId': str(uuid.uuid4()), |
| 422 | 'builder': { |
| 423 | 'project': getattr(options, 'project', None) or project, |
| 424 | 'bucket': bucket, |
| 425 | 'builder': builder, |
| 426 | }, |
| 427 | 'gerritChanges': gerrit_changes, |
| 428 | 'properties': properties, |
| 429 | 'tags': [ |
| 430 | {'key': 'builder', 'value': builder}, |
| 431 | ] + shared_tags, |
| 432 | } |
| 433 | }) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 434 | |
Quinten Yearsley | ee8be8a | 2020-03-05 21:48:32 +0000 | [diff] [blame] | 435 | if options.ensure_value('revision', None): |
Josip Sokcevic | 9011a5b | 2021-02-12 18:59:44 +0000 | [diff] [blame] | 436 | remote, remote_branch = changelist.GetRemoteBranch() |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 437 | requests[-1]['scheduleBuild']['gitilesCommit'] = { |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 438 | 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']), |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 439 | 'project': gerrit_changes[0]['project'], |
Josip Sokcevic | 9011a5b | 2021-02-12 18:59:44 +0000 | [diff] [blame] | 440 | 'id': options.revision, |
| 441 | 'ref': GetTargetRef(remote, remote_branch, None) |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 442 | } |
Anthony Polito | 1a5fe23 | 2020-01-24 23:17:52 +0000 | [diff] [blame] | 443 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 444 | return requests |
kjellander@chromium.org | 4442454 | 2015-06-02 18:35:29 +0000 | [diff] [blame] | 445 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 446 | |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 447 | def _fetch_tryjobs(changelist, buildbucket_host, patchset=None): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 448 | """Fetches tryjobs from buildbucket. |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 449 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 450 | 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] | 451 | """ |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 452 | fields = ['id', 'builder', 'status', 'createTime', 'tags'] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 453 | request = { |
| 454 | 'predicate': { |
| 455 | 'gerritChanges': [changelist.GetGerritChange(patchset)], |
| 456 | }, |
| 457 | 'fields': ','.join('builds.*.' + field for field in fields), |
| 458 | } |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 459 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 460 | authenticator = auth.Authenticator() |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 461 | if authenticator.has_cached_credentials(): |
| 462 | http = authenticator.authorize(httplib2.Http()) |
| 463 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 464 | print('Warning: Some results might be missing because %s' % |
| 465 | # Get the message on how to login. |
Andrii Shyshkalov | 2517afd | 2021-01-19 17:07:43 +0000 | [diff] [blame] | 466 | (str(auth.LoginRequiredError()),)) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 467 | http = httplib2.Http() |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 468 | http.force_exception_to_status_code = True |
| 469 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 470 | response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request) |
| 471 | return response.get('builds', []) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 472 | |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 473 | |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 474 | def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None): |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 475 | """Fetches builds from the latest patchset that has builds (within |
| 476 | the last few patchsets). |
| 477 | |
| 478 | Args: |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 479 | changelist (Changelist): The CL to fetch builds for |
| 480 | buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com" |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 481 | lastest_patchset(int|NoneType): the patchset to start fetching builds from. |
| 482 | If None (default), starts with the latest available patchset. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 483 | Returns: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 484 | A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build, |
| 485 | and patchset is the patchset number where those builds came from. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 486 | """ |
| 487 | assert buildbucket_host |
| 488 | assert changelist.GetIssue(), 'CL must be uploaded first' |
| 489 | assert changelist.GetCodereviewServer(), 'CL must be uploaded first' |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 490 | if latest_patchset is None: |
| 491 | assert changelist.GetMostRecentPatchset() |
| 492 | ps = changelist.GetMostRecentPatchset() |
| 493 | else: |
| 494 | assert latest_patchset > 0, latest_patchset |
| 495 | ps = latest_patchset |
| 496 | |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 497 | min_ps = max(1, ps - 5) |
| 498 | while ps >= min_ps: |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 499 | builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 500 | if len(builds): |
| 501 | return builds, ps |
| 502 | ps -= 1 |
| 503 | return [], 0 |
| 504 | |
| 505 | |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 506 | def _filter_failed_for_retry(all_builds): |
| 507 | """Returns a list of buckets/builders that are worth retrying. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 508 | |
| 509 | Args: |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 510 | all_builds (list): Builds, in the format returned by _fetch_tryjobs, |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 511 | i.e. a list of buildbucket.v2.Builds which includes status and builder |
| 512 | info. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 513 | |
| 514 | Returns: |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 515 | A dict {(proj, bucket): [builders]}. This is the same format accepted by |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 516 | _trigger_tryjobs. |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 517 | """ |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 518 | grouped = {} |
| 519 | for build in all_builds: |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 520 | builder = build['builder'] |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 521 | key = (builder['project'], builder['bucket'], builder['builder']) |
| 522 | grouped.setdefault(key, []).append(build) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 523 | |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 524 | jobs = [] |
| 525 | for (project, bucket, builder), builds in grouped.items(): |
| 526 | if 'triggered' in builder: |
| 527 | print('WARNING: Not scheduling %s. Triggered bots require an initial job ' |
| 528 | 'from a parent. Please schedule a manual job for the parent ' |
| 529 | 'instead.') |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 530 | continue |
| 531 | if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds): |
| 532 | # Don't retry if any are running. |
| 533 | continue |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 534 | # If builder had several builds, retry only if the last one failed. |
| 535 | # This is a bit different from CQ, which would re-use *any* SUCCESS-full |
| 536 | # build, but in case of retrying failed jobs retrying a flaky one makes |
| 537 | # sense. |
| 538 | builds = sorted(builds, key=lambda b: b['createTime']) |
| 539 | if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'): |
| 540 | continue |
| 541 | # Don't retry experimental build previously triggered by CQ. |
| 542 | if any(t['key'] == 'cq_experimental' and t['value'] == 'true' |
| 543 | for t in builds[-1]['tags']): |
| 544 | continue |
| 545 | jobs.append((project, bucket, builder)) |
| 546 | |
| 547 | # Sort the jobs to make testing easier. |
| 548 | return sorted(jobs) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 549 | |
| 550 | |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 551 | def _print_tryjobs(options, builds): |
| 552 | """Prints nicely result of _fetch_tryjobs.""" |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 553 | if not builds: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 554 | print('No tryjobs scheduled.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 555 | return |
| 556 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 557 | longest_builder = max(len(b['builder']['builder']) for b in builds) |
| 558 | name_fmt = '{builder:<%d}' % longest_builder |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 559 | if options.print_master: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 560 | longest_bucket = max(len(b['builder']['bucket']) for b in builds) |
| 561 | name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 562 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 563 | builds_by_status = {} |
| 564 | for b in builds: |
| 565 | builds_by_status.setdefault(b['status'], []).append({ |
| 566 | 'id': b['id'], |
| 567 | 'name': name_fmt.format( |
| 568 | builder=b['builder']['builder'], bucket=b['builder']['bucket']), |
| 569 | }) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 570 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 571 | sort_key = lambda b: (b['name'], b['id']) |
| 572 | |
| 573 | def print_builds(title, builds, fmt=None, color=None): |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 574 | """Pop matching builds from `builds` dict and print them.""" |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 575 | if not builds: |
| 576 | return |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 577 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 578 | fmt = fmt or '{name} https://ci.chromium.org/b/{id}' |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 579 | if not options.color or color is None: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 580 | colorize = lambda x: x |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 581 | else: |
| 582 | colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET) |
| 583 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 584 | print(colorize(title)) |
| 585 | for b in sorted(builds, key=sort_key): |
| 586 | print(' ', colorize(fmt.format(**b))) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 587 | |
| 588 | total = len(builds) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 589 | print_builds( |
| 590 | 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN) |
| 591 | print_builds( |
| 592 | 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []), |
| 593 | color=Fore.MAGENTA) |
| 594 | print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED) |
| 595 | print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}', |
| 596 | color=Fore.MAGENTA) |
Andrii Shyshkalov | 792630c | 2020-10-19 16:47:44 +0000 | [diff] [blame] | 597 | print_builds('Started:', builds_by_status.pop('STARTED', []), |
| 598 | color=Fore.YELLOW) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 599 | print_builds( |
| 600 | 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 601 | # 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] | 602 | print_builds( |
| 603 | 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 604 | print('Total: %d tryjobs' % total) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 605 | |
| 606 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 607 | def _ComputeDiffLineRanges(files, upstream_commit): |
| 608 | """Gets the changed line ranges for each file since upstream_commit. |
| 609 | |
| 610 | Parses a git diff on provided files and returns a dict that maps a file name |
| 611 | to an ordered list of range tuples in the form (start_line, count). |
| 612 | Ranges are in the same format as a git diff. |
| 613 | """ |
| 614 | # If files is empty then diff_output will be a full diff. |
| 615 | if len(files) == 0: |
| 616 | return {} |
| 617 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 618 | # Take the git diff and find the line ranges where there are changes. |
Jamie Madill | 3671a6a | 2019-10-24 15:13:21 +0000 | [diff] [blame] | 619 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 620 | diff_output = RunGit(diff_cmd) |
| 621 | |
| 622 | pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)' |
| 623 | # 2 capture groups |
| 624 | # 0 == fname of diff file |
| 625 | # 1 == 'diff_start,diff_count' or 'diff_start' |
| 626 | # will match each of |
| 627 | # diff --git a/foo.foo b/foo.py |
| 628 | # @@ -12,2 +14,3 @@ |
| 629 | # @@ -12,2 +17 @@ |
| 630 | # running re.findall on the above string with pattern will give |
| 631 | # [('foo.py', ''), ('', '14,3'), ('', '17')] |
| 632 | |
| 633 | curr_file = None |
| 634 | line_diffs = {} |
| 635 | for match in re.findall(pattern, diff_output, flags=re.MULTILINE): |
| 636 | if match[0] != '': |
| 637 | # Will match the second filename in diff --git a/a.py b/b.py. |
| 638 | curr_file = match[0] |
| 639 | line_diffs[curr_file] = [] |
| 640 | else: |
| 641 | # Matches +14,3 |
| 642 | if ',' in match[1]: |
| 643 | diff_start, diff_count = match[1].split(',') |
| 644 | else: |
| 645 | # Single line changes are of the form +12 instead of +12,1. |
| 646 | diff_start = match[1] |
| 647 | diff_count = 1 |
| 648 | |
| 649 | diff_start = int(diff_start) |
| 650 | diff_count = int(diff_count) |
| 651 | |
| 652 | # If diff_count == 0 this is a removal we can ignore. |
| 653 | line_diffs[curr_file].append((diff_start, diff_count)) |
| 654 | |
| 655 | return line_diffs |
| 656 | |
| 657 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 658 | def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None): |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 659 | """Checks if a yapf file is in any parent directory of fpath until top_dir. |
| 660 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 661 | 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] | 662 | is found returns None. Uses yapf_config_cache as a cache for previously found |
| 663 | configs. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 664 | """ |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 665 | fpath = os.path.abspath(fpath) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 666 | # Return result if we've already computed it. |
| 667 | if fpath in yapf_config_cache: |
| 668 | return yapf_config_cache[fpath] |
| 669 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 670 | parent_dir = os.path.dirname(fpath) |
| 671 | if os.path.isfile(fpath): |
| 672 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 673 | else: |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 674 | # Otherwise fpath is a directory |
| 675 | yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME) |
| 676 | if os.path.isfile(yapf_file): |
| 677 | ret = yapf_file |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 678 | elif fpath in (top_dir, parent_dir): |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 679 | # If we're at the top level directory, or if we're at root |
| 680 | # there is no provided style. |
| 681 | ret = None |
| 682 | else: |
| 683 | # Otherwise recurse on the current directory. |
| 684 | ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 685 | yapf_config_cache[fpath] = ret |
| 686 | return ret |
| 687 | |
| 688 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 689 | def _GetYapfIgnorePatterns(top_dir): |
| 690 | """Returns all patterns in the .yapfignore file. |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 691 | |
| 692 | yapf is supposed to handle the ignoring of files listed in .yapfignore itself, |
| 693 | but this functionality appears to break when explicitly passing files to |
| 694 | yapf for formatting. According to |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 695 | https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore, |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 696 | the .yapfignore file should be in the directory that yapf is invoked from, |
| 697 | which we assume to be the top level directory in this case. |
| 698 | |
| 699 | Args: |
| 700 | top_dir: The top level directory for the repository being formatted. |
| 701 | |
| 702 | Returns: |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 703 | A set of all fnmatch patterns to be ignored. |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 704 | """ |
| 705 | yapfignore_file = os.path.join(top_dir, '.yapfignore') |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 706 | ignore_patterns = set() |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 707 | if not os.path.exists(yapfignore_file): |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 708 | return ignore_patterns |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 709 | |
Anthony Polito | c64e390 | 2021-04-30 21:55:25 +0000 | [diff] [blame] | 710 | for line in gclient_utils.FileRead(yapfignore_file).split('\n'): |
| 711 | stripped_line = line.strip() |
| 712 | # Comments and blank lines should be ignored. |
| 713 | if stripped_line.startswith('#') or stripped_line == '': |
| 714 | continue |
| 715 | ignore_patterns.add(stripped_line) |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 716 | return ignore_patterns |
| 717 | |
| 718 | |
| 719 | def _FilterYapfIgnoredFiles(filepaths, patterns): |
| 720 | """Filters out any filepaths that match any of the given patterns. |
| 721 | |
| 722 | Args: |
| 723 | filepaths: An iterable of strings containing filepaths to filter. |
| 724 | patterns: An iterable of strings containing fnmatch patterns to filter on. |
| 725 | |
| 726 | Returns: |
| 727 | A list of strings containing all the elements of |filepaths| that did not |
| 728 | match any of the patterns in |patterns|. |
| 729 | """ |
| 730 | # Not inlined so that tests can use the same implementation. |
| 731 | return [f for f in filepaths |
| 732 | if not any(fnmatch.fnmatch(f, p) for p in patterns)] |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 733 | |
| 734 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 735 | def print_stats(args): |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 736 | """Prints statistics about the change to the user.""" |
| 737 | # --no-ext-diff is broken in some versions of Git, so try to work around |
| 738 | # this by overriding the environment (but there is still a problem if the |
| 739 | # git config key "diff.external" is used). |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 740 | env = GetNoGitPagerEnv() |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 741 | if 'GIT_EXTERNAL_DIFF' in env: |
| 742 | del env['GIT_EXTERNAL_DIFF'] |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 743 | |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 744 | return subprocess2.call( |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 745 | ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args, |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 746 | env=env) |
maruel@chromium.org | 49e3d80 | 2012-07-18 23:54:45 +0000 | [diff] [blame] | 747 | |
| 748 | |
sheyang@google.com | 6ebaf78 | 2015-05-12 19:17:54 +0000 | [diff] [blame] | 749 | class BuildbucketResponseException(Exception): |
| 750 | pass |
| 751 | |
| 752 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 753 | class Settings(object): |
| 754 | def __init__(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 755 | self.cc = None |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 756 | self.root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 757 | self.tree_status_url = None |
| 758 | self.viewvc_url = None |
| 759 | self.updated = False |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 760 | self.is_gerrit = None |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 761 | self.squash_gerrit_uploads = None |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 762 | self.gerrit_skip_ensure_authenticated = None |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 763 | self.git_editor = None |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 764 | self.format_full_by_default = None |
Sigurd Schneider | 1bfda8e | 2021-06-30 14:46:25 +0000 | [diff] [blame] | 765 | self.is_status_commit_order_by_date = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 766 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 767 | def _LazyUpdateIfNeeded(self): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 768 | """Updates the settings from a codereview.settings file, if available.""" |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 769 | if self.updated: |
| 770 | return |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 771 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 772 | # The only value that actually changes the behavior is |
| 773 | # autoupdate = "false". Everything else means "true". |
| 774 | autoupdate = ( |
| 775 | scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower()) |
| 776 | |
| 777 | cr_settings_file = FindCodereviewSettingsFile() |
| 778 | if autoupdate != 'false' and cr_settings_file: |
| 779 | LoadCodereviewSettingsFromFile(cr_settings_file) |
| 780 | cr_settings_file.close() |
| 781 | |
| 782 | self.updated = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 783 | |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 784 | @staticmethod |
| 785 | def GetRelativeRoot(): |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 786 | return scm.GIT.GetCheckoutRoot('.') |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 787 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 788 | def GetRoot(self): |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 789 | if self.root is None: |
| 790 | self.root = os.path.abspath(self.GetRelativeRoot()) |
| 791 | return self.root |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 792 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 793 | def GetTreeStatusUrl(self, error_ok=False): |
| 794 | if not self.tree_status_url: |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 795 | self.tree_status_url = self._GetConfig('rietveld.tree-status-url') |
| 796 | if self.tree_status_url is None and not error_ok: |
| 797 | DieWithError( |
| 798 | 'You must configure your tree status URL by running ' |
| 799 | '"git cl config".') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 800 | return self.tree_status_url |
| 801 | |
| 802 | def GetViewVCUrl(self): |
| 803 | if not self.viewvc_url: |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 804 | self.viewvc_url = self._GetConfig('rietveld.viewvc-url') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 805 | return self.viewvc_url |
| 806 | |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 807 | def GetBugPrefix(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 808 | return self._GetConfig('rietveld.bug-prefix') |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 809 | |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 810 | def GetRunPostUploadHook(self): |
Edward Lemur | 61ea307 | 2018-12-01 00:34:36 +0000 | [diff] [blame] | 811 | run_post_upload_hook = self._GetConfig( |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 812 | 'rietveld.run-post-upload-hook') |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 813 | return run_post_upload_hook == "True" |
| 814 | |
Joanna Wang | c8f23e2 | 2023-01-19 21:18:10 +0000 | [diff] [blame] | 815 | def GetDefaultCCList(self): |
| 816 | return self._GetConfig('rietveld.cc') |
| 817 | |
Dirk Pranke | 6f0df68 | 2021-06-25 00:42:33 +0000 | [diff] [blame] | 818 | def GetUsePython3(self): |
| 819 | return self._GetConfig('rietveld.use-python3') |
| 820 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 821 | def GetSquashGerritUploads(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 822 | """Returns True if uploads to Gerrit should be squashed by default.""" |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 823 | if self.squash_gerrit_uploads is None: |
Edward Lesmes | 4de5413 | 2020-05-05 19:41:33 +0000 | [diff] [blame] | 824 | self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride() |
| 825 | if self.squash_gerrit_uploads is None: |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 826 | # Default is squash now (http://crbug.com/611892#c23). |
| 827 | self.squash_gerrit_uploads = self._GetConfig( |
| 828 | 'gerrit.squash-uploads').lower() != 'false' |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 829 | return self.squash_gerrit_uploads |
| 830 | |
Edward Lesmes | 4de5413 | 2020-05-05 19:41:33 +0000 | [diff] [blame] | 831 | def GetSquashGerritUploadsOverride(self): |
| 832 | """Return True or False if codereview.settings should be overridden. |
| 833 | |
| 834 | Returns None if no override has been defined. |
| 835 | """ |
| 836 | # See also http://crbug.com/611892#c23 |
| 837 | result = self._GetConfig('gerrit.override-squash-uploads').lower() |
| 838 | if result == 'true': |
| 839 | return True |
| 840 | if result == 'false': |
| 841 | return False |
| 842 | return None |
| 843 | |
Aleksey Khoroshilov | 35ef5ad | 2022-06-03 18:29:25 +0000 | [diff] [blame] | 844 | def GetIsGerrit(self): |
| 845 | """Return True if gerrit.host is set.""" |
| 846 | if self.is_gerrit is None: |
| 847 | self.is_gerrit = bool(self._GetConfig('gerrit.host', False)) |
| 848 | return self.is_gerrit |
| 849 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 850 | def GetGerritSkipEnsureAuthenticated(self): |
| 851 | """Return True if EnsureAuthenticated should not be done for Gerrit |
| 852 | uploads.""" |
| 853 | if self.gerrit_skip_ensure_authenticated is None: |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 854 | self.gerrit_skip_ensure_authenticated = self._GetConfig( |
| 855 | 'gerrit.skip-ensure-authenticated').lower() == 'true' |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 856 | return self.gerrit_skip_ensure_authenticated |
| 857 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 858 | def GetGitEditor(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 859 | """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] | 860 | if self.git_editor is None: |
Raul Tambre | 5a52587 | 2019-02-12 19:08:08 +0000 | [diff] [blame] | 861 | # Git requires single quotes for paths with spaces. We need to replace |
| 862 | # them with double quotes for Windows to treat such paths as a single |
| 863 | # path. |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 864 | self.git_editor = self._GetConfig('core.editor').replace('\'', '"') |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 865 | return self.git_editor or None |
| 866 | |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 867 | def GetLintRegex(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 868 | return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 869 | |
| 870 | def GetLintIgnoreRegex(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 871 | return self._GetConfig( |
| 872 | 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 873 | |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 874 | def GetFormatFullByDefault(self): |
| 875 | if self.format_full_by_default is None: |
Jamie Madill | ac6f623 | 2021-07-07 20:54:08 +0000 | [diff] [blame] | 876 | self._LazyUpdateIfNeeded() |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 877 | result = ( |
| 878 | RunGit(['config', '--bool', 'rietveld.format-full-by-default'], |
| 879 | error_ok=True).strip()) |
| 880 | self.format_full_by_default = (result == 'true') |
| 881 | return self.format_full_by_default |
| 882 | |
Sigurd Schneider | 1bfda8e | 2021-06-30 14:46:25 +0000 | [diff] [blame] | 883 | def IsStatusCommitOrderByDate(self): |
| 884 | if self.is_status_commit_order_by_date is None: |
| 885 | result = (RunGit(['config', '--bool', 'cl.date-order'], |
| 886 | error_ok=True).strip()) |
| 887 | self.is_status_commit_order_by_date = (result == 'true') |
| 888 | return self.is_status_commit_order_by_date |
| 889 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 890 | def _GetConfig(self, key, default=''): |
| 891 | self._LazyUpdateIfNeeded() |
| 892 | return scm.GIT.GetConfig(self.GetRoot(), key, default) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 893 | |
| 894 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 895 | class _CQState(object): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 896 | """Enum for states of CL with respect to CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 897 | NONE = 'none' |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 898 | QUICK_RUN = 'quick_run' |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 899 | DRY_RUN = 'dry_run' |
| 900 | COMMIT = 'commit' |
| 901 | |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 902 | ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT] |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 903 | |
| 904 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 905 | class _ParsedIssueNumberArgument(object): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 906 | def __init__(self, issue=None, patchset=None, hostname=None): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 907 | self.issue = issue |
| 908 | self.patchset = patchset |
| 909 | self.hostname = hostname |
| 910 | |
| 911 | @property |
| 912 | def valid(self): |
| 913 | return self.issue is not None |
| 914 | |
| 915 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 916 | def ParseIssueNumberArgument(arg): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 917 | """Parses the issue argument and returns _ParsedIssueNumberArgument.""" |
| 918 | fail_result = _ParsedIssueNumberArgument() |
| 919 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 920 | if isinstance(arg, int): |
| 921 | return _ParsedIssueNumberArgument(issue=arg) |
| 922 | if not isinstance(arg, basestring): |
| 923 | return fail_result |
| 924 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 925 | if arg.isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 926 | return _ParsedIssueNumberArgument(issue=int(arg)) |
Aaron Gable | aee6c85 | 2017-06-26 12:49:01 -0700 | [diff] [blame] | 927 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 928 | url = gclient_utils.UpgradeToHttps(arg) |
Alex Turner | 30ae637 | 2022-01-04 02:32:52 +0000 | [diff] [blame] | 929 | if not url.startswith('http'): |
| 930 | return fail_result |
Andrii Shyshkalov | 8aebb60 | 2020-04-16 22:10:27 +0000 | [diff] [blame] | 931 | for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items(): |
| 932 | if url.startswith(short_url): |
| 933 | url = gerrit_url + url[len(short_url):] |
| 934 | break |
| 935 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 936 | try: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 937 | parsed_url = urllib.parse.urlparse(url) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 938 | except ValueError: |
| 939 | return fail_result |
Andrii Shyshkalov | 28d840e | 2017-04-10 15:45:09 +0200 | [diff] [blame] | 940 | |
Alex Turner | 30ae637 | 2022-01-04 02:32:52 +0000 | [diff] [blame] | 941 | # If "https://" was automatically added, fail if `arg` looks unlikely to be a |
| 942 | # URL. |
| 943 | if not arg.startswith('http') and '.' not in parsed_url.netloc: |
| 944 | return fail_result |
| 945 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 946 | # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]] |
| 947 | # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]] |
| 948 | # Short urls like https://domain/<issue_number> can be used, but don't allow |
| 949 | # specifying the patchset (you'd 404), but we allow that here. |
| 950 | if parsed_url.path == '/': |
| 951 | part = parsed_url.fragment |
| 952 | else: |
| 953 | part = parsed_url.path |
| 954 | |
| 955 | match = re.match( |
| 956 | r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part) |
| 957 | if not match: |
| 958 | return fail_result |
| 959 | |
| 960 | issue = int(match.group('issue')) |
| 961 | patchset = match.group('patchset') |
| 962 | return _ParsedIssueNumberArgument( |
| 963 | issue=issue, |
| 964 | patchset=int(patchset) if patchset else None, |
| 965 | hostname=parsed_url.netloc) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 966 | |
| 967 | |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 968 | def _create_description_from_log(args): |
| 969 | """Pulls out the commit log to use as a base for the CL description.""" |
| 970 | log_args = [] |
Bruce Dawson | 13acea3 | 2022-05-03 22:13:08 +0000 | [diff] [blame] | 971 | if len(args) == 1 and args[0] == None: |
| 972 | # Handle the case where None is passed as the branch. |
| 973 | return '' |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 974 | if len(args) == 1 and not args[0].endswith('.'): |
| 975 | log_args = [args[0] + '..'] |
| 976 | elif len(args) == 1 and args[0].endswith('...'): |
| 977 | log_args = [args[0][:-1]] |
| 978 | elif len(args) == 2: |
| 979 | log_args = [args[0] + '..' + args[1]] |
| 980 | else: |
| 981 | log_args = args[:] # Hope for the best! |
Manh Nguyen | e364486 | 2020-08-05 18:25:46 +0000 | [diff] [blame] | 982 | return RunGit(['log', '--pretty=format:%B%n'] + log_args) |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 983 | |
| 984 | |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 985 | class GerritChangeNotExists(Exception): |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 986 | def __init__(self, issue, url): |
| 987 | self.issue = issue |
| 988 | self.url = url |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 989 | super(GerritChangeNotExists, self).__init__() |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 990 | |
| 991 | def __str__(self): |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 992 | 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] | 993 | self.issue, self.url) |
| 994 | |
| 995 | |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 996 | _CommentSummary = collections.namedtuple( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 997 | '_CommentSummary', ['date', 'message', 'sender', 'autogenerated', |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 998 | # TODO(tandrii): these two aren't known in Gerrit. |
| 999 | 'approval', 'disapproval']) |
| 1000 | |
| 1001 | |
Joanna Wang | e852391 | 2023-01-21 02:05:40 +0000 | [diff] [blame] | 1002 | _NewUpload = collections.namedtuple('NewUpload', [ |
| 1003 | 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', |
| 1004 | 'change_desc' |
| 1005 | ]) |
| 1006 | |
| 1007 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1008 | class Changelist(object): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1009 | """Changelist works with one changelist in local branch. |
| 1010 | |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 1011 | Notes: |
| 1012 | * Not safe for concurrent multi-{thread,process} use. |
| 1013 | * Caches values from current branch. Therefore, re-use after branch change |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1014 | with great care. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1015 | """ |
| 1016 | |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 1017 | def __init__(self, |
| 1018 | branchref=None, |
| 1019 | issue=None, |
| 1020 | codereview_host=None, |
| 1021 | commit_date=None): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1022 | """Create a new ChangeList instance. |
| 1023 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1024 | **kwargs will be passed directly to Gerrit implementation. |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1025 | """ |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1026 | # 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] | 1027 | global settings |
| 1028 | if not settings: |
| 1029 | # Happens when git_cl.py is used as a utility library. |
| 1030 | settings = Settings() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1031 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1032 | self.branchref = branchref |
| 1033 | if self.branchref: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 1034 | assert branchref.startswith('refs/heads/') |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1035 | self.branch = scm.GIT.ShortBranchName(self.branchref) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1036 | else: |
| 1037 | self.branch = None |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 1038 | self.commit_date = commit_date |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1039 | self.upstream_branch = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1040 | self.lookedup_issue = False |
| 1041 | self.issue = issue or None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1042 | self.description = None |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1043 | self.lookedup_patchset = False |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1044 | self.patchset = None |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1045 | self.cc = None |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1046 | self.more_cc = [] |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1047 | self._remote = None |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1048 | self._cached_remote_url = (False, None) # (is_cached, value) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 1049 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1050 | # Lazily cached values. |
| 1051 | self._gerrit_host = None # e.g. chromium-review.googlesource.com |
| 1052 | self._gerrit_server = None # e.g. https://chromium-review.googlesource.com |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1053 | self._owners_client = None |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1054 | # Map from change number (issue) to its detail cache. |
| 1055 | self._detail_cache = {} |
| 1056 | |
| 1057 | if codereview_host is not None: |
| 1058 | assert not codereview_host.startswith('https://'), codereview_host |
| 1059 | self._gerrit_host = codereview_host |
| 1060 | self._gerrit_server = 'https://%s' % codereview_host |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1061 | |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1062 | @property |
| 1063 | def owners_client(self): |
| 1064 | if self._owners_client is None: |
| 1065 | remote, remote_branch = self.GetRemoteBranch() |
| 1066 | branch = GetTargetRef(remote, remote_branch, None) |
| 1067 | self._owners_client = owners_client.GetCodeOwnersClient( |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1068 | host=self.GetGerritHost(), |
| 1069 | project=self.GetGerritProject(), |
| 1070 | branch=branch) |
| 1071 | return self._owners_client |
| 1072 | |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1073 | def GetCCList(self): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1074 | """Returns the users cc'd on this CL. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1075 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1076 | The return value is a string suitable for passing to git cl with the --cc |
| 1077 | flag. |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1078 | """ |
| 1079 | if self.cc is None: |
Joanna Wang | c8f23e2 | 2023-01-19 21:18:10 +0000 | [diff] [blame] | 1080 | base_cc = settings.GetDefaultCCList() |
| 1081 | more_cc = ','.join(self.more_cc) |
| 1082 | self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' |
bauerb@chromium.org | ae6df35 | 2011-04-06 17:40:39 +0000 | [diff] [blame] | 1083 | return self.cc |
| 1084 | |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1085 | def ExtendCC(self, more_cc): |
| 1086 | """Extends the list of users to cc on this CL based on the changed files.""" |
| 1087 | self.more_cc.extend(more_cc) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1088 | |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 1089 | def GetCommitDate(self): |
| 1090 | """Returns the commit date as provided in the constructor""" |
| 1091 | return self.commit_date |
| 1092 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1093 | def GetBranch(self): |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 1094 | """Returns the short branch name, e.g. 'main'.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1095 | if not self.branch: |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1096 | branchref = scm.GIT.GetBranchRef(settings.GetRoot()) |
szager@chromium.org | d62c61f | 2014-10-20 22:33:21 +0000 | [diff] [blame] | 1097 | if not branchref: |
| 1098 | return None |
| 1099 | self.branchref = branchref |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1100 | self.branch = scm.GIT.ShortBranchName(self.branchref) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1101 | return self.branch |
| 1102 | |
| 1103 | def GetBranchRef(self): |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 1104 | """Returns the full branch name, e.g. 'refs/heads/main'.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1105 | self.GetBranch() # Poke the lazy loader. |
| 1106 | return self.branchref |
| 1107 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1108 | def _GitGetBranchConfigValue(self, key, default=None): |
| 1109 | return scm.GIT.GetBranchConfig( |
| 1110 | settings.GetRoot(), self.GetBranch(), key, default) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1111 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1112 | def _GitSetBranchConfigValue(self, key, value): |
| 1113 | action = 'set %s to %r' % (key, value) |
| 1114 | if not value: |
| 1115 | action = 'unset %s' % key |
| 1116 | assert self.GetBranch(), 'a branch is needed to ' + action |
| 1117 | return scm.GIT.SetBranchConfig( |
| 1118 | settings.GetRoot(), self.GetBranch(), key, value) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1119 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1120 | @staticmethod |
| 1121 | def FetchUpstreamTuple(branch): |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1122 | """Returns a tuple containing remote and remote ref, |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 1123 | e.g. 'origin', 'refs/heads/main' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1124 | """ |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 1125 | remote, upstream_branch = scm.GIT.FetchUpstreamTuple( |
| 1126 | settings.GetRoot(), branch) |
| 1127 | if not remote or not upstream_branch: |
| 1128 | DieWithError( |
| 1129 | 'Unable to determine default branch to diff against.\n' |
Josip Sokcevic | b038f72 | 2021-01-06 18:28:11 +0000 | [diff] [blame] | 1130 | 'Verify this branch is set up to track another \n' |
| 1131 | '(via the --track argument to "git checkout -b ..."). \n' |
| 1132 | 'or pass complete "git diff"-style arguments if supported, like\n' |
| 1133 | ' git cl upload origin/main\n') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1134 | |
| 1135 | return remote, upstream_branch |
| 1136 | |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1137 | def GetCommonAncestorWithUpstream(self): |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1138 | upstream_branch = self.GetUpstreamBranch() |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1139 | if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch): |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1140 | DieWithError('The upstream for the current branch (%s) does not exist ' |
| 1141 | 'anymore.\nPlease fix it and try again.' % self.GetBranch()) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 1142 | return git_common.get_or_create_merge_base(self.GetBranch(), |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 1143 | upstream_branch) |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 1144 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1145 | def GetUpstreamBranch(self): |
| 1146 | if self.upstream_branch is None: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1147 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Raul Tambre | fe1dbe1 | 2019-05-02 04:43:57 +0000 | [diff] [blame] | 1148 | if remote != '.': |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1149 | upstream_branch = upstream_branch.replace('refs/heads/', |
| 1150 | 'refs/remotes/%s/' % remote) |
| 1151 | upstream_branch = upstream_branch.replace('refs/branch-heads/', |
| 1152 | 'refs/remotes/branch-heads/') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1153 | self.upstream_branch = upstream_branch |
| 1154 | return self.upstream_branch |
| 1155 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1156 | def GetRemoteBranch(self): |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1157 | if not self._remote: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1158 | remote, branch = None, self.GetBranch() |
| 1159 | seen_branches = set() |
| 1160 | while branch not in seen_branches: |
| 1161 | seen_branches.add(branch) |
| 1162 | remote, branch = self.FetchUpstreamTuple(branch) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1163 | branch = scm.GIT.ShortBranchName(branch) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1164 | if remote != '.' or branch.startswith('refs/remotes'): |
| 1165 | break |
| 1166 | else: |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1167 | remotes = RunGit(['remote'], error_ok=True).split() |
| 1168 | if len(remotes) == 1: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1169 | remote, = remotes |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1170 | elif 'origin' in remotes: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1171 | remote = 'origin' |
Gavin Mak | e6a6233 | 2020-12-04 21:57:10 +0000 | [diff] [blame] | 1172 | logging.warning('Could not determine which remote this change is ' |
| 1173 | 'associated with, so defaulting to "%s".' % |
| 1174 | self._remote) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1175 | else: |
Gavin Mak | e6a6233 | 2020-12-04 21:57:10 +0000 | [diff] [blame] | 1176 | logging.warning('Could not determine which remote this change is ' |
| 1177 | 'associated with.') |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1178 | branch = 'HEAD' |
| 1179 | if branch.startswith('refs/remotes'): |
| 1180 | self._remote = (remote, branch) |
mmoss@chromium.org | e758545 | 2014-08-24 01:41:11 +0000 | [diff] [blame] | 1181 | elif branch.startswith('refs/branch-heads/'): |
| 1182 | self._remote = (remote, branch.replace('refs/', 'refs/remotes/')) |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1183 | else: |
| 1184 | self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch)) |
jmbaker@chromium.org | a2cbbbb | 2012-03-22 20:40:40 +0000 | [diff] [blame] | 1185 | return self._remote |
| 1186 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1187 | def GetRemoteUrl(self): |
| 1188 | """Return the configured remote URL, e.g. 'git://example.org/foo.git/'. |
| 1189 | |
| 1190 | Returns None if there is no remote. |
| 1191 | """ |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1192 | is_cached, value = self._cached_remote_url |
| 1193 | if is_cached: |
| 1194 | return value |
| 1195 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1196 | remote, _ = self.GetRemoteBranch() |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1197 | url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '') |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1198 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1199 | # Check if the remote url can be parsed as an URL. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1200 | host = urllib.parse.urlparse(url).netloc |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1201 | if host: |
| 1202 | self._cached_remote_url = (True, url) |
| 1203 | return url |
| 1204 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1205 | # If it cannot be parsed as an url, assume it is a local directory, |
| 1206 | # probably a git cache. |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1207 | logging.warning('"%s" doesn\'t appear to point to a git host. ' |
| 1208 | 'Interpreting it as a local directory.', url) |
| 1209 | if not os.path.isdir(url): |
| 1210 | logging.error( |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1211 | 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", ' |
| 1212 | 'but it doesn\'t exist.', |
| 1213 | {'remote': remote, 'branch': self.GetBranch(), 'url': url}) |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1214 | return None |
| 1215 | |
| 1216 | cache_path = url |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1217 | url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '') |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1218 | |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1219 | host = urllib.parse.urlparse(url).netloc |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1220 | if not host: |
| 1221 | logging.error( |
| 1222 | 'Remote "%(remote)s" for branch "%(branch)s" points to ' |
| 1223 | '"%(cache_path)s", but it is misconfigured.\n' |
| 1224 | '"%(cache_path)s" must be a git repo and must have a remote named ' |
| 1225 | '"%(remote)s" pointing to the git host.', { |
| 1226 | 'remote': remote, |
| 1227 | 'cache_path': cache_path, |
| 1228 | 'branch': self.GetBranch()}) |
| 1229 | return None |
| 1230 | |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1231 | self._cached_remote_url = (True, url) |
dyen@chromium.org | 2a13d4f | 2014-06-13 00:06:37 +0000 | [diff] [blame] | 1232 | return url |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1233 | |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 1234 | def GetIssue(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1235 | """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] | 1236 | if self.issue is None and not self.lookedup_issue: |
Bruce Dawson | 13acea3 | 2022-05-03 22:13:08 +0000 | [diff] [blame] | 1237 | if self.GetBranch(): |
| 1238 | self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1239 | if self.issue is not None: |
| 1240 | self.issue = int(self.issue) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1241 | self.lookedup_issue = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1242 | return self.issue |
| 1243 | |
Andrii Shyshkalov | 1ee78cd | 2020-03-12 01:31:53 +0000 | [diff] [blame] | 1244 | def GetIssueURL(self, short=False): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1245 | """Get the URL for a particular issue.""" |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1246 | issue = self.GetIssue() |
| 1247 | if not issue: |
dbeam@chromium.org | 015fd3d | 2013-06-18 19:02:50 +0000 | [diff] [blame] | 1248 | return None |
Andrii Shyshkalov | 1ee78cd | 2020-03-12 01:31:53 +0000 | [diff] [blame] | 1249 | server = self.GetCodereviewServer() |
| 1250 | if short: |
| 1251 | server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server) |
| 1252 | return '%s/%s' % (server, issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1253 | |
Dirk Pranke | 6f0df68 | 2021-06-25 00:42:33 +0000 | [diff] [blame] | 1254 | def GetUsePython3(self): |
Josip Sokcevic | 340edc3 | 2021-07-08 17:01:46 +0000 | [diff] [blame] | 1255 | return settings.GetUsePython3() |
Dirk Pranke | 6f0df68 | 2021-06-25 00:42:33 +0000 | [diff] [blame] | 1256 | |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1257 | def FetchDescription(self, pretty=False): |
| 1258 | assert self.GetIssue(), 'issue is required to query Gerrit' |
| 1259 | |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 1260 | if self.description is None: |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1261 | data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT']) |
| 1262 | current_rev = data['current_revision'] |
| 1263 | self.description = data['revisions'][current_rev]['commit']['message'] |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1264 | |
| 1265 | if not pretty: |
| 1266 | return self.description |
| 1267 | |
| 1268 | # Set width to 72 columns + 2 space indent. |
| 1269 | wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True) |
| 1270 | wrapper.initial_indent = wrapper.subsequent_indent = ' ' |
| 1271 | lines = self.description.splitlines() |
| 1272 | return '\n'.join([wrapper.fill(line) for line in lines]) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1273 | |
| 1274 | def GetPatchset(self): |
maruel@chromium.org | 5242430 | 2012-08-29 15:14:30 +0000 | [diff] [blame] | 1275 | """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] | 1276 | if self.patchset is None and not self.lookedup_patchset: |
Bruce Dawson | 13acea3 | 2022-05-03 22:13:08 +0000 | [diff] [blame] | 1277 | if self.GetBranch(): |
| 1278 | self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1279 | if self.patchset is not None: |
| 1280 | self.patchset = int(self.patchset) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1281 | self.lookedup_patchset = True |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1282 | return self.patchset |
| 1283 | |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 1284 | def GetAuthor(self): |
| 1285 | return scm.GIT.GetConfig(settings.GetRoot(), 'user.email') |
| 1286 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1287 | def SetPatchset(self, patchset): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1288 | """Set this branch's patchset. If patchset=0, clears the patchset.""" |
| 1289 | assert self.GetBranch() |
| 1290 | if not patchset: |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1291 | self.patchset = None |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1292 | else: |
| 1293 | self.patchset = int(patchset) |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1294 | self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1295 | |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 1296 | def SetIssue(self, issue=None): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1297 | """Set this branch's issue. If issue isn't given, clears the issue.""" |
| 1298 | assert self.GetBranch() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1299 | if issue: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1300 | issue = int(issue) |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1301 | self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue)) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1302 | self.issue = issue |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1303 | codereview_server = self.GetCodereviewServer() |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1304 | if codereview_server: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1305 | self._GitSetBranchConfigValue( |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1306 | CODEREVIEW_SERVER_CONFIG_KEY, codereview_server) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1307 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1308 | # Reset all of these just to be clean. |
| 1309 | reset_suffixes = [ |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 1310 | LAST_UPLOAD_HASH_CONFIG_KEY, |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1311 | ISSUE_CONFIG_KEY, |
| 1312 | PATCHSET_CONFIG_KEY, |
| 1313 | CODEREVIEW_SERVER_CONFIG_KEY, |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 1314 | GERRIT_SQUASH_HASH_CONFIG_KEY, |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1315 | ] |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1316 | for prop in reset_suffixes: |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1317 | try: |
| 1318 | self._GitSetBranchConfigValue(prop, None) |
| 1319 | except subprocess2.CalledProcessError: |
| 1320 | pass |
Aaron Gable | ca01e2c | 2017-07-19 11:16:02 -0700 | [diff] [blame] | 1321 | msg = RunGit(['log', '-1', '--format=%B']).strip() |
| 1322 | if msg and git_footers.get_footer_change_id(msg): |
| 1323 | print('WARNING: The change patched into this branch has a Change-Id. ' |
| 1324 | 'Removing it.') |
| 1325 | RunGit(['commit', '--amend', '-m', |
| 1326 | git_footers.remove_footer(msg, 'Change-Id')]) |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1327 | self.lookedup_issue = True |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 1328 | self.issue = None |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1329 | self.patchset = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 1330 | |
Joanna Wang | b46232e | 2023-01-21 01:58:46 +0000 | [diff] [blame] | 1331 | def GetAffectedFiles(self, upstream, end_commit=None): |
| 1332 | # type: (str, Optional[str]) -> Sequence[str] |
| 1333 | """Returns the list of affected files for the given commit range.""" |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1334 | try: |
Joanna Wang | b46232e | 2023-01-21 01:58:46 +0000 | [diff] [blame] | 1335 | return [ |
| 1336 | f for _, f in scm.GIT.CaptureStatus( |
| 1337 | settings.GetRoot(), upstream, end_commit=end_commit) |
| 1338 | ] |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1339 | except subprocess2.CalledProcessError: |
| 1340 | DieWithError( |
pgervais@chromium.org | d6617f3 | 2013-11-19 00:34:54 +0000 | [diff] [blame] | 1341 | ('\nFailed to diff against upstream branch %s\n\n' |
maruel@chromium.org | 2b38e9c | 2011-10-19 00:04:35 +0000 | [diff] [blame] | 1342 | 'This branch probably doesn\'t exist anymore. To reset the\n' |
| 1343 | 'tracking branch, please run\n' |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 1344 | ' git branch --set-upstream-to origin/main %s\n' |
| 1345 | 'or replace origin/main with the relevant branch') % |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 1346 | (upstream, self.GetBranch())) |
bauerb@chromium.org | 6fb99c6 | 2011-04-18 15:57:28 +0000 | [diff] [blame] | 1347 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 1348 | def UpdateDescription(self, description, force=False): |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1349 | assert self.GetIssue(), 'issue is required to update description' |
| 1350 | |
| 1351 | if gerrit_util.HasPendingChangeEdit( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1352 | self.GetGerritHost(), self._GerritChangeIdentifier()): |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1353 | if not force: |
| 1354 | confirm_or_exit( |
| 1355 | 'The description cannot be modified while the issue has a pending ' |
| 1356 | 'unpublished edit. Either publish the edit in the Gerrit web UI ' |
| 1357 | 'or delete it.\n\n', action='delete the unpublished edit') |
| 1358 | |
| 1359 | gerrit_util.DeletePendingChangeEdit( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1360 | self.GetGerritHost(), self._GerritChangeIdentifier()) |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1361 | gerrit_util.SetCommitMessage( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1362 | self.GetGerritHost(), self._GerritChangeIdentifier(), |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1363 | description, notify='NONE') |
| 1364 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1365 | self.description = description |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1366 | |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1367 | def _GetCommonPresubmitArgs(self, verbose, upstream): |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1368 | args = [ |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1369 | '--root', settings.GetRoot(), |
| 1370 | '--upstream', upstream, |
| 1371 | ] |
| 1372 | |
| 1373 | args.extend(['--verbose'] * verbose) |
| 1374 | |
Edward Lesmes | eb1bd62 | 2021-03-01 19:54:07 +0000 | [diff] [blame] | 1375 | remote, remote_branch = self.GetRemoteBranch() |
| 1376 | target_ref = GetTargetRef(remote, remote_branch, None) |
Aleksey Khoroshilov | 35ef5ad | 2022-06-03 18:29:25 +0000 | [diff] [blame] | 1377 | if settings.GetIsGerrit(): |
| 1378 | args.extend(['--gerrit_url', self.GetCodereviewServer()]) |
| 1379 | args.extend(['--gerrit_project', self.GetGerritProject()]) |
| 1380 | args.extend(['--gerrit_branch', target_ref]) |
Edward Lesmes | eb1bd62 | 2021-03-01 19:54:07 +0000 | [diff] [blame] | 1381 | |
Edward Lemur | 99df04e | 2020-03-05 19:39:43 +0000 | [diff] [blame] | 1382 | author = self.GetAuthor() |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1383 | issue = self.GetIssue() |
| 1384 | patchset = self.GetPatchset() |
Edward Lemur | 99df04e | 2020-03-05 19:39:43 +0000 | [diff] [blame] | 1385 | if author: |
| 1386 | args.extend(['--author', author]) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1387 | if issue: |
| 1388 | args.extend(['--issue', str(issue)]) |
| 1389 | if patchset: |
| 1390 | args.extend(['--patchset', str(patchset)]) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1391 | |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1392 | return args |
| 1393 | |
Josip Sokcevic | 017544d | 2022-03-31 23:47:53 +0000 | [diff] [blame] | 1394 | def RunHook(self, |
| 1395 | committing, |
| 1396 | may_prompt, |
| 1397 | verbose, |
| 1398 | parallel, |
| 1399 | upstream, |
| 1400 | description, |
| 1401 | all_files, |
| 1402 | files=None, |
| 1403 | resultdb=False, |
| 1404 | realm=None): |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1405 | """Calls sys.exit() if the hook fails; returns a HookResults otherwise.""" |
| 1406 | args = self._GetCommonPresubmitArgs(verbose, upstream) |
| 1407 | args.append('--commit' if committing else '--upload') |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1408 | if may_prompt: |
| 1409 | args.append('--may_prompt') |
| 1410 | if parallel: |
| 1411 | args.append('--parallel') |
| 1412 | if all_files: |
| 1413 | args.append('--all_files') |
Josip Sokcevic | 017544d | 2022-03-31 23:47:53 +0000 | [diff] [blame] | 1414 | if files: |
| 1415 | args.extend(files.split(';')) |
| 1416 | args.append('--source_controlled_only') |
Bruce Dawson | 09c0c07 | 2022-05-26 20:28:58 +0000 | [diff] [blame] | 1417 | if files or all_files: |
| 1418 | args.append('--no_diffs') |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1419 | |
Dirk Pranke | 61bf6e8 | 2021-04-23 00:50:21 +0000 | [diff] [blame] | 1420 | if resultdb and not realm: |
| 1421 | # TODO (crbug.com/1113463): store realm somewhere and look it up so |
| 1422 | # it is not required to pass the realm flag |
| 1423 | print('Note: ResultDB reporting will NOT be performed because --realm' |
| 1424 | ' was not specified. To enable ResultDB, please run the command' |
| 1425 | ' again with the --realm argument to specify the LUCI realm.') |
| 1426 | |
Dirk Pranke | 61bf6e8 | 2021-04-23 00:50:21 +0000 | [diff] [blame] | 1427 | py3_results = self._RunPresubmit(args, resultdb, realm, description, |
| 1428 | use_python3=True) |
Josip Sokcevic | 632bbc0 | 2022-05-19 05:32:50 +0000 | [diff] [blame] | 1429 | if py3_results.get('skipped_presubmits', 1) == 0: |
| 1430 | print('No more presubmits to run - skipping Python 2 presubmits.') |
| 1431 | return py3_results |
| 1432 | |
| 1433 | py2_results = self._RunPresubmit(args, resultdb, realm, description, |
| 1434 | use_python3=False) |
Dirk Pranke | 61bf6e8 | 2021-04-23 00:50:21 +0000 | [diff] [blame] | 1435 | return self._MergePresubmitResults(py2_results, py3_results) |
| 1436 | |
| 1437 | def _RunPresubmit(self, args, resultdb, realm, description, use_python3): |
| 1438 | args = args[:] |
| 1439 | vpython = 'vpython3' if use_python3 else 'vpython' |
| 1440 | |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1441 | with gclient_utils.temporary_file() as description_file: |
| 1442 | with gclient_utils.temporary_file() as json_output: |
Edward Lemur | 1a83da1 | 2020-03-04 21:18:36 +0000 | [diff] [blame] | 1443 | gclient_utils.FileWrite(description_file, description) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1444 | args.extend(['--json_output', json_output]) |
| 1445 | args.extend(['--description_file', description_file]) |
Dirk Pranke | 6f0df68 | 2021-06-25 00:42:33 +0000 | [diff] [blame] | 1446 | if self.GetUsePython3(): |
| 1447 | args.append('--use-python3') |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1448 | start = time_time() |
Dirk Pranke | 61bf6e8 | 2021-04-23 00:50:21 +0000 | [diff] [blame] | 1449 | cmd = [vpython, PRESUBMIT_SUPPORT] + args |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 1450 | if resultdb and realm: |
| 1451 | cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 1452 | |
| 1453 | p = subprocess2.Popen(cmd) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1454 | exit_code = p.wait() |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 1455 | |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1456 | metrics.collector.add_repeated('sub_commands', { |
| 1457 | 'command': 'presubmit', |
| 1458 | 'execution_time': time_time() - start, |
| 1459 | 'exit_code': exit_code, |
| 1460 | }) |
| 1461 | |
| 1462 | if exit_code: |
| 1463 | sys.exit(exit_code) |
| 1464 | |
| 1465 | json_results = gclient_utils.FileRead(json_output) |
| 1466 | return json.loads(json_results) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1467 | |
Dirk Pranke | 61bf6e8 | 2021-04-23 00:50:21 +0000 | [diff] [blame] | 1468 | def _MergePresubmitResults(self, py2_results, py3_results): |
| 1469 | return { |
| 1470 | 'more_cc': sorted(set(py2_results.get('more_cc', []) + |
| 1471 | py3_results.get('more_cc', []))), |
| 1472 | 'errors': ( |
| 1473 | py2_results.get('errors', []) + py3_results.get('errors', [])), |
| 1474 | 'notifications': ( |
| 1475 | py2_results.get('notifications', []) + |
| 1476 | py3_results.get('notifications', [])), |
| 1477 | 'warnings': ( |
| 1478 | py2_results.get('warnings', []) + py3_results.get('warnings', [])) |
| 1479 | } |
| 1480 | |
Brian Sheedy | 7326ca2 | 2022-11-02 18:36:17 +0000 | [diff] [blame] | 1481 | def RunPostUploadHook(self, verbose, upstream, description, py3_only): |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1482 | args = self._GetCommonPresubmitArgs(verbose, upstream) |
| 1483 | args.append('--post_upload') |
| 1484 | |
| 1485 | with gclient_utils.temporary_file() as description_file: |
Edward Lemur | 1a83da1 | 2020-03-04 21:18:36 +0000 | [diff] [blame] | 1486 | gclient_utils.FileWrite(description_file, description) |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1487 | args.extend(['--description_file', description_file]) |
Brian Sheedy | 7326ca2 | 2022-11-02 18:36:17 +0000 | [diff] [blame] | 1488 | if not py3_only: |
| 1489 | p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args) |
Josip Sokcevic | e293d3d | 2022-02-16 22:52:15 +0000 | [diff] [blame] | 1490 | p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args + |
| 1491 | ['--use-python3']) |
Brian Sheedy | 7326ca2 | 2022-11-02 18:36:17 +0000 | [diff] [blame] | 1492 | if not py3_only: |
| 1493 | p_py2.wait() |
Josip Sokcevic | e293d3d | 2022-02-16 22:52:15 +0000 | [diff] [blame] | 1494 | p_py3.wait() |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 1495 | |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1496 | def _GetDescriptionForUpload(self, options, git_diff_args, files): |
Joanna Wang | b46232e | 2023-01-21 01:58:46 +0000 | [diff] [blame] | 1497 | # type: (optparse.Values, Sequence[str], Sequence[str] |
| 1498 | # ) -> ChangeDescription |
| 1499 | """Get description message for upload.""" |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1500 | if self.GetIssue(): |
| 1501 | description = self.FetchDescription() |
| 1502 | elif options.message: |
| 1503 | description = options.message |
| 1504 | else: |
| 1505 | description = _create_description_from_log(git_diff_args) |
| 1506 | if options.title and options.squash: |
Edward Lesmes | 0dd5482 | 2020-03-26 18:24:25 +0000 | [diff] [blame] | 1507 | description = options.title + '\n\n' + description |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1508 | |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1509 | bug = options.bug |
| 1510 | fixed = options.fixed |
Josip Sokcevic | 340edc3 | 2021-07-08 17:01:46 +0000 | [diff] [blame] | 1511 | if not self.GetIssue(): |
| 1512 | # Extract bug number from branch name, but only if issue is being created. |
| 1513 | # It must start with bug or fix, followed by _ or - and number. |
| 1514 | # Optionally, it may contain _ or - after number with arbitrary text. |
| 1515 | # Examples: |
| 1516 | # bug-123 |
| 1517 | # bug_123 |
| 1518 | # fix-123 |
| 1519 | # fix-123-some-description |
mlcui | 7a0b4cb | 2023-01-23 23:14:55 +0000 | [diff] [blame] | 1520 | branch = self.GetBranch() |
| 1521 | if branch is not None: |
| 1522 | match = re.match( |
| 1523 | r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch) |
| 1524 | if not bug and not fixed and match: |
| 1525 | if match.group('type') == 'bug': |
| 1526 | bug = match.group('bugnum') |
| 1527 | else: |
| 1528 | fixed = match.group('bugnum') |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1529 | |
| 1530 | change_description = ChangeDescription(description, bug, fixed) |
| 1531 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 1532 | # Fill gaps in OWNERS coverage to reviewers if requested. |
Edward Lesmes | 8c43c3f | 2021-01-20 00:20:26 +0000 | [diff] [blame] | 1533 | if options.add_owners_to: |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 1534 | assert options.add_owners_to in ('R'), options.add_owners_to |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1535 | status = self.owners_client.GetFilesApprovalStatus( |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 1536 | files, [], options.reviewers) |
Edward Lesmes | 8c43c3f | 2021-01-20 00:20:26 +0000 | [diff] [blame] | 1537 | missing_files = [ |
| 1538 | f for f in files |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1539 | if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS |
Edward Lesmes | 8c43c3f | 2021-01-20 00:20:26 +0000 | [diff] [blame] | 1540 | ] |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 1541 | owners = self.owners_client.SuggestOwners( |
| 1542 | missing_files, exclude=[self.GetAuthor()]) |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 1543 | assert isinstance(options.reviewers, list), options.reviewers |
| 1544 | options.reviewers.extend(owners) |
Edward Lesmes | 8c43c3f | 2021-01-20 00:20:26 +0000 | [diff] [blame] | 1545 | |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1546 | # Set the reviewer list now so that presubmit checks can access it. |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 1547 | if options.reviewers: |
| 1548 | change_description.update_reviewers(options.reviewers) |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1549 | |
| 1550 | return change_description |
| 1551 | |
| 1552 | def _GetTitleForUpload(self, options): |
manukh | 566e9d0 | 2022-06-30 19:49:53 +0000 | [diff] [blame] | 1553 | # When not squashing or options.title is provided, just return |
| 1554 | # options.title. |
| 1555 | if not options.squash or options.title: |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1556 | return options.title |
| 1557 | |
| 1558 | # On first upload, patchset title is always this string, while options.title |
| 1559 | # gets converted to first line of message. |
| 1560 | if not self.GetIssue(): |
| 1561 | return 'Initial upload' |
| 1562 | |
| 1563 | # When uploading subsequent patchsets, options.message is taken as the title |
| 1564 | # if options.title is not provided. |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1565 | if options.message: |
| 1566 | return options.message.strip() |
| 1567 | |
| 1568 | # Use the subject of the last commit as title by default. |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1569 | title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip() |
Mario Bianucci | cebfb4e | 2020-07-22 23:08:16 +0000 | [diff] [blame] | 1570 | if options.force or options.skip_title: |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1571 | return title |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 1572 | user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title) |
mlcui | 3da9171 | 2021-05-05 10:00:30 +0000 | [diff] [blame] | 1573 | |
| 1574 | # Use the default title if the user confirms the default with a 'y'. |
| 1575 | if user_title.lower() == 'y': |
| 1576 | return title |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 1577 | return user_title or title |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1578 | |
Joanna Wang | b88a434 | 2023-01-24 01:28:22 +0000 | [diff] [blame^] | 1579 | def PrepareSquashedCommit(self, options, parent=None, end_commit=None): |
| 1580 | # type: (optparse.Values, Optional[str], Optional[str]) -> _NewUpload() |
| 1581 | """Create a squashed commit to upload.""" |
| 1582 | if parent is None: |
| 1583 | origin, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch()) |
| 1584 | upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref) |
| 1585 | if origin == '.': |
| 1586 | # upstream is another local branch. |
| 1587 | # Assume we want to upload from upstream's last upload. |
| 1588 | parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch, |
| 1589 | GERRIT_SQUASH_HASH_CONFIG_KEY) |
| 1590 | assert parent, ('upstream branch %s not configured correctly. ' |
| 1591 | 'Could not fetch latest gerrit upload from git ' |
| 1592 | 'config.') |
| 1593 | else: |
| 1594 | # upstream is the root of the tree. |
| 1595 | parent = self.GetCommonAncestorWithUpstream() |
| 1596 | |
| 1597 | if end_commit is None: |
| 1598 | end_commit = RunGit(['rev-parse', self.branchref]).strip() |
| 1599 | |
| 1600 | reviewers, ccs, change_desc = self._PrepareChange(options, parent, |
| 1601 | end_commit) |
| 1602 | latest_tree = RunGit(['rev-parse', end_commit + ':']).strip() |
| 1603 | with gclient_utils.temporary_file() as desc_tempfile: |
| 1604 | gclient_utils.FileWrite(desc_tempfile, change_desc.description) |
| 1605 | commit_to_push = RunGit( |
| 1606 | ['commit-tree', latest_tree, '-p', parent, '-F', |
| 1607 | desc_tempfile]).strip() |
| 1608 | |
| 1609 | return _NewUpload(reviewers, ccs, commit_to_push, end_commit, change_desc) |
| 1610 | |
Joanna Wang | e852391 | 2023-01-21 02:05:40 +0000 | [diff] [blame] | 1611 | def PrepareCherryPickSquashedCommit(self, options): |
| 1612 | # type: (optparse.Values) -> _NewUpload() |
| 1613 | """Create a commit cherry-picked on parent to push.""" |
| 1614 | |
| 1615 | parent = self.GetCommonAncestorWithUpstream() |
| 1616 | reviewers, ccs, change_desc = self._PrepareChange(options, parent, |
| 1617 | self.branchref) |
| 1618 | |
| 1619 | new_upload_hash = RunGit(['rev-parse', self.branchref]).strip() |
| 1620 | latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip() |
| 1621 | with gclient_utils.temporary_file() as desc_tempfile: |
| 1622 | gclient_utils.FileWrite(desc_tempfile, change_desc.description) |
| 1623 | commit_to_cp = RunGit( |
| 1624 | ['commit-tree', latest_tree, '-p', parent, '-F', |
| 1625 | desc_tempfile]).strip() |
| 1626 | |
| 1627 | _, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch()) |
| 1628 | |
| 1629 | upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref) |
| 1630 | upstream_squashed_upload = scm.GIT.GetBranchConfig( |
| 1631 | settings.GetRoot(), upstream_branch, GERRIT_SQUASH_HASH_CONFIG_KEY) |
| 1632 | |
| 1633 | RunGit(['checkout', '-q', upstream_squashed_upload]) |
| 1634 | ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp]) |
| 1635 | if ret: |
| 1636 | RunGit(['cherry-pick', '--abort']) |
| 1637 | RunGit(['checkout', '-q', self.branch]) |
| 1638 | DieWithError('Could not cleanly cherry-pick') |
| 1639 | |
| 1640 | commit_to_push = RunGit(['rev-parse', 'HEAD']) |
| 1641 | RunGit(['checkout', '-q', self.branch]) |
| 1642 | |
| 1643 | return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash, |
| 1644 | change_desc) |
| 1645 | |
Joanna Wang | b46232e | 2023-01-21 01:58:46 +0000 | [diff] [blame] | 1646 | def _PrepareChange(self, options, parent, end_commit): |
| 1647 | # type: (optparse.Values, str, str) -> |
| 1648 | # Tuple[Sequence[str], Sequence[str], ChangeDescription] |
| 1649 | """Prepares the change to be uploaded.""" |
| 1650 | self.EnsureCanUploadPatchset(options.force) |
| 1651 | |
| 1652 | files = self.GetAffectedFiles(parent, end_commit=end_commit) |
| 1653 | change_desc = self._GetDescriptionForUpload(options, [parent, end_commit], |
| 1654 | files) |
| 1655 | |
| 1656 | watchlist = watchlists.Watchlists(settings.GetRoot()) |
| 1657 | self.ExtendCC(watchlist.GetWatchersForPaths(files)) |
| 1658 | if not options.bypass_hooks: |
| 1659 | hook_results = self.RunHook(committing=False, |
| 1660 | may_prompt=not options.force, |
| 1661 | verbose=options.verbose, |
| 1662 | parallel=options.parallel, |
| 1663 | upstream=parent, |
| 1664 | description=change_desc.description, |
| 1665 | all_files=False) |
| 1666 | self.ExtendCC(hook_results['more_cc']) |
| 1667 | |
| 1668 | # Update the change description and ensure we have a Change Id. |
| 1669 | if self.GetIssue(): |
| 1670 | if options.edit_description: |
| 1671 | change_desc.prompt() |
| 1672 | change_detail = self._GetChangeDetail(['CURRENT_REVISION']) |
| 1673 | change_id = change_detail['change_id'] |
| 1674 | change_desc.ensure_change_id(change_id) |
| 1675 | |
| 1676 | # TODO(b/265929888): Pull in external changes for the current branch |
| 1677 | # only. No clear way to pull in external changes for upstream branches |
| 1678 | # yet. Potentially offer a separate command to pull in external changes. |
| 1679 | else: # No change issue. First time uploading |
| 1680 | if not options.force and not options.message_file: |
| 1681 | change_desc.prompt() |
| 1682 | |
| 1683 | # Check if user added a change_id in the descripiton. |
| 1684 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
| 1685 | if len(change_ids) == 1: |
| 1686 | change_id = change_ids[0] |
| 1687 | else: |
| 1688 | change_id = GenerateGerritChangeId(change_desc.description) |
| 1689 | change_desc.ensure_change_id(change_id) |
| 1690 | |
| 1691 | if options.preserve_tryjobs: |
| 1692 | change_desc.set_preserve_tryjobs() |
| 1693 | |
| 1694 | SaveDescriptionBackup(change_desc) |
| 1695 | |
| 1696 | # Add ccs |
| 1697 | ccs = [] |
| 1698 | # Add default, watchlist, presubmit ccs if this is an existing change |
| 1699 | # and CL is not private and auto-ccing has not been disabled. |
| 1700 | if self.GetIssue() and not (options.private and options.no_autocc): |
| 1701 | ccs = self.GetCCList().split(',') |
| 1702 | if len(ccs) > 100: |
| 1703 | lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/' |
| 1704 | 'process/lsc/lsc_workflow.md') |
| 1705 | print('WARNING: This will auto-CC %s users.' % len(ccs)) |
| 1706 | print('LSC may be more appropriate: %s' % lsc) |
| 1707 | print('You can also use the --no-autocc flag to disable auto-CC.') |
| 1708 | confirm_or_exit(action='continue') |
| 1709 | |
| 1710 | # Add ccs from the --cc flag. |
| 1711 | if options.cc: |
| 1712 | ccs.extend(options.cc) |
| 1713 | |
| 1714 | ccs = [email.strip() for email in ccs if email.strip()] |
| 1715 | if change_desc.get_cced(): |
| 1716 | ccs.extend(change_desc.get_cced()) |
| 1717 | |
| 1718 | return change_desc.get_reviewers(), ccs, change_desc |
| 1719 | |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1720 | def CMDUpload(self, options, git_diff_args, orig_args): |
| 1721 | """Uploads a change to codereview.""" |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1722 | custom_cl_base = None |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1723 | if git_diff_args: |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1724 | custom_cl_base = base_branch = git_diff_args[0] |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1725 | else: |
| 1726 | if self.GetBranch() is None: |
| 1727 | DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') |
| 1728 | |
| 1729 | # Default to diffing against common ancestor of upstream branch |
| 1730 | base_branch = self.GetCommonAncestorWithUpstream() |
| 1731 | git_diff_args = [base_branch, 'HEAD'] |
| 1732 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1733 | # Fast best-effort checks to abort before running potentially expensive |
| 1734 | # hooks if uploading is likely to fail anyway. Passing these checks does |
| 1735 | # not guarantee that uploading will not fail. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1736 | self.EnsureAuthenticated(force=options.force) |
| 1737 | self.EnsureCanUploadPatchset(force=options.force) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1738 | |
| 1739 | # Apply watchlists on upload. |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 1740 | watchlist = watchlists.Watchlists(settings.GetRoot()) |
| 1741 | files = self.GetAffectedFiles(base_branch) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1742 | if not options.bypass_watchlists: |
Daniel Cheng | 7227d21 | 2017-11-17 08:12:37 -0800 | [diff] [blame] | 1743 | self.ExtendCC(watchlist.GetWatchersForPaths(files)) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1744 | |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1745 | change_desc = self._GetDescriptionForUpload(options, git_diff_args, files) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1746 | if not options.bypass_hooks: |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 1747 | hook_results = self.RunHook( |
| 1748 | committing=False, |
| 1749 | may_prompt=not options.force, |
| 1750 | verbose=options.verbose, |
| 1751 | parallel=options.parallel, |
| 1752 | upstream=base_branch, |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1753 | description=change_desc.description, |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 1754 | all_files=False, |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 1755 | resultdb=options.resultdb, |
| 1756 | realm=options.realm) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1757 | self.ExtendCC(hook_results['more_cc']) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1758 | |
Aaron Gable | 13101a6 | 2018-02-09 13:20:41 -0800 | [diff] [blame] | 1759 | print_stats(git_diff_args) |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 1760 | ret = self.CMDUploadChange( |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 1761 | options, git_diff_args, custom_cl_base, change_desc) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1762 | if not ret: |
mlcui | 7a0b4cb | 2023-01-23 23:14:55 +0000 | [diff] [blame] | 1763 | if self.GetBranch() is not None: |
| 1764 | self._GitSetBranchConfigValue( |
| 1765 | LAST_UPLOAD_HASH_CONFIG_KEY, |
| 1766 | scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD')) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1767 | # Run post upload hooks, if specified. |
| 1768 | if settings.GetRunPostUploadHook(): |
Brian Sheedy | 7326ca2 | 2022-11-02 18:36:17 +0000 | [diff] [blame] | 1769 | self.RunPostUploadHook(options.verbose, base_branch, |
| 1770 | change_desc.description, |
| 1771 | options.no_python2_post_upload_hooks) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1772 | |
| 1773 | # Upload all dependencies if specified. |
| 1774 | if options.dependencies: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 1775 | print() |
| 1776 | print('--dependencies has been specified.') |
| 1777 | print('All dependent local branches will be re-uploaded.') |
| 1778 | print() |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1779 | # Remove the dependencies flag from args so that we do not end up in a |
| 1780 | # loop. |
| 1781 | orig_args.remove('--dependencies') |
Jose Lopes | 3863fc5 | 2020-04-07 17:00:25 +0000 | [diff] [blame] | 1782 | ret = upload_branch_deps(self, orig_args, options.force) |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1783 | return ret |
| 1784 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1785 | def SetCQState(self, new_state): |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1786 | """Updates the CQ state for the latest patchset. |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1787 | |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 1788 | Issue must have been already uploaded and known. Optionally allows for |
| 1789 | updating Quick-Run (QR) state. |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1790 | """ |
| 1791 | assert new_state in _CQState.ALL_STATES |
| 1792 | assert self.GetIssue() |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1793 | try: |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1794 | vote_map = { |
| 1795 | _CQState.NONE: 0, |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 1796 | _CQState.QUICK_RUN: 1, |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1797 | _CQState.DRY_RUN: 1, |
| 1798 | _CQState.COMMIT: 2, |
| 1799 | } |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 1800 | if new_state == _CQState.QUICK_RUN: |
| 1801 | labels = { |
| 1802 | 'Commit-Queue': vote_map[_CQState.DRY_RUN], |
| 1803 | 'Quick-Run': vote_map[_CQState.QUICK_RUN], |
| 1804 | } |
| 1805 | else: |
| 1806 | labels = {'Commit-Queue': vote_map[new_state]} |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1807 | notify = False if new_state == _CQState.DRY_RUN else None |
| 1808 | gerrit_util.SetReview( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1809 | self.GetGerritHost(), self._GerritChangeIdentifier(), |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 1810 | labels=labels, notify=notify) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1811 | return 0 |
| 1812 | except KeyboardInterrupt: |
| 1813 | raise |
| 1814 | except: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1815 | print('WARNING: Failed to %s.\n' |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1816 | 'Either:\n' |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 1817 | ' * Your project has no CQ,\n' |
| 1818 | ' * You don\'t have permission to change the CQ state,\n' |
| 1819 | ' * There\'s a bug in this code (see stack trace below).\n' |
| 1820 | 'Consider specifying which bots to trigger manually or asking your ' |
| 1821 | 'project owners for permissions or contacting Chrome Infra at:\n' |
| 1822 | 'https://www.chromium.org/infra\n\n' % |
| 1823 | ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ')) |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 1824 | # Still raise exception so that stack trace is printed. |
| 1825 | raise |
| 1826 | |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1827 | def GetGerritHost(self): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1828 | # Lazy load of configs. |
| 1829 | self.GetCodereviewServer() |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1830 | if self._gerrit_host and '.' not in self._gerrit_host: |
| 1831 | # Abbreviated domain like "chromium" instead of chromium.googlesource.com. |
| 1832 | # This happens for internal stuff http://crbug.com/614312. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1833 | parsed = urllib.parse.urlparse(self.GetRemoteUrl()) |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1834 | if parsed.scheme == 'sso': |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1835 | print('WARNING: using non-https URLs for remote is likely broken\n' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1836 | ' Your current remote is: %s' % self.GetRemoteUrl()) |
tandrii | e32e3ea | 2016-06-22 02:52:48 -0700 | [diff] [blame] | 1837 | self._gerrit_host = '%s.googlesource.com' % self._gerrit_host |
| 1838 | self._gerrit_server = 'https://%s' % self._gerrit_host |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1839 | return self._gerrit_host |
| 1840 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1841 | def _GetGitHost(self): |
| 1842 | """Returns git host to be used when uploading change to Gerrit.""" |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1843 | remote_url = self.GetRemoteUrl() |
| 1844 | if not remote_url: |
| 1845 | return None |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1846 | return urllib.parse.urlparse(remote_url).netloc |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1847 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1848 | def GetCodereviewServer(self): |
| 1849 | if not self._gerrit_server: |
| 1850 | # If we're on a branch then get the server potentially associated |
| 1851 | # with that branch. |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1852 | if self.GetIssue() and self.GetBranch(): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1853 | self._gerrit_server = self._GitGetBranchConfigValue( |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 1854 | CODEREVIEW_SERVER_CONFIG_KEY) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1855 | if self._gerrit_server: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1856 | self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1857 | if not self._gerrit_server: |
| 1858 | # We assume repo to be hosted on Gerrit, and hence Gerrit server |
| 1859 | # has "-review" suffix for lowest level subdomain. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1860 | parts = self._GetGitHost().split('.') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1861 | parts[0] = parts[0] + '-review' |
| 1862 | self._gerrit_host = '.'.join(parts) |
| 1863 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 1864 | return self._gerrit_server |
| 1865 | |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1866 | def GetGerritProject(self): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1867 | """Returns Gerrit project name based on remote git URL.""" |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1868 | remote_url = self.GetRemoteUrl() |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1869 | if remote_url is None: |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1870 | logging.warning('can\'t detect Gerrit project.') |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1871 | return None |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 1872 | project = urllib.parse.urlparse(remote_url).path.strip('/') |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1873 | if project.endswith('.git'): |
| 1874 | project = project[:-len('.git')] |
Andrii Shyshkalov | 1e82867 | 2018-08-23 22:34:37 +0000 | [diff] [blame] | 1875 | # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with |
| 1876 | # 'a/' prefix, because 'a/' prefix is used to force authentication in |
| 1877 | # gitiles/git-over-https protocol. E.g., |
| 1878 | # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project |
| 1879 | # as |
| 1880 | # https://chromium.googlesource.com/v8/v8 |
| 1881 | if project.startswith('a/'): |
| 1882 | project = project[len('a/'):] |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1883 | return project |
| 1884 | |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1885 | def _GerritChangeIdentifier(self): |
| 1886 | """Handy method for gerrit_util.ChangeIdentifier for a given CL. |
| 1887 | |
| 1888 | Not to be confused by value of "Change-Id:" footer. |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1889 | 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] | 1890 | """ |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1891 | project = self.GetGerritProject() |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 1892 | if project: |
| 1893 | return gerrit_util.ChangeIdentifier(project, self.GetIssue()) |
| 1894 | # Fall back on still unique, but less efficient change number. |
| 1895 | return str(self.GetIssue()) |
Andrii Shyshkalov | d06cc78 | 2018-08-23 17:24:19 +0000 | [diff] [blame] | 1896 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 1897 | def EnsureAuthenticated(self, force, refresh=None): |
tandrii@chromium.org | 9e6c3a5 | 2016-04-12 14:13:08 +0000 | [diff] [blame] | 1898 | """Best effort check that user is authenticated with Gerrit server.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1899 | if settings.GetGerritSkipEnsureAuthenticated(): |
| 1900 | # For projects with unusual authentication schemes. |
| 1901 | # See http://crbug.com/603378. |
| 1902 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1903 | |
| 1904 | # Check presence of cookies only if using cookies-based auth method. |
| 1905 | cookie_auth = gerrit_util.Authenticator.get() |
| 1906 | if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1907 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1908 | |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1909 | remote_url = self.GetRemoteUrl() |
| 1910 | if remote_url is None: |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1911 | logging.warning('invalid remote') |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1912 | return |
Joanna Wang | 46ffd1b | 2022-09-16 20:44:44 +0000 | [diff] [blame] | 1913 | if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']: |
| 1914 | logging.warning( |
| 1915 | 'Ignoring branch %(branch)s with non-https/sso remote ' |
| 1916 | '%(remote)s', { |
| 1917 | 'branch': self.branch, |
| 1918 | 'remote': self.GetRemoteUrl() |
| 1919 | }) |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1920 | return |
| 1921 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1922 | # Lazy-loader to identify Gerrit and Git hosts. |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1923 | self.GetCodereviewServer() |
| 1924 | git_host = self._GetGitHost() |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 1925 | assert self._gerrit_server and self._gerrit_host and git_host |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1926 | |
| 1927 | gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host) |
| 1928 | git_auth = cookie_auth.get_auth_header(git_host) |
| 1929 | if gerrit_auth and git_auth: |
| 1930 | if gerrit_auth == git_auth: |
| 1931 | return |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1932 | all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com') |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1933 | print( |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1934 | 'WARNING: You have different credentials for Gerrit and git hosts:\n' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1935 | ' %s\n' |
| 1936 | ' %s\n' |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1937 | ' Consider running the following command:\n' |
| 1938 | ' git cl creds-check\n' |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1939 | ' %s\n' |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1940 | ' %s' % |
Andrii Shyshkalov | 51acef9 | 2017-04-11 17:19:59 +0200 | [diff] [blame] | 1941 | (git_host, self._gerrit_host, |
Andrii Shyshkalov | 354e1d2 | 2017-06-09 19:31:33 +0200 | [diff] [blame] | 1942 | ('Hint: delete creds for .googlesource.com' if all_gsrc else ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1943 | cookie_auth.get_new_password_message(git_host))) |
| 1944 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1945 | 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] | 1946 | return |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 1947 | |
| 1948 | missing = ( |
| 1949 | ([] if gerrit_auth else [self._gerrit_host]) + |
| 1950 | ([] if git_auth else [git_host])) |
| 1951 | DieWithError('Credentials for the following hosts are required:\n' |
| 1952 | ' %s\n' |
| 1953 | 'These are read from %s (or legacy %s)\n' |
| 1954 | '%s' % ( |
| 1955 | '\n '.join(missing), |
| 1956 | cookie_auth.get_gitcookies_path(), |
| 1957 | cookie_auth.get_netrc_path(), |
| 1958 | cookie_auth.get_new_password_message(git_host))) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1959 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1960 | def EnsureCanUploadPatchset(self, force): |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1961 | if not self.GetIssue(): |
| 1962 | return |
| 1963 | |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1964 | status = self._GetChangeDetail()['status'] |
Joanna Wang | 583ca66 | 2022-04-27 21:17:17 +0000 | [diff] [blame] | 1965 | if status == 'ABANDONED': |
Bruce Dawson | eb8426e | 2022-08-05 23:58:15 +0000 | [diff] [blame] | 1966 | DieWithError( |
| 1967 | 'Change %s has been abandoned, new uploads are not allowed' % |
| 1968 | (self.GetIssueURL())) |
Joanna Wang | 583ca66 | 2022-04-27 21:17:17 +0000 | [diff] [blame] | 1969 | if status == 'MERGED': |
| 1970 | answer = gclient_utils.AskForData( |
| 1971 | 'Change %s has been submitted, new uploads are not allowed. ' |
| 1972 | 'Would you like to start a new change (Y/n)?' % self.GetIssueURL() |
| 1973 | ).lower() |
| 1974 | if answer not in ('y', ''): |
| 1975 | DieWithError('New uploads are not allowed.') |
| 1976 | self.SetIssue() |
| 1977 | return |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1978 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1979 | # TODO(vadimsh): For some reason the chunk of code below was skipped if |
| 1980 | # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'. |
| 1981 | # Apparently this check is not very important? Otherwise get_auth_email |
| 1982 | # could have been added to other implementations of Authenticator. |
| 1983 | cookies_auth = gerrit_util.Authenticator.get() |
| 1984 | if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator): |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1985 | return |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 1986 | |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1987 | cookies_user = cookies_auth.get_auth_email(self.GetGerritHost()) |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1988 | if self.GetIssueOwner() == cookies_user: |
| 1989 | return |
| 1990 | logging.debug('change %s owner is %s, cookies user is %s', |
| 1991 | self.GetIssue(), self.GetIssueOwner(), cookies_user) |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1992 | # Maybe user has linked accounts or something like that, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1993 | # so ask what Gerrit thinks of this user. |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 1994 | details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self') |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1995 | if details['email'] == self.GetIssueOwner(): |
| 1996 | return |
| 1997 | if not force: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1998 | 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] | 1999 | 'as %s.\n' |
| 2000 | 'Uploading may fail due to lack of permissions.' % |
| 2001 | (self.GetIssue(), self.GetIssueOwner(), details['email'])) |
| 2002 | confirm_or_exit(action='upload') |
| 2003 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2004 | def GetStatus(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2005 | """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] | 2006 | or CQ status, assuming adherence to a common workflow. |
| 2007 | |
| 2008 | 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] | 2009 | * 'error' - error from review tool (including deleted issues) |
| 2010 | * 'unsent' - no reviewers added |
| 2011 | * 'waiting' - waiting for review |
| 2012 | * 'reply' - waiting for uploader to reply to review |
| 2013 | * 'lgtm' - Code-Review label has been set |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 2014 | * 'dry-run' - dry-running in the CQ |
| 2015 | * 'commit' - in the CQ |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2016 | * 'closed' - successfully submitted or abandoned |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2017 | """ |
| 2018 | if not self.GetIssue(): |
| 2019 | return None |
| 2020 | |
| 2021 | try: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2022 | data = self._GetChangeDetail([ |
| 2023 | 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE']) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2024 | except GerritChangeNotExists: |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2025 | return 'error' |
| 2026 | |
tandrii@chromium.org | 5e1bf38 | 2016-05-17 08:43:24 +0000 | [diff] [blame] | 2027 | if data['status'] in ('ABANDONED', 'MERGED'): |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2028 | return 'closed' |
| 2029 | |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 2030 | cq_label = data['labels'].get('Commit-Queue', {}) |
| 2031 | max_cq_vote = 0 |
| 2032 | for vote in cq_label.get('all', []): |
| 2033 | max_cq_vote = max(max_cq_vote, vote.get('value', 0)) |
| 2034 | if max_cq_vote == 2: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2035 | return 'commit' |
Andrii Shyshkalov | b8268ca | 2019-04-03 23:33:44 +0000 | [diff] [blame] | 2036 | if max_cq_vote == 1: |
| 2037 | return 'dry-run' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2038 | |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2039 | if data['labels'].get('Code-Review', {}).get('approved'): |
| 2040 | return 'lgtm' |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2041 | |
| 2042 | if not data.get('reviewers', {}).get('REVIEWER', []): |
| 2043 | return 'unsent' |
| 2044 | |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 2045 | owner = data['owner'].get('_account_id') |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2046 | messages = sorted(data.get('messages', []), key=lambda m: m.get('date')) |
Andrii Shyshkalov | 8aa9d62 | 2020-03-10 19:15:35 +0000 | [diff] [blame] | 2047 | while messages: |
| 2048 | m = messages.pop() |
Andrii Shyshkalov | 899785a | 2021-07-09 12:45:37 +0000 | [diff] [blame] | 2049 | if (m.get('tag', '').startswith('autogenerated:cq') or |
| 2050 | m.get('tag', '').startswith('autogenerated:cv')): |
| 2051 | # Ignore replies from LUCI CV/CQ. |
Andrii Shyshkalov | 33e88a4 | 2017-01-27 14:45:30 +0100 | [diff] [blame] | 2052 | continue |
Andrii Shyshkalov | 8aa9d62 | 2020-03-10 19:15:35 +0000 | [diff] [blame] | 2053 | if m.get('author', {}).get('_account_id') == owner: |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2054 | # Most recent message was by owner. |
| 2055 | return 'waiting' |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 2056 | |
| 2057 | # Some reply from non-owner. |
| 2058 | return 'reply' |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 2059 | |
| 2060 | # Somehow there are no messages even though there are reviewers. |
| 2061 | return 'unsent' |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2062 | |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2063 | def GetMostRecentPatchset(self, update=True): |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 2064 | if not self.GetIssue(): |
| 2065 | return None |
| 2066 | |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2067 | data = self._GetChangeDetail(['CURRENT_REVISION']) |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 2068 | patchset = data['revisions'][data['current_revision']]['_number'] |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2069 | if update: |
| 2070 | self.SetPatchset(patchset) |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 2071 | return patchset |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2072 | |
Gavin Mak | f35a9eb | 2022-11-17 18:34:36 +0000 | [diff] [blame] | 2073 | def _IsPatchsetRangeSignificant(self, lower, upper): |
| 2074 | """Returns True if the inclusive range of patchsets contains any reworks or |
| 2075 | rebases.""" |
| 2076 | if not self.GetIssue(): |
| 2077 | return False |
| 2078 | |
| 2079 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2080 | ps_kind = {} |
| 2081 | for rev_info in data.get('revisions', {}).values(): |
| 2082 | ps_kind[rev_info['_number']] = rev_info.get('kind', '') |
| 2083 | |
| 2084 | for ps in range(lower, upper + 1): |
| 2085 | assert ps in ps_kind, 'expected patchset %d in change detail' % ps |
| 2086 | if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'): |
| 2087 | return True |
| 2088 | return False |
| 2089 | |
Gavin Mak | e61ccc5 | 2020-11-13 00:12:57 +0000 | [diff] [blame] | 2090 | def GetMostRecentDryRunPatchset(self): |
| 2091 | """Get patchsets equivalent to the most recent patchset and return |
| 2092 | the patchset with the latest dry run. If none have been dry run, return |
| 2093 | the latest patchset.""" |
| 2094 | if not self.GetIssue(): |
| 2095 | return None |
| 2096 | |
| 2097 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2098 | patchset = data['revisions'][data['current_revision']]['_number'] |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 2099 | dry_run = {int(m['_revision_number']) |
| 2100 | for m in data.get('messages', []) |
| 2101 | if m.get('tag', '').endswith('dry-run')} |
Gavin Mak | e61ccc5 | 2020-11-13 00:12:57 +0000 | [diff] [blame] | 2102 | |
| 2103 | for revision_info in sorted(data.get('revisions', {}).values(), |
| 2104 | key=lambda c: c['_number'], reverse=True): |
| 2105 | if revision_info['_number'] in dry_run: |
| 2106 | patchset = revision_info['_number'] |
| 2107 | break |
| 2108 | if revision_info.get('kind', '') not in \ |
| 2109 | ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'): |
| 2110 | break |
| 2111 | self.SetPatchset(patchset) |
| 2112 | return patchset |
| 2113 | |
Aaron Gable | 636b13f | 2017-07-14 10:42:48 -0700 | [diff] [blame] | 2114 | def AddComment(self, message, publish=None): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2115 | gerrit_util.SetReview( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2116 | self.GetGerritHost(), self._GerritChangeIdentifier(), |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2117 | msg=message, ready=publish) |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 2118 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2119 | def GetCommentsSummary(self, readable=True): |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2120 | # DETAILED_ACCOUNTS is to get emails in accounts. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2121 | # CURRENT_REVISION is included to get the latest patchset so that |
| 2122 | # only the robot comments from the latest patchset can be shown. |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2123 | messages = self._GetChangeDetail( |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2124 | options=['MESSAGES', 'DETAILED_ACCOUNTS', |
| 2125 | 'CURRENT_REVISION']).get('messages', []) |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2126 | file_comments = gerrit_util.GetChangeComments( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2127 | self.GetGerritHost(), self._GerritChangeIdentifier()) |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2128 | robot_file_comments = gerrit_util.GetChangeRobotComments( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2129 | self.GetGerritHost(), self._GerritChangeIdentifier()) |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2130 | |
| 2131 | # Add the robot comments onto the list of comments, but only |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 2132 | # keep those that are from the latest patchset. |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2133 | latest_patch_set = self.GetMostRecentPatchset() |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2134 | for path, robot_comments in robot_file_comments.items(): |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2135 | line_comments = file_comments.setdefault(path, []) |
| 2136 | line_comments.extend( |
| 2137 | [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] | 2138 | |
| 2139 | # Build dictionary of file comments for easy access and sorting later. |
| 2140 | # {author+date: {path: {patchset: {line: url+message}}}} |
| 2141 | comments = collections.defaultdict( |
| 2142 | lambda: collections.defaultdict(lambda: collections.defaultdict(dict))) |
Andrii Shyshkalov | a3762a9 | 2020-11-25 10:20:42 +0000 | [diff] [blame] | 2143 | |
| 2144 | server = self.GetCodereviewServer() |
| 2145 | if server in _KNOWN_GERRIT_TO_SHORT_URLS: |
| 2146 | # /c/ is automatically added by short URL server. |
| 2147 | url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server], |
| 2148 | self.GetIssue()) |
| 2149 | else: |
| 2150 | url_prefix = '%s/c/%s' % (server, self.GetIssue()) |
| 2151 | |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2152 | for path, line_comments in file_comments.items(): |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2153 | for comment in line_comments: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2154 | tag = comment.get('tag', '') |
| 2155 | if tag.startswith('autogenerated') and 'robot_id' not in comment: |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2156 | continue |
| 2157 | key = (comment['author']['email'], comment['updated']) |
| 2158 | if comment.get('side', 'REVISION') == 'PARENT': |
| 2159 | patchset = 'Base' |
| 2160 | else: |
| 2161 | patchset = 'PS%d' % comment['patch_set'] |
| 2162 | line = comment.get('line', 0) |
Andrii Shyshkalov | a3762a9 | 2020-11-25 10:20:42 +0000 | [diff] [blame] | 2163 | url = ('%s/%s/%s#%s%s' % |
| 2164 | (url_prefix, comment['patch_set'], path, |
| 2165 | 'b' if comment.get('side') == 'PARENT' else '', |
| 2166 | str(line) if line else '')) |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2167 | comments[key][path][patchset][line] = (url, comment['message']) |
| 2168 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2169 | summaries = [] |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2170 | for msg in messages: |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2171 | summary = self._BuildCommentSummary(msg, comments, readable) |
| 2172 | if summary: |
| 2173 | summaries.append(summary) |
| 2174 | return summaries |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2175 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2176 | @staticmethod |
| 2177 | def _BuildCommentSummary(msg, comments, readable): |
Josip Sokcevic | 266129c | 2021-11-09 00:22:00 +0000 | [diff] [blame] | 2178 | if 'email' not in msg['author']: |
| 2179 | # Some bot accounts may not have an email associated. |
| 2180 | return None |
| 2181 | |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2182 | key = (msg['author']['email'], msg['date']) |
| 2183 | # Don't bother showing autogenerated messages that don't have associated |
| 2184 | # file or line comments. this will filter out most autogenerated |
| 2185 | # messages, but will keep robot comments like those from Tricium. |
| 2186 | is_autogenerated = msg.get('tag', '').startswith('autogenerated') |
| 2187 | if is_autogenerated and not comments.get(key): |
| 2188 | return None |
| 2189 | message = msg['message'] |
| 2190 | # Gerrit spits out nanoseconds. |
| 2191 | assert len(msg['date'].split('.')[-1]) == 9 |
| 2192 | date = datetime.datetime.strptime(msg['date'][:-3], |
| 2193 | '%Y-%m-%d %H:%M:%S.%f') |
| 2194 | if key in comments: |
| 2195 | message += '\n' |
| 2196 | for path, patchsets in sorted(comments.get(key, {}).items()): |
| 2197 | if readable: |
| 2198 | message += '\n%s' % path |
| 2199 | for patchset, lines in sorted(patchsets.items()): |
| 2200 | for line, (url, content) in sorted(lines.items()): |
| 2201 | if line: |
| 2202 | line_str = 'Line %d' % line |
| 2203 | path_str = '%s:%d:' % (path, line) |
| 2204 | else: |
| 2205 | line_str = 'File comment' |
| 2206 | path_str = '%s:0:' % path |
| 2207 | if readable: |
| 2208 | message += '\n %s, %s: %s' % (patchset, line_str, url) |
| 2209 | message += '\n %s\n' % content |
| 2210 | else: |
| 2211 | message += '\n%s ' % path_str |
| 2212 | message += '\n%s\n' % content |
| 2213 | |
| 2214 | return _CommentSummary( |
| 2215 | date=date, |
| 2216 | message=message, |
| 2217 | sender=msg['author']['email'], |
| 2218 | autogenerated=is_autogenerated, |
| 2219 | # These could be inferred from the text messages and correlated with |
| 2220 | # Code-Review label maximum, however this is not reliable. |
| 2221 | # Leaving as is until the need arises. |
| 2222 | approval=False, |
| 2223 | disapproval=False, |
| 2224 | ) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 2225 | |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2226 | def CloseIssue(self): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2227 | gerrit_util.AbandonChange( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2228 | self.GetGerritHost(), self._GerritChangeIdentifier(), msg='') |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 2229 | |
Xinan Lin | 1bd4ffa | 2021-07-28 00:54:22 +0000 | [diff] [blame] | 2230 | def SubmitIssue(self): |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2231 | gerrit_util.SubmitChange( |
Xinan Lin | 1bd4ffa | 2021-07-28 00:54:22 +0000 | [diff] [blame] | 2232 | self.GetGerritHost(), self._GerritChangeIdentifier()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 2233 | |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2234 | def _GetChangeDetail(self, options=None): |
| 2235 | """Returns details of associated Gerrit change and caching results.""" |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2236 | options = options or [] |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2237 | assert self.GetIssue(), 'issue is required to query Gerrit' |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2238 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 2239 | # Optimization to avoid multiple RPCs: |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2240 | if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options: |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 2241 | options.append('CURRENT_COMMIT') |
| 2242 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2243 | # Normalize issue and options for consistent keys in cache. |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2244 | cache_key = str(self.GetIssue()) |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2245 | options_set = frozenset(o.upper() for o in options) |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2246 | |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2247 | for cached_options_set, data in self._detail_cache.get(cache_key, []): |
| 2248 | # Assumption: data fetched before with extra options is suitable |
| 2249 | # for return for a smaller set of options. |
| 2250 | # For example, if we cached data for |
| 2251 | # options=[CURRENT_REVISION, DETAILED_FOOTERS] |
| 2252 | # and request is for options=[CURRENT_REVISION], |
| 2253 | # THEN we can return prior cached data. |
| 2254 | if options_set.issubset(cached_options_set): |
| 2255 | return data |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2256 | |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2257 | try: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2258 | data = gerrit_util.GetChangeDetail( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2259 | self.GetGerritHost(), self._GerritChangeIdentifier(), options_set) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2260 | except gerrit_util.GerritError as e: |
| 2261 | if e.http_status == 404: |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2262 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2263 | raise |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2264 | |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2265 | self._detail_cache.setdefault(cache_key, []).append((options_set, data)) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2266 | return data |
tandrii@chromium.org | 013a280 | 2016-03-29 09:52:33 +0000 | [diff] [blame] | 2267 | |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2268 | def _GetChangeCommit(self, revision='current'): |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2269 | assert self.GetIssue(), 'issue must be set to query Gerrit' |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2270 | try: |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2271 | data = gerrit_util.GetChangeCommit(self.GetGerritHost(), |
| 2272 | self._GerritChangeIdentifier(), |
| 2273 | revision) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2274 | except gerrit_util.GerritError as e: |
| 2275 | if e.http_status == 404: |
Andrii Shyshkalov | e263316 | 2018-08-27 23:50:31 +0000 | [diff] [blame] | 2276 | raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer()) |
Aaron Gable | 6f5a8d9 | 2017-04-18 14:49:05 -0700 | [diff] [blame] | 2277 | raise |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2278 | return data |
| 2279 | |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2280 | def _IsCqConfigured(self): |
| 2281 | detail = self._GetChangeDetail(['LABELS']) |
Andrii Shyshkalov | 8effa4d | 2020-01-21 13:23:36 +0000 | [diff] [blame] | 2282 | return u'Commit-Queue' in detail.get('labels', {}) |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2283 | |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 2284 | def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm): |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2285 | if git_common.is_dirty_git_tree('land'): |
| 2286 | return 1 |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2287 | |
tandrii | d60367b | 2016-06-22 05:25:12 -0700 | [diff] [blame] | 2288 | detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS']) |
Karen Qian | 40c1942 | 2019-03-13 21:28:29 +0000 | [diff] [blame] | 2289 | if not force and self._IsCqConfigured(): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 2290 | confirm_or_exit('\nIt seems this repository has a CQ, ' |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2291 | 'which can test and land changes for you. ' |
| 2292 | 'Are you sure you wish to bypass it?\n', |
| 2293 | action='bypass CQ') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2294 | differs = True |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 2295 | last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2296 | # Note: git diff outputs nothing if there is no diff. |
| 2297 | if not last_upload or RunGit(['diff', last_upload]).strip(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2298 | print('WARNING: Some changes from local branch haven\'t been uploaded.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2299 | else: |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2300 | if detail['current_revision'] == last_upload: |
| 2301 | differs = False |
| 2302 | else: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2303 | print('WARNING: Local branch contents differ from latest uploaded ' |
| 2304 | 'patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2305 | if differs: |
| 2306 | if not force: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2307 | confirm_or_exit( |
| 2308 | 'Do you want to submit latest Gerrit patchset and bypass hooks?\n', |
| 2309 | action='submit') |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2310 | print('WARNING: Bypassing hooks and submitting latest uploaded patchset.') |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2311 | elif not bypass_hooks: |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2312 | upstream = self.GetCommonAncestorWithUpstream() |
| 2313 | if self.GetIssue(): |
| 2314 | description = self.FetchDescription() |
| 2315 | else: |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 2316 | description = _create_description_from_log([upstream]) |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2317 | self.RunHook( |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2318 | committing=True, |
| 2319 | may_prompt=not force, |
| 2320 | verbose=verbose, |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2321 | parallel=parallel, |
| 2322 | upstream=upstream, |
| 2323 | description=description, |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 2324 | all_files=False, |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 2325 | resultdb=resultdb, |
| 2326 | realm=realm) |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2327 | |
Xinan Lin | 1bd4ffa | 2021-07-28 00:54:22 +0000 | [diff] [blame] | 2328 | self.SubmitIssue() |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2329 | print('Issue %s has been submitted.' % self.GetIssueURL()) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2330 | links = self._GetChangeCommit().get('web_links', []) |
| 2331 | for link in links: |
Michael Moss | e371c64 | 2021-09-29 16:41:04 +0000 | [diff] [blame] | 2332 | if link.get('name') in ['gitiles', 'browse'] and link.get('url'): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2333 | print('Landed as: %s' % link.get('url')) |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2334 | break |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 2335 | return 0 |
| 2336 | |
Bruce Dawson | f362f6f | 2021-02-18 23:15:17 +0000 | [diff] [blame] | 2337 | def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force, |
| 2338 | newbranch): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2339 | assert parsed_issue_arg.valid |
| 2340 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2341 | self.issue = parsed_issue_arg.issue |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2342 | |
| 2343 | if parsed_issue_arg.hostname: |
| 2344 | self._gerrit_host = parsed_issue_arg.hostname |
| 2345 | self._gerrit_server = 'https://%s' % self._gerrit_host |
| 2346 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2347 | try: |
| 2348 | detail = self._GetChangeDetail(['ALL_REVISIONS']) |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2349 | except GerritChangeNotExists as e: |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2350 | DieWithError(str(e)) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2351 | |
| 2352 | if not parsed_issue_arg.patchset: |
| 2353 | # Use current revision by default. |
| 2354 | revision_info = detail['revisions'][detail['current_revision']] |
| 2355 | patchset = int(revision_info['_number']) |
| 2356 | else: |
| 2357 | patchset = parsed_issue_arg.patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 2358 | for revision_info in detail['revisions'].values(): |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2359 | if int(revision_info['_number']) == parsed_issue_arg.patchset: |
| 2360 | break |
| 2361 | else: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 2362 | DieWithError('Couldn\'t find patchset %i in change %i' % |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2363 | (parsed_issue_arg.patchset, self.GetIssue())) |
| 2364 | |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2365 | remote_url = self.GetRemoteUrl() |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2366 | if remote_url.endswith('.git'): |
| 2367 | remote_url = remote_url[:-len('.git')] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2368 | remote_url = remote_url.rstrip('/') |
| 2369 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2370 | fetch_info = revision_info['fetch']['http'] |
erikchen | 0d14d0d | 2018-08-28 18:57:09 +0000 | [diff] [blame] | 2371 | fetch_info['url'] = fetch_info['url'].rstrip('/') |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 2372 | |
| 2373 | if remote_url != fetch_info['url']: |
| 2374 | DieWithError('Trying to patch a change from %s but this repo appears ' |
| 2375 | 'to be %s.' % (fetch_info['url'], remote_url)) |
| 2376 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2377 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2378 | |
Bruce Dawson | f362f6f | 2021-02-18 23:15:17 +0000 | [diff] [blame] | 2379 | # If we have created a new branch then do the "set issue" immediately in |
| 2380 | # case the cherry-pick fails, which happens when resolving conflicts. |
| 2381 | if newbranch: |
| 2382 | self.SetIssue(parsed_issue_arg.issue) |
| 2383 | |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2384 | if force: |
| 2385 | RunGit(['reset', '--hard', 'FETCH_HEAD']) |
| 2386 | print('Checked out commit for change %i patchset %i locally' % |
| 2387 | (parsed_issue_arg.issue, patchset)) |
Stefan Zager | 2d5f039 | 2017-10-10 15:17:53 -0700 | [diff] [blame] | 2388 | elif nocommit: |
| 2389 | RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD']) |
| 2390 | print('Patch applied to index.') |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2391 | else: |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 2392 | RunGit(['cherry-pick', 'FETCH_HEAD']) |
| 2393 | print('Committed patch for change %i patchset %i locally.' % |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 2394 | (parsed_issue_arg.issue, patchset)) |
| 2395 | print('Note: this created a local commit which does not have ' |
| 2396 | 'the same hash as the one uploaded for review. This will make ' |
| 2397 | 'uploading changes based on top of this branch difficult.\n' |
| 2398 | 'If you want to do that, use "git cl patch --force" instead.') |
| 2399 | |
Stefan Zager | d08043c | 2017-10-12 12:07:02 -0700 | [diff] [blame] | 2400 | if self.GetBranch(): |
| 2401 | self.SetIssue(parsed_issue_arg.issue) |
| 2402 | self.SetPatchset(patchset) |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 2403 | fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD') |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 2404 | self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash) |
| 2405 | self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash) |
Stefan Zager | d08043c | 2017-10-12 12:07:02 -0700 | [diff] [blame] | 2406 | else: |
| 2407 | print('WARNING: You are in detached HEAD state.\n' |
| 2408 | 'The patch has been applied to your checkout, but you will not be ' |
| 2409 | 'able to upload a new patch set to the gerrit issue.\n' |
| 2410 | 'Try using the \'-b\' option if you would like to work on a ' |
| 2411 | 'branch and/or upload a new patch set.') |
| 2412 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2413 | return 0 |
| 2414 | |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 2415 | @staticmethod |
| 2416 | def _GerritCommitMsgHookCheck(offer_removal): |
| 2417 | # type: (bool) -> None |
| 2418 | """Checks for the gerrit's commit-msg hook and removes it if necessary.""" |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2419 | hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 2420 | if not os.path.exists(hook): |
| 2421 | return |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2422 | # Crude attempt to distinguish Gerrit Codereview hook from a potentially |
| 2423 | # custom developer-made one. |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2424 | data = gclient_utils.FileRead(hook) |
| 2425 | if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data): |
| 2426 | return |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2427 | print('WARNING: You have Gerrit commit-msg hook installed.\n' |
qyearsley | 12fa6ff | 2016-08-24 09:18:40 -0700 | [diff] [blame] | 2428 | 'It is not necessary for uploading with git cl in squash mode, ' |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2429 | 'and may interfere with it in subtle ways.\n' |
| 2430 | 'We recommend you remove the commit-msg hook.') |
| 2431 | if offer_removal: |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2432 | if ask_for_explicit_yes('Do you want to remove it now?'): |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2433 | gclient_utils.rm_file_or_tree(hook) |
| 2434 | print('Gerrit commit-msg hook removed.') |
| 2435 | else: |
| 2436 | print('OK, will keep Gerrit commit-msg hook in place.') |
| 2437 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2438 | def _CleanUpOldTraces(self): |
| 2439 | """Keep only the last |MAX_TRACES| traces.""" |
| 2440 | try: |
| 2441 | traces = sorted([ |
| 2442 | os.path.join(TRACES_DIR, f) |
| 2443 | for f in os.listdir(TRACES_DIR) |
| 2444 | if (os.path.isfile(os.path.join(TRACES_DIR, f)) |
| 2445 | and not f.startswith('tmp')) |
| 2446 | ]) |
| 2447 | traces_to_delete = traces[:-MAX_TRACES] |
| 2448 | for trace in traces_to_delete: |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 2449 | os.remove(trace) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2450 | except OSError: |
| 2451 | print('WARNING: Failed to remove old git traces from\n' |
| 2452 | ' %s' |
| 2453 | 'Consider removing them manually.' % TRACES_DIR) |
Edward Lemur | dc8e23d | 2019-05-07 00:45:48 +0000 | [diff] [blame] | 2454 | |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2455 | def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata): |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2456 | """Zip and write the git push traces stored in traces_dir.""" |
| 2457 | gclient_utils.safe_makedirs(TRACES_DIR) |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2458 | traces_zip = trace_name + '-traces' |
| 2459 | traces_readme = trace_name + '-README' |
Michael Moss | e7f0b4c | 2019-05-08 04:36:24 +0000 | [diff] [blame] | 2460 | # Create a temporary dir to store git config and gitcookies in. It will be |
| 2461 | # compressed and stored next to the traces. |
| 2462 | git_info_dir = tempfile.mkdtemp() |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2463 | git_info_zip = trace_name + '-git-info' |
| 2464 | |
Josip Sokcevic | 5e18b60 | 2020-04-23 21:47:00 +0000 | [diff] [blame] | 2465 | git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f') |
sangwoo.ko | 7a61433 | 2019-05-22 02:46:19 +0000 | [diff] [blame] | 2466 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2467 | git_push_metadata['trace_name'] = trace_name |
| 2468 | gclient_utils.FileWrite( |
| 2469 | traces_readme, TRACES_README_FORMAT % git_push_metadata) |
| 2470 | |
| 2471 | # Keep only the first 6 characters of the git hashes on the packet |
| 2472 | # trace. This greatly decreases size after compression. |
| 2473 | packet_traces = os.path.join(traces_dir, 'trace-packet') |
| 2474 | if os.path.isfile(packet_traces): |
| 2475 | contents = gclient_utils.FileRead(packet_traces) |
| 2476 | gclient_utils.FileWrite( |
| 2477 | packet_traces, GIT_HASH_RE.sub(r'\1', contents)) |
| 2478 | shutil.make_archive(traces_zip, 'zip', traces_dir) |
| 2479 | |
| 2480 | # Collect and compress the git config and gitcookies. |
| 2481 | git_config = RunGit(['config', '-l']) |
| 2482 | gclient_utils.FileWrite( |
| 2483 | os.path.join(git_info_dir, 'git-config'), |
| 2484 | git_config) |
| 2485 | |
| 2486 | cookie_auth = gerrit_util.Authenticator.get() |
| 2487 | if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator): |
| 2488 | gitcookies_path = cookie_auth.get_gitcookies_path() |
| 2489 | if os.path.isfile(gitcookies_path): |
| 2490 | gitcookies = gclient_utils.FileRead(gitcookies_path) |
| 2491 | gclient_utils.FileWrite( |
| 2492 | os.path.join(git_info_dir, 'gitcookies'), |
| 2493 | GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies)) |
| 2494 | shutil.make_archive(git_info_zip, 'zip', git_info_dir) |
| 2495 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2496 | gclient_utils.rmtree(git_info_dir) |
| 2497 | |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 2498 | def _RunGitPushWithTraces(self, |
| 2499 | refspec, |
| 2500 | refspec_opts, |
| 2501 | git_push_metadata, |
| 2502 | git_push_options=None): |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2503 | """Run git push and collect the traces resulting from the execution.""" |
| 2504 | # Create a temporary directory to store traces in. Traces will be compressed |
| 2505 | # and stored in a 'traces' dir inside depot_tools. |
| 2506 | traces_dir = tempfile.mkdtemp() |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2507 | trace_name = os.path.join( |
| 2508 | TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f')) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2509 | |
| 2510 | env = os.environ.copy() |
| 2511 | env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy' |
| 2512 | env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Jonathan Nieder | 9779b14 | 2019-05-29 23:19:29 +0000 | [diff] [blame] | 2513 | env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2514 | env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl') |
| 2515 | env['GIT_TRACE_CURL_NO_DATA'] = '1' |
| 2516 | env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet') |
| 2517 | |
| 2518 | try: |
| 2519 | push_returncode = 0 |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2520 | remote_url = self.GetRemoteUrl() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2521 | before_push = time_time() |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 2522 | push_cmd = ['git', 'push', remote_url, refspec] |
| 2523 | if git_push_options: |
| 2524 | for opt in git_push_options: |
| 2525 | push_cmd.extend(['-o', opt]) |
| 2526 | |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2527 | push_stdout = gclient_utils.CheckCallAndFilter( |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 2528 | push_cmd, |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2529 | env=env, |
| 2530 | print_stdout=True, |
| 2531 | # Flush after every line: useful for seeing progress when running as |
| 2532 | # recipe. |
| 2533 | filter_fn=lambda _: sys.stdout.flush()) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2534 | push_stdout = push_stdout.decode('utf-8', 'replace') |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2535 | except subprocess2.CalledProcessError as e: |
| 2536 | push_returncode = e.returncode |
Aravind Vasudevan | c950858 | 2022-10-18 03:07:41 +0000 | [diff] [blame] | 2537 | if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout): |
Josip Sokcevic | 740825e | 2021-05-12 18:28:34 +0000 | [diff] [blame] | 2538 | raise GitPushError( |
| 2539 | 'Failed to create a change, very likely due to blocked keyword. ' |
| 2540 | 'Please examine output above for the reason of the failure.\n' |
| 2541 | 'If this is a false positive, you can try to bypass blocked ' |
| 2542 | 'keyword by using push option ' |
| 2543 | '-o uploadvalidator~skip, e.g.:\n' |
| 2544 | 'git cl upload -o uploadvalidator~skip\n\n' |
| 2545 | 'If git-cl is not working correctly, file a bug under the ' |
| 2546 | 'Infra>SDK component.') |
Josip Sokcevic | 54e30e7 | 2022-02-10 22:32:24 +0000 | [diff] [blame] | 2547 | if 'git push -o nokeycheck' in str(e.stdout): |
| 2548 | raise GitPushError( |
| 2549 | 'Failed to create a change, very likely due to a private key being ' |
| 2550 | 'detected. Please examine output above for the reason of the ' |
| 2551 | 'failure.\n' |
| 2552 | 'If this is a false positive, you can try to bypass private key ' |
| 2553 | 'detection by using push option ' |
| 2554 | '-o nokeycheck, e.g.:\n' |
| 2555 | 'git cl upload -o nokeycheck\n\n' |
| 2556 | 'If git-cl is not working correctly, file a bug under the ' |
| 2557 | 'Infra>SDK component.') |
Josip Sokcevic | 740825e | 2021-05-12 18:28:34 +0000 | [diff] [blame] | 2558 | |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2559 | raise GitPushError( |
| 2560 | 'Failed to create a change. Please examine output above for the ' |
| 2561 | 'reason of the failure.\n' |
Josip Sokcevic | 7386a1e | 2021-02-12 19:00:34 +0000 | [diff] [blame] | 2562 | 'For emergencies, Googlers can escalate to ' |
| 2563 | 'go/gob-support or go/notify#gob\n' |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2564 | 'Hint: run command below to diagnose common Git/Gerrit ' |
| 2565 | 'credential problems:\n' |
| 2566 | ' git cl creds-check\n' |
| 2567 | '\n' |
| 2568 | 'If git-cl is not working correctly, file a bug under the Infra>SDK ' |
| 2569 | 'component including the files below.\n' |
| 2570 | 'Review the files before upload, since they might contain sensitive ' |
| 2571 | 'information.\n' |
| 2572 | 'Set the Restrict-View-Google label so that they are not publicly ' |
| 2573 | 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name}) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2574 | finally: |
| 2575 | execution_time = time_time() - before_push |
| 2576 | metrics.collector.add_repeated('sub_commands', { |
| 2577 | 'command': 'git push', |
| 2578 | 'execution_time': execution_time, |
| 2579 | 'exit_code': push_returncode, |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2580 | 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts), |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2581 | }) |
| 2582 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2583 | git_push_metadata['execution_time'] = execution_time |
| 2584 | git_push_metadata['exit_code'] = push_returncode |
Edward Lemur | 5737f02 | 2019-05-17 01:24:00 +0000 | [diff] [blame] | 2585 | self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata) |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2586 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2587 | self._CleanUpOldTraces() |
Edward Lemur | 0f58ae4 | 2019-04-30 17:24:12 +0000 | [diff] [blame] | 2588 | gclient_utils.rmtree(traces_dir) |
| 2589 | |
| 2590 | return push_stdout |
| 2591 | |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2592 | def CMDUploadChange(self, options, git_diff_args, custom_cl_base, |
| 2593 | change_desc): |
| 2594 | """Upload the current branch to Gerrit, retry if new remote HEAD is |
| 2595 | found. options and change_desc may be mutated.""" |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2596 | remote, remote_branch = self.GetRemoteBranch() |
| 2597 | branch = GetTargetRef(remote, remote_branch, options.target_branch) |
| 2598 | |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2599 | try: |
| 2600 | return self._CMDUploadChange(options, git_diff_args, custom_cl_base, |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2601 | change_desc, branch) |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2602 | except GitPushError as e: |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2603 | # Repository might be in the middle of transition to main branch as |
| 2604 | # default, and uploads to old default might be blocked. |
| 2605 | if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]: |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2606 | DieWithError(str(e), change_desc) |
| 2607 | |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2608 | project_head = gerrit_util.GetProjectHead(self._gerrit_host, |
| 2609 | self.GetGerritProject()) |
| 2610 | if project_head == branch: |
| 2611 | DieWithError(str(e), change_desc) |
| 2612 | branch = project_head |
| 2613 | |
| 2614 | print("WARNING: Fetching remote state and retrying upload to default " |
| 2615 | "branch...") |
| 2616 | RunGit(['fetch', '--prune', remote]) |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2617 | options.edit_description = False |
| 2618 | options.force = True |
| 2619 | try: |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2620 | self._CMDUploadChange(options, git_diff_args, custom_cl_base, |
| 2621 | change_desc, branch) |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2622 | except GitPushError as e: |
| 2623 | DieWithError(str(e), change_desc) |
| 2624 | |
| 2625 | def _CMDUploadChange(self, options, git_diff_args, custom_cl_base, |
Josip Sokcevic | b631a88 | 2021-01-06 18:18:10 +0000 | [diff] [blame] | 2626 | change_desc, branch): |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2627 | """Upload the current branch to Gerrit.""" |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2628 | if options.squash: |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2629 | self._GerritCommitMsgHookCheck(offer_removal=not options.force) |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2630 | external_parent = None |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2631 | if self.GetIssue(): |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 2632 | # User requested to change description |
| 2633 | if options.edit_description: |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 2634 | change_desc.prompt() |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2635 | change_detail = self._GetChangeDetail(['CURRENT_REVISION']) |
| 2636 | change_id = change_detail['change_id'] |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 2637 | change_desc.ensure_change_id(change_id) |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2638 | |
| 2639 | # Check if changes outside of this workspace have been uploaded. |
| 2640 | current_rev = change_detail['current_revision'] |
| 2641 | last_uploaded_rev = self._GitGetBranchConfigValue( |
| 2642 | GERRIT_SQUASH_HASH_CONFIG_KEY) |
| 2643 | if last_uploaded_rev and current_rev != last_uploaded_rev: |
| 2644 | external_parent = self._UpdateWithExternalChanges() |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 2645 | else: # if not self.GetIssue() |
Gavin Mak | 68e6cf3 | 2021-01-25 18:24:08 +0000 | [diff] [blame] | 2646 | if not options.force and not options.message_file: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2647 | change_desc.prompt() |
Andrii Shyshkalov | 8c90d03 | 2017-04-19 21:27:26 +0200 | [diff] [blame] | 2648 | change_ids = git_footers.get_footer_change_id(change_desc.description) |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 2649 | if len(change_ids) == 1: |
| 2650 | change_id = change_ids[0] |
| 2651 | else: |
| 2652 | change_id = GenerateGerritChangeId(change_desc.description) |
| 2653 | change_desc.ensure_change_id(change_id) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2654 | |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 2655 | if options.preserve_tryjobs: |
| 2656 | change_desc.set_preserve_tryjobs() |
Robert Iannucci | db02dd0 | 2017-04-19 12:18:20 -0700 | [diff] [blame] | 2657 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2658 | remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch()) |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2659 | parent = external_parent or self._ComputeParent( |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 2660 | remote, upstream_branch, custom_cl_base, options.force, change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2661 | tree = RunGit(['rev-parse', 'HEAD:']).strip() |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 2662 | with gclient_utils.temporary_file() as desc_tempfile: |
| 2663 | gclient_utils.FileWrite(desc_tempfile, change_desc.description) |
| 2664 | ref_to_push = RunGit( |
| 2665 | ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip() |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 2666 | else: # if not options.squash |
Gregory Nisbet | 48d9e1e | 2021-04-15 23:35:54 +0000 | [diff] [blame] | 2667 | if options.no_add_changeid: |
| 2668 | pass |
| 2669 | else: # adding Change-Ids is okay. |
| 2670 | if not git_footers.get_footer_change_id(change_desc.description): |
| 2671 | DownloadGerritHook(False) |
| 2672 | change_desc.set_description( |
| 2673 | self._AddChangeIdToCommitMessage(change_desc.description, |
| 2674 | git_diff_args)) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2675 | ref_to_push = 'HEAD' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2676 | # For no-squash mode, we assume the remote called "origin" is the one we |
| 2677 | # want. It is not worthwhile to support different workflows for |
| 2678 | # no-squash mode. |
| 2679 | parent = 'origin/%s' % branch |
Gregory Nisbet | 48d9e1e | 2021-04-15 23:35:54 +0000 | [diff] [blame] | 2680 | # attempt to extract the changeid from the current description |
| 2681 | # fail informatively if not possible. |
| 2682 | change_id_candidates = git_footers.get_footer_change_id( |
| 2683 | change_desc.description) |
| 2684 | if not change_id_candidates: |
| 2685 | DieWithError("Unable to extract change-id from message.") |
| 2686 | change_id = change_id_candidates[0] |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2687 | |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 2688 | SaveDescriptionBackup(change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2689 | commits = RunGitSilent(['rev-list', '%s..%s' % (parent, |
| 2690 | ref_to_push)]).splitlines() |
| 2691 | if len(commits) > 1: |
| 2692 | print('WARNING: This will upload %d commits. Run the following command ' |
| 2693 | 'to see which commits will be uploaded: ' % len(commits)) |
| 2694 | print('git log %s..%s' % (parent, ref_to_push)) |
| 2695 | print('You can also use `git squash-branch` to squash these into a ' |
| 2696 | 'single commit.') |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2697 | confirm_or_exit(action='upload') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2698 | |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2699 | reviewers = sorted(change_desc.get_reviewers()) |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2700 | cc = [] |
Joanna Wang | c8f23e2 | 2023-01-19 21:18:10 +0000 | [diff] [blame] | 2701 | # Add CCs from WATCHLISTS and rietveld.cc git config unless this is |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2702 | # the initial upload, the CL is private, or auto-CCing has ben disabled. |
| 2703 | if not (self.GetIssue() or options.private or options.no_autocc): |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2704 | cc = self.GetCCList().split(',') |
Gavin Mak | b1c08f6 | 2021-04-01 18:05:58 +0000 | [diff] [blame] | 2705 | if len(cc) > 100: |
| 2706 | lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/' |
| 2707 | 'process/lsc/lsc_workflow.md') |
| 2708 | print('WARNING: This will auto-CC %s users.' % len(cc)) |
| 2709 | print('LSC may be more appropriate: %s' % lsc) |
| 2710 | print('You can also use the --no-autocc flag to disable auto-CC.') |
| 2711 | confirm_or_exit(action='continue') |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 2712 | # Add cc's from the --cc flag. |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2713 | if options.cc: |
| 2714 | cc.extend(options.cc) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2715 | cc = [email.strip() for email in cc if email.strip()] |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2716 | if change_desc.get_cced(): |
| 2717 | cc.extend(change_desc.get_cced()) |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2718 | if self.GetGerritHost() == 'chromium-review.googlesource.com': |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 2719 | valid_accounts = set(reviewers + cc) |
| 2720 | # TODO(crbug/877717): relax this for all hosts. |
| 2721 | else: |
| 2722 | valid_accounts = gerrit_util.ValidAccounts( |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2723 | self.GetGerritHost(), reviewers + cc) |
Andrii Shyshkalov | f170af4 | 2018-10-30 07:00:44 +0000 | [diff] [blame] | 2724 | logging.info('accounts %s are recognized, %s invalid', |
| 2725 | sorted(valid_accounts), |
| 2726 | set(reviewers + cc).difference(set(valid_accounts))) |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 2727 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2728 | # Extra options that can be specified at push time. Doc: |
| 2729 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2730 | refspec_opts = [] |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2731 | |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 2732 | # By default, new changes are started in WIP mode, and subsequent patchsets |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 2733 | # don't send email. At any time, passing --send-mail or --send-email will |
| 2734 | # mark the change ready and send email for that particular patch. |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2735 | if options.send_mail: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2736 | refspec_opts.append('ready') |
| 2737 | refspec_opts.append('notify=ALL') |
Jamie Madill | 276da0b | 2018-04-27 14:41:20 -0400 | [diff] [blame] | 2738 | elif not self.GetIssue() and options.squash: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2739 | refspec_opts.append('wip') |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 2740 | else: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2741 | refspec_opts.append('notify=NONE') |
Aaron Gable | 70f4e24 | 2017-06-26 10:45:59 -0700 | [diff] [blame] | 2742 | |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 2743 | # TODO(tandrii): options.message should be posted as a comment if |
| 2744 | # --send-mail or --send-email is set on non-initial upload as Rietveld used |
| 2745 | # to do it. |
Andrii Shyshkalov | 2d8a207 | 2017-04-10 15:02:18 +0200 | [diff] [blame] | 2746 | |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2747 | # Set options.title in case user was prompted in _GetTitleForUpload and |
| 2748 | # _CMDUploadChange needs to be called again. |
| 2749 | options.title = self._GetTitleForUpload(options) |
| 2750 | if options.title: |
Nick Carter | 8692b18 | 2017-11-06 16:30:38 -0800 | [diff] [blame] | 2751 | # Punctuation and whitespace in |title| must be percent-encoded. |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2752 | refspec_opts.append( |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2753 | 'm=' + gerrit_util.PercentEncodeForGitRef(options.title)) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 2754 | |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2755 | if options.private: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2756 | refspec_opts.append('private') |
agable | c678797 | 2016-09-09 16:13:34 -0700 | [diff] [blame] | 2757 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2758 | for r in sorted(reviewers): |
| 2759 | if r in valid_accounts: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2760 | refspec_opts.append('r=%s' % r) |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2761 | reviewers.remove(r) |
| 2762 | else: |
| 2763 | # TODO(tandrii): this should probably be a hard failure. |
| 2764 | print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping' |
| 2765 | % r) |
| 2766 | for c in sorted(cc): |
| 2767 | # refspec option will be rejected if cc doesn't correspond to an |
| 2768 | # account, even though REST call to add such arbitrary cc may succeed. |
| 2769 | if c in valid_accounts: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2770 | refspec_opts.append('cc=%s' % c) |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2771 | cc.remove(c) |
| 2772 | |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2773 | if options.topic: |
| 2774 | # Documentation on Gerrit topics is here: |
| 2775 | # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2776 | refspec_opts.append('topic=%s' % options.topic) |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 2777 | |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2778 | if options.enable_auto_submit: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2779 | refspec_opts.append('l=Auto-Submit+1') |
Edward Lesmes | 10c3dd6 | 2021-02-08 21:13:57 +0000 | [diff] [blame] | 2780 | if options.set_bot_commit: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2781 | refspec_opts.append('l=Bot-Commit+1') |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2782 | if options.use_commit_queue: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2783 | refspec_opts.append('l=Commit-Queue+2') |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2784 | elif options.cq_dry_run: |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2785 | refspec_opts.append('l=Commit-Queue+1') |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 2786 | elif options.cq_quick_run: |
| 2787 | refspec_opts.append('l=Commit-Queue+1') |
| 2788 | refspec_opts.append('l=Quick-Run+1') |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 2789 | |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2790 | # Gerrit sorts hashtags, so order is not important. |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2791 | hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags} |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 2792 | if not self.GetIssue(): |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 2793 | hashtags.update(change_desc.get_hash_tags()) |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2794 | refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)] |
| 2795 | |
| 2796 | refspec_suffix = '' |
| 2797 | if refspec_opts: |
| 2798 | refspec_suffix = '%' + ','.join(refspec_opts) |
| 2799 | assert ' ' not in refspec_suffix, ( |
| 2800 | 'spaces not allowed in refspec: "%s"' % refspec_suffix) |
| 2801 | refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix) |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 2802 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2803 | git_push_metadata = { |
Edward Lesmes | eeca9c6 | 2020-11-20 00:00:17 +0000 | [diff] [blame] | 2804 | 'gerrit_host': self.GetGerritHost(), |
Josip Sokcevic | f736cab | 2020-10-20 23:41:38 +0000 | [diff] [blame] | 2805 | 'title': options.title or '<untitled>', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 2806 | 'change_id': change_id, |
| 2807 | 'description': change_desc.description, |
| 2808 | } |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 2809 | |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2810 | # Gerrit may or may not update fast enough to return the correct patchset |
| 2811 | # number after we push. Get the pre-upload patchset and increment later. |
| 2812 | latest_ps = self.GetMostRecentPatchset(update=False) or 0 |
| 2813 | |
Josip Sokcevic | d0ba91f | 2021-03-29 20:12:09 +0000 | [diff] [blame] | 2814 | push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts, |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 2815 | git_push_metadata, |
| 2816 | options.push_options) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2817 | |
| 2818 | if options.squash: |
Aaron Gable | 289b431 | 2017-09-13 14:06:16 -0700 | [diff] [blame] | 2819 | regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2820 | change_numbers = [m.group(1) |
| 2821 | for m in map(regex.match, push_stdout.splitlines()) |
| 2822 | if m] |
| 2823 | if len(change_numbers) != 1: |
| 2824 | DieWithError( |
| 2825 | ('Created|Updated %d issues on Gerrit, but only 1 expected.\n' |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 2826 | 'Change-Id: %s') % (len(change_numbers), change_id), change_desc) |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2827 | self.SetIssue(change_numbers[0]) |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2828 | self.SetPatchset(latest_ps + 1) |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 2829 | self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push) |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 2830 | |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 2831 | if self.GetIssue() and (reviewers or cc): |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 2832 | # GetIssue() is not set in case of non-squash uploads according to tests. |
Aaron Gable | 6e7ddb6 | 2020-05-27 22:23:29 +0000 | [diff] [blame] | 2833 | # TODO(crbug.com/751901): non-squash uploads in git cl should be removed. |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 2834 | gerrit_util.AddReviewers(self.GetGerritHost(), |
| 2835 | self._GerritChangeIdentifier(), |
| 2836 | reviewers, |
| 2837 | cc, |
| 2838 | notify=bool(options.send_mail)) |
Aaron Gable | 6dadfbf | 2017-05-09 14:27:58 -0700 | [diff] [blame] | 2839 | |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 2840 | return 0 |
| 2841 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2842 | def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force, |
| 2843 | change_desc): |
| 2844 | """Computes parent of the generated commit to be uploaded to Gerrit. |
| 2845 | |
| 2846 | Returns revision or a ref name. |
| 2847 | """ |
| 2848 | if custom_cl_base: |
| 2849 | # Try to avoid creating additional unintended CLs when uploading, unless |
| 2850 | # user wants to take this risk. |
| 2851 | local_ref_of_target_remote = self.GetRemoteBranch()[1] |
| 2852 | code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base, |
| 2853 | local_ref_of_target_remote]) |
| 2854 | if code == 1: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2855 | print('\nWARNING: Manually specified base of this CL `%s` ' |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2856 | 'doesn\'t seem to belong to target remote branch `%s`.\n\n' |
| 2857 | 'If you proceed with upload, more than 1 CL may be created by ' |
| 2858 | 'Gerrit as a result, in turn confusing or crashing git cl.\n\n' |
| 2859 | 'If you are certain that specified base `%s` has already been ' |
| 2860 | 'uploaded to Gerrit as another CL, you may proceed.\n' % |
| 2861 | (custom_cl_base, local_ref_of_target_remote, custom_cl_base)) |
| 2862 | if not force: |
| 2863 | confirm_or_exit( |
| 2864 | 'Do you take responsibility for cleaning up potential mess ' |
| 2865 | 'resulting from proceeding with upload?', |
| 2866 | action='upload') |
| 2867 | return custom_cl_base |
| 2868 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2869 | if remote != '.': |
| 2870 | return self.GetCommonAncestorWithUpstream() |
| 2871 | |
| 2872 | # If our upstream branch is local, we base our squashed commit on its |
| 2873 | # squashed version. |
| 2874 | upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch) |
| 2875 | |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2876 | if upstream_branch_name == 'master': |
Aaron Gable | 0bbd1c2 | 2017-05-08 14:37:08 -0700 | [diff] [blame] | 2877 | return self.GetCommonAncestorWithUpstream() |
Glen Robertson | 7d98e22 | 2020-08-27 17:53:11 +0000 | [diff] [blame] | 2878 | if upstream_branch_name == 'main': |
| 2879 | return self.GetCommonAncestorWithUpstream() |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2880 | |
| 2881 | # Check the squashed hash of the parent. |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 2882 | # TODO(tandrii): consider checking parent change in Gerrit and using its |
| 2883 | # hash if tree hash of latest parent revision (patchset) in Gerrit matches |
| 2884 | # the tree hash of the parent branch. The upside is less likely bogus |
| 2885 | # requests to reupload parent change just because it's uploadhash is |
| 2886 | # missing, yet the downside likely exists, too (albeit unknown to me yet). |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 2887 | parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name, |
| 2888 | GERRIT_SQUASH_HASH_CONFIG_KEY) |
Aaron Gable | f97e33d | 2017-03-30 15:44:27 -0700 | [diff] [blame] | 2889 | # Verify that the upstream branch has been uploaded too, otherwise |
| 2890 | # Gerrit will create additional CLs when uploading. |
| 2891 | if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) != |
| 2892 | RunGitSilent(['rev-parse', parent + ':'])): |
| 2893 | DieWithError( |
| 2894 | '\nUpload upstream branch %s first.\n' |
| 2895 | 'It is likely that this branch has been rebased since its last ' |
| 2896 | 'upload, so you just need to upload it again.\n' |
| 2897 | '(If you uploaded it with --no-squash, then branch dependencies ' |
| 2898 | 'are not supported, and you should reupload with --squash.)' |
| 2899 | % upstream_branch_name, |
| 2900 | change_desc) |
| 2901 | return parent |
| 2902 | |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2903 | def _UpdateWithExternalChanges(self): |
| 2904 | """Updates workspace with external changes. |
| 2905 | |
| 2906 | Returns the commit hash that should be used as the merge base on upload. |
| 2907 | """ |
| 2908 | local_ps = self.GetPatchset() |
| 2909 | if local_ps is None: |
| 2910 | return |
| 2911 | |
| 2912 | external_ps = self.GetMostRecentPatchset(update=False) |
Gavin Mak | f35a9eb | 2022-11-17 18:34:36 +0000 | [diff] [blame] | 2913 | if external_ps is None or local_ps == external_ps or \ |
| 2914 | not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps): |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2915 | return |
| 2916 | |
| 2917 | num_changes = external_ps - local_ps |
Gavin Mak | 6f90547 | 2023-01-06 21:01:36 +0000 | [diff] [blame] | 2918 | if num_changes > 1: |
| 2919 | change_words = 'changes were' |
| 2920 | else: |
| 2921 | change_words = 'change was' |
| 2922 | print('\n%d external %s published to %s:\n' % |
| 2923 | (num_changes, change_words, self.GetIssueURL(short=True))) |
| 2924 | |
| 2925 | # Print an overview of external changes. |
| 2926 | ps_to_commit = {} |
| 2927 | ps_to_info = {} |
| 2928 | revisions = self._GetChangeDetail(['ALL_REVISIONS']) |
| 2929 | for commit_id, revision_info in revisions.get('revisions', {}).items(): |
| 2930 | ps_num = revision_info['_number'] |
| 2931 | ps_to_commit[ps_num] = commit_id |
| 2932 | ps_to_info[ps_num] = revision_info |
| 2933 | |
| 2934 | for ps in range(external_ps, local_ps, -1): |
| 2935 | commit = ps_to_commit[ps][:8] |
| 2936 | desc = ps_to_info[ps].get('description', '') |
| 2937 | print('Patchset %d [%s] %s' % (ps, commit, desc)) |
| 2938 | |
| 2939 | if not ask_for_explicit_yes('\nUploading as-is will override them. ' |
| 2940 | 'Get the latest changes and apply?'): |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2941 | return |
| 2942 | |
| 2943 | # Get latest Gerrit merge base. Use the first parent even if multiple exist. |
| 2944 | external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0] |
| 2945 | external_base = external_parent['commit'] |
| 2946 | |
| 2947 | branch = git_common.current_branch() |
| 2948 | local_base = self.GetCommonAncestorWithUpstream() |
| 2949 | if local_base != external_base: |
| 2950 | print('\nLocal merge base %s is different from Gerrit %s.\n' % |
| 2951 | (local_base, external_base)) |
| 2952 | if git_common.upstream(branch): |
| 2953 | DieWithError('Upstream branch set. Consider using `git rebase-update` ' |
| 2954 | 'to make these the same.') |
| 2955 | print('No upstream branch set. Consider setting it and using ' |
| 2956 | '`git rebase-update`.\nContinuing upload with Gerrit merge base.') |
| 2957 | |
| 2958 | # Fetch Gerrit's CL base if it doesn't exist locally. |
| 2959 | remote, _ = self.GetRemoteBranch() |
| 2960 | if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base): |
| 2961 | RunGitSilent(['fetch', remote, external_base]) |
| 2962 | |
| 2963 | # Get the diff between local_ps and external_ps. |
| 2964 | issue = self.GetIssue() |
Gavin Mak | 591ebaf | 2022-12-06 18:05:07 +0000 | [diff] [blame] | 2965 | changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue) |
Gavin Mak | 4e5e399 | 2022-11-14 22:40:12 +0000 | [diff] [blame] | 2966 | RunGitSilent(['fetch', remote, changes_ref + str(local_ps)]) |
| 2967 | last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip() |
| 2968 | RunGitSilent(['fetch', remote, changes_ref + str(external_ps)]) |
| 2969 | latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip() |
| 2970 | diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)]) |
| 2971 | |
| 2972 | # Diff can be empty in the case of trivial rebases. |
| 2973 | if not diff: |
| 2974 | return external_base |
| 2975 | |
| 2976 | # Apply the diff. |
| 2977 | with gclient_utils.temporary_file() as diff_tempfile: |
| 2978 | gclient_utils.FileWrite(diff_tempfile, diff) |
| 2979 | clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0 |
| 2980 | RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile]) |
| 2981 | if not clean_patch: |
| 2982 | # Normally patchset is set after upload. But because we exit, that never |
| 2983 | # happens. Updating here makes sure that subsequent uploads don't need |
| 2984 | # to fetch/apply the same diff again. |
| 2985 | self.SetPatchset(external_ps) |
| 2986 | DieWithError('\nPatch did not apply cleanly. Please resolve any ' |
| 2987 | 'conflicts and reupload.') |
| 2988 | |
| 2989 | message = 'Incorporate external changes from ' |
| 2990 | if num_changes == 1: |
| 2991 | message += 'patchset %d' % external_ps |
| 2992 | else: |
| 2993 | message += 'patchsets %d to %d' % (local_ps + 1, external_ps) |
| 2994 | RunGitSilent(['commit', '-am', message]) |
| 2995 | # TODO(crbug.com/1382528): Use the previous commit's message as a default |
| 2996 | # patchset title instead of this 'Incorporate' message. |
| 2997 | return external_base |
| 2998 | |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 2999 | def _AddChangeIdToCommitMessage(self, log_desc, args): |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 3000 | """Re-commits using the current message, assumes the commit hook is in |
| 3001 | place. |
| 3002 | """ |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 3003 | RunGit(['commit', '--amend', '-m', log_desc]) |
Andrii Shyshkalov | b07575f | 2018-10-16 06:16:21 +0000 | [diff] [blame] | 3004 | new_log_desc = _create_description_from_log(args) |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 3005 | if git_footers.get_footer_change_id(new_log_desc): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3006 | print('git-cl: Added Change-Id to commit message.') |
tandrii@chromium.org | 8930b3d | 2016-04-13 14:47:02 +0000 | [diff] [blame] | 3007 | return new_log_desc |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 3008 | |
| 3009 | DieWithError('ERROR: Gerrit commit-msg hook not installed.') |
tandrii@chromium.org | aa6235b | 2016-04-11 21:35:29 +0000 | [diff] [blame] | 3010 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 3011 | def CannotTriggerTryJobReason(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3012 | try: |
| 3013 | data = self._GetChangeDetail() |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 3014 | except GerritChangeNotExists: |
| 3015 | return 'Gerrit doesn\'t know about your change %s' % self.GetIssue() |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3016 | |
| 3017 | if data['status'] in ('ABANDONED', 'MERGED'): |
| 3018 | return 'CL %s is closed' % self.GetIssue() |
| 3019 | |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3020 | def GetGerritChange(self, patchset=None): |
| 3021 | """Returns a buildbucket.v2.GerritChange message for the current issue.""" |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3022 | host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3023 | issue = self.GetIssue() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 3024 | patchset = int(patchset or self.GetPatchset()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3025 | data = self._GetChangeDetail(['ALL_REVISIONS']) |
| 3026 | |
| 3027 | assert host and issue and patchset, 'CL must be uploaded first' |
| 3028 | |
| 3029 | has_patchset = any( |
| 3030 | int(revision_data['_number']) == patchset |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3031 | for revision_data in data['revisions'].values()) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3032 | if not has_patchset: |
Aaron Gable | a45ee11 | 2016-11-22 15:14:38 -0800 | [diff] [blame] | 3033 | raise Exception('Patchset %d is not known in Gerrit change %d' % |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3034 | (patchset, self.GetIssue())) |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3035 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3036 | return { |
Edward Lemur | d4d1ba4 | 2019-09-20 21:46:37 +0000 | [diff] [blame] | 3037 | 'host': host, |
| 3038 | 'change': issue, |
| 3039 | 'project': data['project'], |
| 3040 | 'patchset': patchset, |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3041 | } |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 3042 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 3043 | def GetIssueOwner(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 3044 | return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email'] |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 3045 | |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 3046 | def GetReviewers(self): |
| 3047 | details = self._GetChangeDetail(['DETAILED_ACCOUNTS']) |
Mohamed Heikal | 171c074 | 2018-11-09 20:38:51 +0000 | [diff] [blame] | 3048 | return [r['email'] for r in details['reviewers'].get('REVIEWER', [])] |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 3049 | |
tandrii@chromium.org | d68b62b | 2016-03-31 16:09:29 +0000 | [diff] [blame] | 3050 | |
Lei Zhang | 8a0efc1 | 2020-08-05 19:58:45 +0000 | [diff] [blame] | 3051 | def _get_bug_line_values(default_project_prefix, bugs): |
| 3052 | """Given default_project_prefix and comma separated list of bugs, yields bug |
| 3053 | line values. |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3054 | |
| 3055 | Each bug can be either: |
Lei Zhang | 8a0efc1 | 2020-08-05 19:58:45 +0000 | [diff] [blame] | 3056 | * a number, which is combined with default_project_prefix |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3057 | * string, which is left as is. |
| 3058 | |
| 3059 | This function may produce more than one line, because bugdroid expects one |
| 3060 | project per line. |
| 3061 | |
Lei Zhang | 8a0efc1 | 2020-08-05 19:58:45 +0000 | [diff] [blame] | 3062 | >>> list(_get_bug_line_values('v8:', '123,chromium:789')) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3063 | ['v8:123', 'chromium:789'] |
| 3064 | """ |
| 3065 | default_bugs = [] |
| 3066 | others = [] |
| 3067 | for bug in bugs.split(','): |
| 3068 | bug = bug.strip() |
| 3069 | if bug: |
| 3070 | try: |
| 3071 | default_bugs.append(int(bug)) |
| 3072 | except ValueError: |
| 3073 | others.append(bug) |
| 3074 | |
| 3075 | if default_bugs: |
| 3076 | default_bugs = ','.join(map(str, default_bugs)) |
Lei Zhang | 8a0efc1 | 2020-08-05 19:58:45 +0000 | [diff] [blame] | 3077 | if default_project_prefix: |
| 3078 | if not default_project_prefix.endswith(':'): |
| 3079 | default_project_prefix += ':' |
| 3080 | yield '%s%s' % (default_project_prefix, default_bugs) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3081 | else: |
| 3082 | yield default_bugs |
| 3083 | for other in sorted(others): |
| 3084 | # Don't bother finding common prefixes, CLs with >2 bugs are very very rare. |
| 3085 | yield other |
| 3086 | |
| 3087 | |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3088 | class ChangeDescription(object): |
| 3089 | """Contains a parsed form of the change description.""" |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 3090 | R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$' |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 3091 | CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 3092 | BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$' |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 3093 | FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$' |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 3094 | 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] | 3095 | STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*' |
| 3096 | BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]' |
Anthony Polito | 02b5af3 | 2019-12-02 19:49:47 +0000 | [diff] [blame] | 3097 | COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])' |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 3098 | BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+' |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3099 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 3100 | def __init__(self, description, bug=None, fixed=None): |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3101 | self._description_lines = (description or '').strip().splitlines() |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 3102 | if bug: |
| 3103 | regexp = re.compile(self.BUG_LINE) |
| 3104 | prefix = settings.GetBugPrefix() |
| 3105 | if not any((regexp.match(line) for line in self._description_lines)): |
| 3106 | values = list(_get_bug_line_values(prefix, bug)) |
| 3107 | self.append_footer('Bug: %s' % ', '.join(values)) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 3108 | if fixed: |
| 3109 | regexp = re.compile(self.FIXED_LINE) |
| 3110 | prefix = settings.GetBugPrefix() |
| 3111 | if not any((regexp.match(line) for line in self._description_lines)): |
| 3112 | values = list(_get_bug_line_values(prefix, fixed)) |
| 3113 | self.append_footer('Fixed: %s' % ', '.join(values)) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3114 | |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3115 | @property # www.logilab.org/ticket/89786 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 3116 | def description(self): # pylint: disable=method-hidden |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3117 | return '\n'.join(self._description_lines) |
| 3118 | |
| 3119 | def set_description(self, desc): |
| 3120 | if isinstance(desc, basestring): |
| 3121 | lines = desc.splitlines() |
| 3122 | else: |
| 3123 | lines = [line.rstrip() for line in desc] |
| 3124 | while lines and not lines[0]: |
| 3125 | lines.pop(0) |
| 3126 | while lines and not lines[-1]: |
| 3127 | lines.pop(-1) |
| 3128 | self._description_lines = lines |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3129 | |
Edward Lemur | 5a644f8 | 2020-03-18 16:44:57 +0000 | [diff] [blame] | 3130 | def ensure_change_id(self, change_id): |
| 3131 | description = self.description |
| 3132 | footer_change_ids = git_footers.get_footer_change_id(description) |
| 3133 | # Make sure that the Change-Id in the description matches the given one. |
| 3134 | if footer_change_ids != [change_id]: |
| 3135 | if footer_change_ids: |
| 3136 | # Remove any existing Change-Id footers since they don't match the |
| 3137 | # expected change_id footer. |
| 3138 | description = git_footers.remove_footer(description, 'Change-Id') |
| 3139 | print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` ' |
| 3140 | 'if you want to set a new one.') |
| 3141 | # Add the expected Change-Id footer. |
| 3142 | description = git_footers.add_footer_change_id(description, change_id) |
| 3143 | self.set_description(description) |
| 3144 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3145 | def update_reviewers(self, reviewers): |
| 3146 | """Rewrites the R= line(s) as a single line each. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 3147 | |
| 3148 | Args: |
| 3149 | reviewers (list(str)) - list of additional emails to use for reviewers. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 3150 | """ |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3151 | if not reviewers: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3152 | return |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 3153 | |
| 3154 | reviewers = set(reviewers) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3155 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3156 | # Get the set of R= lines and remove them from the description. |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3157 | regexp = re.compile(self.R_LINE) |
| 3158 | matches = [regexp.match(line) for line in self._description_lines] |
| 3159 | new_desc = [l for i, l in enumerate(self._description_lines) |
| 3160 | if not matches[i]] |
| 3161 | self.set_description(new_desc) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3162 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3163 | # Construct new unified R= lines. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 3164 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3165 | # First, update reviewers with names from the R= lines (if any). |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3166 | for match in matches: |
| 3167 | if not match: |
| 3168 | continue |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3169 | reviewers.update(cleanup_list([match.group(2).strip()])) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 3170 | |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3171 | new_r_line = 'R=' + ', '.join(sorted(reviewers)) |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3172 | |
| 3173 | # Put the new lines in the description where the old first R= line was. |
| 3174 | line_loc = next((i for i, match in enumerate(matches) if match), -1) |
| 3175 | if 0 <= line_loc < len(self._description_lines): |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3176 | self._description_lines.insert(line_loc, new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3177 | else: |
Joanna Wang | 39811b1 | 2023-01-20 23:09:48 +0000 | [diff] [blame] | 3178 | self.append_footer(new_r_line) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3179 | |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 3180 | def set_preserve_tryjobs(self): |
| 3181 | """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'.""" |
| 3182 | footers = git_footers.parse_footers(self.description) |
| 3183 | for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []): |
| 3184 | if v.lower() == 'true': |
| 3185 | return |
| 3186 | self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true') |
| 3187 | |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 3188 | def prompt(self): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3189 | """Asks the user to update the description.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3190 | self.set_description([ |
| 3191 | '# Enter a description of the change.', |
| 3192 | '# This will be displayed on the codereview site.', |
| 3193 | '# 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] | 3194 | '#--------------------This line is 72 characters long' |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3195 | '--------------------', |
| 3196 | ] + self._description_lines) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 3197 | bug_regexp = re.compile(self.BUG_LINE) |
| 3198 | fixed_regexp = re.compile(self.FIXED_LINE) |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 3199 | prefix = settings.GetBugPrefix() |
Sigurd Schneider | 8630bb1 | 2020-11-11 14:02:49 +0000 | [diff] [blame] | 3200 | has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l) |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 3201 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 3202 | if not any((has_issue(line) for line in self._description_lines)): |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 3203 | self.append_footer('Bug: %s' % prefix) |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 3204 | |
Bruce Dawson | fc48704 | 2020-10-27 19:11:37 +0000 | [diff] [blame] | 3205 | print('Waiting for editor...') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3206 | content = gclient_utils.RunEditor(self.description, True, |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3207 | git_editor=settings.GetGitEditor()) |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 3208 | if not content: |
| 3209 | DieWithError('Running editor failed') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3210 | lines = content.splitlines() |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3211 | |
Bruce Dawson | 2377b01 | 2018-01-11 16:46:49 -0800 | [diff] [blame] | 3212 | # Strip off comments and default inserted "Bug:" line. |
| 3213 | clean_lines = [line.rstrip() for line in lines if not |
Jonas Termansen | d0f7911 | 2019-03-22 15:28:26 +0000 | [diff] [blame] | 3214 | (line.startswith('#') or |
| 3215 | line.rstrip() == "Bug:" or |
| 3216 | line.rstrip() == "Bug: " + prefix)] |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3217 | if not clean_lines: |
maruel@chromium.org | 0e0436a | 2011-10-25 13:32:41 +0000 | [diff] [blame] | 3218 | DieWithError('No CL description, aborting') |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3219 | self.set_description(clean_lines) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3220 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3221 | def append_footer(self, line): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 3222 | """Adds a footer line to the description. |
| 3223 | |
| 3224 | Differentiates legacy "KEY=xxx" footers (used to be called tags) and |
| 3225 | Gerrit's footers in the form of "Footer-Key: footer any value" and ensures |
| 3226 | that Gerrit footers are always at the end. |
| 3227 | """ |
| 3228 | parsed_footer_line = git_footers.parse_footer(line) |
| 3229 | if parsed_footer_line: |
| 3230 | # Line is a gerrit footer in the form: Footer-Key: any value. |
| 3231 | # Thus, must be appended observing Gerrit footer rules. |
| 3232 | self.set_description( |
| 3233 | git_footers.add_footer(self.description, |
| 3234 | key=parsed_footer_line[0], |
| 3235 | value=parsed_footer_line[1])) |
| 3236 | return |
| 3237 | |
| 3238 | if not self._description_lines: |
| 3239 | self._description_lines.append(line) |
| 3240 | return |
| 3241 | |
| 3242 | top_lines, gerrit_footers, _ = git_footers.split_footers(self.description) |
| 3243 | if gerrit_footers: |
| 3244 | # git_footers.split_footers ensures that there is an empty line before |
| 3245 | # actual (gerrit) footers, if any. We have to keep it that way. |
| 3246 | assert top_lines and top_lines[-1] == '' |
| 3247 | top_lines, separator = top_lines[:-1], top_lines[-1:] |
| 3248 | else: |
| 3249 | separator = [] # No need for separator if there are no gerrit_footers. |
| 3250 | |
| 3251 | prev_line = top_lines[-1] if top_lines else '' |
| 3252 | if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or |
| 3253 | not presubmit_support.Change.TAG_LINE_RE.match(line)): |
| 3254 | top_lines.append('') |
| 3255 | top_lines.append(line) |
| 3256 | self._description_lines = top_lines + separator + gerrit_footers |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3257 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 3258 | def get_reviewers(self, tbr_only=False): |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 3259 | """Retrieves the list of reviewers.""" |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 3260 | matches = [re.match(self.R_LINE, line) for line in self._description_lines] |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 3261 | reviewers = [match.group(2).strip() |
| 3262 | for match in matches |
| 3263 | 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] | 3264 | return cleanup_list(reviewers) |
dpranke@chromium.org | 20254fc | 2011-03-22 18:28:59 +0000 | [diff] [blame] | 3265 | |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 3266 | def get_cced(self): |
| 3267 | """Retrieves the list of reviewers.""" |
| 3268 | matches = [re.match(self.CC_LINE, line) for line in self._description_lines] |
| 3269 | cced = [match.group(2).strip() for match in matches if match] |
| 3270 | return cleanup_list(cced) |
| 3271 | |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 3272 | def get_hash_tags(self): |
| 3273 | """Extracts and sanitizes a list of Gerrit hashtags.""" |
| 3274 | subject = (self._description_lines or ('',))[0] |
| 3275 | subject = re.sub( |
| 3276 | self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE) |
| 3277 | |
| 3278 | tags = [] |
| 3279 | start = 0 |
| 3280 | bracket_exp = re.compile(self.BRACKET_HASH_TAG) |
| 3281 | while True: |
| 3282 | m = bracket_exp.match(subject, start) |
| 3283 | if not m: |
| 3284 | break |
| 3285 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 3286 | start = m.end() |
| 3287 | |
| 3288 | if not tags: |
| 3289 | # Try "Tag: " prefix. |
| 3290 | m = re.match(self.COLON_SEPARATED_HASH_TAG, subject) |
| 3291 | if m: |
| 3292 | tags.append(self.sanitize_hash_tag(m.group(1))) |
| 3293 | return tags |
| 3294 | |
| 3295 | @classmethod |
| 3296 | def sanitize_hash_tag(cls, tag): |
| 3297 | """Returns a sanitized Gerrit hash tag. |
| 3298 | |
| 3299 | A sanitized hashtag can be used as a git push refspec parameter value. |
| 3300 | """ |
| 3301 | return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower() |
| 3302 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 3303 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3304 | def FindCodereviewSettingsFile(filename='codereview.settings'): |
| 3305 | """Finds the given file starting in the cwd and going up. |
| 3306 | |
| 3307 | Only looks up to the top of the repository unless an |
| 3308 | 'inherit-review-settings-ok' file exists in the root of the repository. |
| 3309 | """ |
| 3310 | inherit_ok_file = 'inherit-review-settings-ok' |
| 3311 | cwd = os.getcwd() |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 3312 | root = settings.GetRoot() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3313 | if os.path.isfile(os.path.join(root, inherit_ok_file)): |
Aleksey Khoroshilov | 2a22971 | 2022-06-02 16:24:11 +0000 | [diff] [blame] | 3314 | root = None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3315 | while True: |
Aleksey Khoroshilov | 2a22971 | 2022-06-02 16:24:11 +0000 | [diff] [blame] | 3316 | if os.path.isfile(os.path.join(cwd, filename)): |
| 3317 | return open(os.path.join(cwd, filename)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3318 | if cwd == root: |
| 3319 | break |
Aleksey Khoroshilov | 2a22971 | 2022-06-02 16:24:11 +0000 | [diff] [blame] | 3320 | parent_dir = os.path.dirname(cwd) |
| 3321 | if parent_dir == cwd: |
| 3322 | # We hit the system root directory. |
| 3323 | break |
| 3324 | cwd = parent_dir |
| 3325 | return None |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3326 | |
| 3327 | |
| 3328 | def LoadCodereviewSettingsFromFile(fileobj): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3329 | """Parses a codereview.settings file and updates hooks.""" |
maruel@chromium.org | 99ac1c5 | 2012-01-16 14:52:12 +0000 | [diff] [blame] | 3330 | keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3331 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3332 | def SetProperty(name, setting, unset_error_ok=False): |
| 3333 | fullname = 'rietveld.' + name |
| 3334 | if setting in keyvals: |
| 3335 | RunGit(['config', fullname, keyvals[setting]]) |
| 3336 | else: |
| 3337 | RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) |
| 3338 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 3339 | if not keyvals.get('GERRIT_HOST', False): |
| 3340 | SetProperty('server', 'CODE_REVIEW_SERVER') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3341 | # Only server setting is required. Other settings can be absent. |
| 3342 | # In that case, we ignore errors raised during option deletion attempt. |
Joanna Wang | c8f23e2 | 2023-01-19 21:18:10 +0000 | [diff] [blame] | 3343 | SetProperty('cc', 'CC_LIST', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3344 | SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) |
| 3345 | SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 3346 | SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 3347 | SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True) |
| 3348 | SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True) |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 3349 | SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK', |
| 3350 | unset_error_ok=True) |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 3351 | SetProperty( |
| 3352 | 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True) |
Dirk Pranke | 6f0df68 | 2021-06-25 00:42:33 +0000 | [diff] [blame] | 3353 | SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3354 | |
ukai@chromium.org | 7044efc | 2013-11-28 01:51:21 +0000 | [diff] [blame] | 3355 | if 'GERRIT_HOST' in keyvals: |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3356 | RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 3357 | |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3358 | if 'GERRIT_SQUASH_UPLOADS' in keyvals: |
Edward Lesmes | 4de5413 | 2020-05-05 19:41:33 +0000 | [diff] [blame] | 3359 | RunGit(['config', 'gerrit.squash-uploads', |
| 3360 | keyvals['GERRIT_SQUASH_UPLOADS']]) |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 3361 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3362 | if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals: |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 3363 | RunGit(['config', 'gerrit.skip-ensure-authenticated', |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 3364 | keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']]) |
| 3365 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3366 | if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 3367 | # should be of the form |
| 3368 | # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof |
| 3369 | # ORIGIN_URL_CONFIG: http://src.chromium.org/git |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3370 | RunGit(['config', keyvals['PUSH_URL_CONFIG'], |
| 3371 | keyvals['ORIGIN_URL_CONFIG']]) |
| 3372 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3373 | |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3374 | def urlretrieve(source, destination): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3375 | """Downloads a network object to a local file, like urllib.urlretrieve. |
| 3376 | |
| 3377 | This is necessary because urllib is broken for SSL connections via a proxy. |
| 3378 | """ |
Vadim Shtayura | f7b8f8f | 2021-11-15 19:10:05 +0000 | [diff] [blame] | 3379 | with open(destination, 'wb') as f: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3380 | f.write(urllib.request.urlopen(source).read()) |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3381 | |
| 3382 | |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3383 | def hasSheBang(fname): |
| 3384 | """Checks fname is a #! script.""" |
| 3385 | with open(fname) as f: |
| 3386 | return f.read(2).startswith('#!') |
| 3387 | |
| 3388 | |
tandrii@chromium.org | 18630d6 | 2016-03-04 12:06:02 +0000 | [diff] [blame] | 3389 | def DownloadGerritHook(force): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3390 | """Downloads and installs a Gerrit commit-msg hook. |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3391 | |
| 3392 | Args: |
| 3393 | force: True to update hooks. False to install hooks if not present. |
| 3394 | """ |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3395 | src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg' |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3396 | dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg') |
| 3397 | if not os.access(dst, os.X_OK): |
| 3398 | if os.path.exists(dst): |
| 3399 | if not force: |
| 3400 | return |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3401 | try: |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 3402 | urlretrieve(src, dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3403 | if not hasSheBang(dst): |
| 3404 | DieWithError('Not a script: %s\n' |
| 3405 | 'You need to download from\n%s\n' |
| 3406 | 'into .git/hooks/commit-msg and ' |
| 3407 | 'chmod +x .git/hooks/commit-msg' % (dst, src)) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3408 | os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) |
| 3409 | except Exception: |
| 3410 | if os.path.exists(dst): |
| 3411 | os.remove(dst) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 3412 | DieWithError('\nFailed to download hooks.\n' |
| 3413 | 'You need to download from\n%s\n' |
| 3414 | 'into .git/hooks/commit-msg and ' |
| 3415 | 'chmod +x .git/hooks/commit-msg' % src) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 3416 | |
| 3417 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3418 | class _GitCookiesChecker(object): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3419 | """Provides facilities for validating and suggesting fixes to .gitcookies.""" |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3420 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3421 | def __init__(self): |
| 3422 | # Cached list of [host, identity, source], where source is either |
| 3423 | # .gitcookies or .netrc. |
| 3424 | self._all_hosts = None |
| 3425 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3426 | def ensure_configured_gitcookies(self): |
| 3427 | """Runs checks and suggests fixes to make git use .gitcookies from default |
| 3428 | path.""" |
| 3429 | default = gerrit_util.CookiesAuthenticator.get_gitcookies_path() |
| 3430 | configured_path = RunGitSilent( |
| 3431 | ['config', '--global', 'http.cookiefile']).strip() |
Andrii Shyshkalov | 1e250cd | 2017-05-10 15:39:31 +0200 | [diff] [blame] | 3432 | configured_path = os.path.expanduser(configured_path) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3433 | if configured_path: |
| 3434 | self._ensure_default_gitcookies_path(configured_path, default) |
| 3435 | else: |
| 3436 | self._configure_gitcookies_path(default) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3437 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3438 | @staticmethod |
| 3439 | def _ensure_default_gitcookies_path(configured_path, default_path): |
| 3440 | assert configured_path |
| 3441 | if configured_path == default_path: |
| 3442 | print('git is already configured to use your .gitcookies from %s' % |
| 3443 | configured_path) |
| 3444 | return |
| 3445 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3446 | print('WARNING: You have configured custom path to .gitcookies: %s\n' |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3447 | 'Gerrit and other depot_tools expect .gitcookies at %s\n' % |
| 3448 | (configured_path, default_path)) |
| 3449 | |
| 3450 | if not os.path.exists(configured_path): |
| 3451 | print('However, your configured .gitcookies file is missing.') |
| 3452 | confirm_or_exit('Reconfigure git to use default .gitcookies?', |
| 3453 | action='reconfigure') |
| 3454 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3455 | return |
| 3456 | |
| 3457 | if os.path.exists(default_path): |
| 3458 | print('WARNING: default .gitcookies file already exists %s' % |
| 3459 | default_path) |
| 3460 | DieWithError('Please delete %s manually and re-run git cl creds-check' % |
| 3461 | default_path) |
| 3462 | |
| 3463 | confirm_or_exit('Move existing .gitcookies to default location?', |
| 3464 | action='move') |
| 3465 | shutil.move(configured_path, default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3466 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3467 | print('Moved and reconfigured git to use .gitcookies from %s' % |
| 3468 | default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3469 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3470 | @staticmethod |
| 3471 | def _configure_gitcookies_path(default_path): |
| 3472 | netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path() |
| 3473 | if os.path.exists(netrc_path): |
| 3474 | print('You seem to be using outdated .netrc for git credentials: %s' % |
| 3475 | netrc_path) |
| 3476 | print('This tool will guide you through setting up recommended ' |
| 3477 | '.gitcookies store for git credentials.\n' |
| 3478 | '\n' |
| 3479 | 'IMPORTANT: If something goes wrong and you decide to go back, do:\n' |
| 3480 | ' git config --global --unset http.cookiefile\n' |
| 3481 | ' mv %s %s.backup\n\n' % (default_path, default_path)) |
| 3482 | confirm_or_exit(action='setup .gitcookies') |
| 3483 | RunGit(['config', '--global', 'http.cookiefile', default_path]) |
| 3484 | print('Configured git to use .gitcookies from %s' % default_path) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3485 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3486 | def get_hosts_with_creds(self, include_netrc=False): |
| 3487 | if self._all_hosts is None: |
| 3488 | a = gerrit_util.CookiesAuthenticator() |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3489 | self._all_hosts = [(h, u, s) for h, u, s in itertools.chain(( |
| 3490 | (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), ( |
| 3491 | (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())) |
| 3492 | if h.endswith(_GOOGLESOURCE)] |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3493 | |
| 3494 | if include_netrc: |
| 3495 | return self._all_hosts |
| 3496 | return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc'] |
| 3497 | |
| 3498 | def print_current_creds(self, include_netrc=False): |
| 3499 | hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc)) |
| 3500 | if not hosts: |
| 3501 | print('No Git/Gerrit credentials found') |
| 3502 | return |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 3503 | lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)] |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3504 | header = [('Host', 'User', 'Which file'), |
| 3505 | ['=' * l for l in lengths]] |
| 3506 | for row in (header + hosts): |
| 3507 | print('\t'.join((('%%+%ds' % l) % s) |
| 3508 | for l, s in zip(lengths, row))) |
| 3509 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3510 | @staticmethod |
| 3511 | def _parse_identity(identity): |
Lei Zhang | d3f769a | 2017-12-15 15:16:14 -0800 | [diff] [blame] | 3512 | """Parses identity "git-<username>.domain" into <username> and domain.""" |
| 3513 | # Special case: usernames that contain ".", which are generally not |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 3514 | # distinguishable from sub-domains. But we do know typical domains: |
| 3515 | if identity.endswith('.chromium.org'): |
| 3516 | domain = 'chromium.org' |
| 3517 | username = identity[:-len('.chromium.org')] |
| 3518 | else: |
| 3519 | username, domain = identity.split('.', 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3520 | if username.startswith('git-'): |
| 3521 | username = username[len('git-'):] |
| 3522 | return username, domain |
| 3523 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3524 | def has_generic_host(self): |
| 3525 | """Returns whether generic .googlesource.com has been configured. |
| 3526 | |
| 3527 | Chrome Infra recommends to use explicit ${host}.googlesource.com instead. |
| 3528 | """ |
| 3529 | for host, _, _ in self.get_hosts_with_creds(include_netrc=False): |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3530 | if host == '.' + _GOOGLESOURCE: |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3531 | return True |
| 3532 | return False |
| 3533 | |
| 3534 | def _get_git_gerrit_identity_pairs(self): |
| 3535 | """Returns map from canonic host to pair of identities (Git, Gerrit). |
| 3536 | |
| 3537 | One of identities might be None, meaning not configured. |
| 3538 | """ |
| 3539 | host_to_identity_pairs = {} |
| 3540 | for host, identity, _ in self.get_hosts_with_creds(): |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3541 | canonical = _canonical_git_googlesource_host(host) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3542 | pair = host_to_identity_pairs.setdefault(canonical, [None, None]) |
| 3543 | idx = 0 if canonical == host else 1 |
| 3544 | pair[idx] = identity |
| 3545 | return host_to_identity_pairs |
| 3546 | |
| 3547 | def get_partially_configured_hosts(self): |
| 3548 | return set( |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3549 | (host if i1 else _canonical_gerrit_googlesource_host(host)) |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3550 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3551 | if None in (i1, i2) and host != '.' + _GOOGLESOURCE) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3552 | |
| 3553 | def get_conflicting_hosts(self): |
| 3554 | return set( |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3555 | host |
Marc-Antoine Ruel | 8e57b4b | 2019-10-11 01:01:36 +0000 | [diff] [blame] | 3556 | for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items() |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3557 | if None not in (i1, i2) and i1 != i2) |
| 3558 | |
| 3559 | def get_duplicated_hosts(self): |
| 3560 | 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] | 3561 | return set(host for host, count in counters.items() if count > 1) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3562 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 3563 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3564 | @staticmethod |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3565 | def _format_hosts(hosts, extra_column_func=None): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3566 | hosts = sorted(hosts) |
| 3567 | assert hosts |
| 3568 | if extra_column_func is None: |
| 3569 | extras = [''] * len(hosts) |
| 3570 | else: |
| 3571 | extras = [extra_column_func(host) for host in hosts] |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3572 | tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras))) |
| 3573 | lines = [] |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3574 | for he in zip(hosts, extras): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3575 | lines.append(tmpl % he) |
| 3576 | return lines |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3577 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3578 | def _find_problems(self): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3579 | if self.has_generic_host(): |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3580 | yield ('.googlesource.com wildcard record detected', |
| 3581 | ['Chrome Infrastructure team recommends to list full host names ' |
| 3582 | 'explicitly.'], |
| 3583 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3584 | |
| 3585 | dups = self.get_duplicated_hosts() |
| 3586 | if dups: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3587 | yield ('The following hosts were defined twice', |
| 3588 | self._format_hosts(dups), |
| 3589 | None) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3590 | |
| 3591 | partial = self.get_partially_configured_hosts() |
| 3592 | if partial: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3593 | yield ('Credentials should come in pairs for Git and Gerrit hosts. ' |
| 3594 | 'These hosts are missing', |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3595 | self._format_hosts( |
| 3596 | partial, lambda host: 'but %s defined' % _get_counterpart_host( |
| 3597 | host)), partial) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3598 | |
| 3599 | conflicting = self.get_conflicting_hosts() |
| 3600 | if conflicting: |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3601 | yield ('The following Git hosts have differing credentials from their ' |
| 3602 | 'Gerrit counterparts', |
| 3603 | self._format_hosts(conflicting, lambda host: '%s vs %s' % |
| 3604 | tuple(self._get_git_gerrit_identity_pairs()[host])), |
| 3605 | conflicting) |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3606 | |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3607 | def find_and_report_problems(self): |
| 3608 | """Returns True if there was at least one problem, else False.""" |
| 3609 | found = False |
| 3610 | bad_hosts = set() |
| 3611 | for title, sublines, hosts in self._find_problems(): |
| 3612 | if not found: |
| 3613 | found = True |
| 3614 | print('\n\n.gitcookies problem report:\n') |
| 3615 | bad_hosts.update(hosts or []) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3616 | print(' %s%s' % (title, (':' if sublines else ''))) |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3617 | if sublines: |
| 3618 | print() |
| 3619 | print(' %s' % '\n '.join(sublines)) |
| 3620 | print() |
| 3621 | |
| 3622 | if bad_hosts: |
| 3623 | assert found |
| 3624 | print(' You can manually remove corresponding lines in your %s file and ' |
| 3625 | 'visit the following URLs with correct account to generate ' |
| 3626 | 'correct credential lines:\n' % |
| 3627 | gerrit_util.CookiesAuthenticator.get_gitcookies_path()) |
Garrett Beaty | 08bb5c4 | 2022-09-21 17:34:20 +0000 | [diff] [blame] | 3628 | print(' %s' % '\n '.join( |
| 3629 | sorted( |
| 3630 | set(gerrit_util.CookiesAuthenticator().get_new_password_url( |
| 3631 | _canonical_git_googlesource_host(host)) |
| 3632 | for host in bad_hosts)))) |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 3633 | return found |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3634 | |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3635 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3636 | @metrics.collector.collect_metrics('git cl creds-check') |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3637 | def CMDcreds_check(parser, args): |
| 3638 | """Checks credentials and suggests changes.""" |
| 3639 | _, _ = parser.parse_args(args) |
| 3640 | |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3641 | # Code below checks .gitcookies. Abort if using something else. |
| 3642 | authn = gerrit_util.Authenticator.get() |
| 3643 | if not isinstance(authn, gerrit_util.CookiesAuthenticator): |
Edward Lemur | 57d4742 | 2020-03-06 20:43:07 +0000 | [diff] [blame] | 3644 | message = ( |
Vadim Shtayura | b250ec1 | 2018-10-04 00:21:08 +0000 | [diff] [blame] | 3645 | 'This command is not designed for bot environment. It checks ' |
| 3646 | '~/.gitcookies file not generally used on bots.') |
Edward Lemur | 57d4742 | 2020-03-06 20:43:07 +0000 | [diff] [blame] | 3647 | # TODO(crbug.com/1059384): Automatically detect when running on cloudtop. |
| 3648 | if isinstance(authn, gerrit_util.GceAuthenticator): |
| 3649 | message += ( |
| 3650 | '\n' |
| 3651 | 'If you need to run this on GCE or a cloudtop instance, ' |
| 3652 | 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.') |
| 3653 | DieWithError(message) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3654 | |
Andrii Shyshkalov | 517948b | 2017-03-15 15:51:59 +0100 | [diff] [blame] | 3655 | checker = _GitCookiesChecker() |
| 3656 | checker.ensure_configured_gitcookies() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3657 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3658 | print('Your .netrc and .gitcookies have credentials for these hosts:') |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3659 | checker.print_current_creds(include_netrc=True) |
| 3660 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3661 | if not checker.find_and_report_problems(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 3662 | print('\nNo problems detected in your .gitcookies file.') |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3663 | return 0 |
| 3664 | return 1 |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3665 | |
| 3666 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3667 | @metrics.collector.collect_metrics('git cl baseurl') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3668 | def CMDbaseurl(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3669 | """Gets or sets base-url for this branch.""" |
Thiago Perrotta | 16d08f0 | 2022-07-20 18:18:50 +0000 | [diff] [blame] | 3670 | _, args = parser.parse_args(args) |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 3671 | branchref = scm.GIT.GetBranchRef(settings.GetRoot()) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 3672 | branch = scm.GIT.ShortBranchName(branchref) |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3673 | if not args: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3674 | print('Current base-url:') |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3675 | return RunGit(['config', 'branch.%s.base-url' % branch], |
| 3676 | error_ok=False).strip() |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 3677 | |
| 3678 | print('Setting base-url to %s' % args[0]) |
| 3679 | return RunGit(['config', 'branch.%s.base-url' % branch, args[0]], |
| 3680 | error_ok=False).strip() |
kalmard@homejinni.com | 6b0051e | 2012-04-03 15:45:08 +0000 | [diff] [blame] | 3681 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3682 | |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3683 | def color_for_status(status): |
| 3684 | """Maps a Changelist status to color, for CMDstatus and other tools.""" |
Bruce Dawson | b73f8a9 | 2020-03-27 22:03:08 +0000 | [diff] [blame] | 3685 | BOLD = '\033[1m' |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3686 | return { |
Bruce Dawson | b73f8a9 | 2020-03-27 22:03:08 +0000 | [diff] [blame] | 3687 | 'unsent': BOLD + Fore.YELLOW, |
| 3688 | 'waiting': BOLD + Fore.RED, |
| 3689 | 'reply': BOLD + Fore.YELLOW, |
| 3690 | 'not lgtm': BOLD + Fore.RED, |
| 3691 | 'lgtm': BOLD + Fore.GREEN, |
| 3692 | 'commit': BOLD + Fore.MAGENTA, |
| 3693 | 'closed': BOLD + Fore.CYAN, |
| 3694 | 'error': BOLD + Fore.WHITE, |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3695 | }.get(status, Fore.WHITE) |
| 3696 | |
tandrii@chromium.org | 04ea846 | 2016-04-25 19:51:21 +0000 | [diff] [blame] | 3697 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 3698 | def get_cl_statuses(changes, fine_grained, max_processes=None): |
| 3699 | """Returns a blocking iterable of (cl, status) for given branches. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3700 | |
| 3701 | If fine_grained is true, this will fetch CL statuses from the server. |
| 3702 | Otherwise, simply indicate if there's a matching url for the given branches. |
| 3703 | |
| 3704 | If max_processes is specified, it is used as the maximum number of processes |
| 3705 | to spawn to fetch CL status from the server. Otherwise 1 process per branch is |
| 3706 | spawned. |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3707 | |
| 3708 | See GetStatus() for a list of possible statuses. |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3709 | """ |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3710 | if not changes: |
Edward Lemur | 61bf417 | 2020-02-24 23:22:37 +0000 | [diff] [blame] | 3711 | return |
calamity@chromium.org | cf19748 | 2016-04-29 20:15:53 +0000 | [diff] [blame] | 3712 | |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3713 | if not fine_grained: |
| 3714 | # Fast path which doesn't involve querying codereview servers. |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 3715 | # 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] | 3716 | for cl in changes: |
| 3717 | yield (cl, 'waiting' if cl.GetIssueURL() else 'error') |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3718 | return |
| 3719 | |
| 3720 | # First, sort out authentication issues. |
| 3721 | logging.debug('ensuring credentials exist') |
| 3722 | for cl in changes: |
| 3723 | cl.EnsureAuthenticated(force=False, refresh=True) |
| 3724 | |
| 3725 | def fetch(cl): |
| 3726 | try: |
| 3727 | return (cl, cl.GetStatus()) |
| 3728 | except: |
| 3729 | # See http://crbug.com/629863. |
Andrii Shyshkalov | 9882423 | 2018-04-19 11:37:15 -0700 | [diff] [blame] | 3730 | logging.exception('failed to fetch status for cl %s:', cl.GetIssue()) |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3731 | raise |
| 3732 | |
| 3733 | threads_count = len(changes) |
| 3734 | if max_processes: |
| 3735 | threads_count = max(1, min(threads_count, max_processes)) |
| 3736 | logging.debug('querying %d CLs using %d threads', len(changes), threads_count) |
| 3737 | |
Edward Lemur | 61bf417 | 2020-02-24 23:22:37 +0000 | [diff] [blame] | 3738 | pool = multiprocessing.pool.ThreadPool(threads_count) |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3739 | fetched_cls = set() |
| 3740 | try: |
| 3741 | it = pool.imap_unordered(fetch, changes).__iter__() |
| 3742 | while True: |
| 3743 | try: |
| 3744 | cl, status = it.next(timeout=5) |
Edward Lemur | 61bf417 | 2020-02-24 23:22:37 +0000 | [diff] [blame] | 3745 | except (multiprocessing.TimeoutError, StopIteration): |
Andrii Shyshkalov | 2f8e924 | 2017-01-23 19:20:19 +0100 | [diff] [blame] | 3746 | break |
| 3747 | fetched_cls.add(cl) |
| 3748 | yield cl, status |
| 3749 | finally: |
| 3750 | pool.close() |
| 3751 | |
| 3752 | # Add any branches that failed to fetch. |
| 3753 | for cl in set(changes) - fetched_cls: |
| 3754 | yield (cl, 'error') |
jsbell@chromium.org | b99fbd9 | 2014-09-11 17:29:28 +0000 | [diff] [blame] | 3755 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3756 | |
Jose Lopes | 3863fc5 | 2020-04-07 17:00:25 +0000 | [diff] [blame] | 3757 | def upload_branch_deps(cl, args, force=False): |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3758 | """Uploads CLs of local branches that are dependents of the current branch. |
| 3759 | |
| 3760 | If the local branch dependency tree looks like: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3761 | |
| 3762 | test1 -> test2.1 -> test3.1 |
| 3763 | -> test3.2 |
| 3764 | -> test2.2 -> test3.3 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3765 | |
| 3766 | and you run "git cl upload --dependencies" from test1 then "git cl upload" is |
| 3767 | run on the dependent branches in this order: |
| 3768 | test2.1, test3.1, test3.2, test2.2, test3.3 |
| 3769 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3770 | Note: This function does not rebase your local dependent branches. Use it |
| 3771 | when you make a change to the parent branch that will not conflict |
| 3772 | with its dependent branches, and you would like their dependencies |
| 3773 | updated in Rietveld. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3774 | """ |
| 3775 | if git_common.is_dirty_git_tree('upload-branch-deps'): |
| 3776 | return 1 |
| 3777 | |
| 3778 | root_branch = cl.GetBranch() |
| 3779 | if root_branch is None: |
| 3780 | DieWithError('Can\'t find dependent branches from detached HEAD state. ' |
| 3781 | 'Get on a branch!') |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 3782 | if not cl.GetIssue(): |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3783 | DieWithError('Current branch does not have an uploaded CL. We cannot set ' |
| 3784 | 'patchset dependencies without an uploaded CL.') |
| 3785 | |
| 3786 | branches = RunGit(['for-each-ref', |
| 3787 | '--format=%(refname:short) %(upstream:short)', |
| 3788 | 'refs/heads']) |
| 3789 | if not branches: |
| 3790 | print('No local branches found.') |
| 3791 | return 0 |
| 3792 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3793 | # Create a dictionary of all local branches to the branches that are |
| 3794 | # dependent on it. |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3795 | tracked_to_dependents = collections.defaultdict(list) |
| 3796 | for b in branches.splitlines(): |
| 3797 | tokens = b.split() |
| 3798 | if len(tokens) == 2: |
| 3799 | branch_name, tracked = tokens |
| 3800 | tracked_to_dependents[tracked].append(branch_name) |
| 3801 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3802 | print() |
| 3803 | print('The dependent local branches of %s are:' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3804 | dependents = [] |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3805 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3806 | def traverse_dependents_preorder(branch, padding=''): |
| 3807 | dependents_to_process = tracked_to_dependents.get(branch, []) |
| 3808 | padding += ' ' |
| 3809 | for dependent in dependents_to_process: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3810 | print('%s%s' % (padding, dependent)) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3811 | dependents.append(dependent) |
| 3812 | traverse_dependents_preorder(dependent, padding) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 3813 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3814 | traverse_dependents_preorder(root_branch) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3815 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3816 | |
| 3817 | if not dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3818 | print('There are no dependent local branches for %s' % root_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3819 | return 0 |
| 3820 | |
Jose Lopes | 3863fc5 | 2020-04-07 17:00:25 +0000 | [diff] [blame] | 3821 | if not force: |
| 3822 | confirm_or_exit('This command will checkout all dependent branches and run ' |
| 3823 | '"git cl upload".', action='continue') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3824 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3825 | # Record all dependents that failed to upload. |
| 3826 | failures = {} |
| 3827 | # Go through all dependents, checkout the branch and upload. |
| 3828 | try: |
| 3829 | for dependent_branch in dependents: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3830 | print() |
| 3831 | print('--------------------------------------') |
| 3832 | print('Running "git cl upload" from %s:' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3833 | RunGit(['checkout', '-q', dependent_branch]) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3834 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3835 | try: |
| 3836 | if CMDupload(OptionParser(), args) != 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3837 | print('Upload failed for %s!' % dependent_branch) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3838 | failures[dependent_branch] = 1 |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 3839 | except: # pylint: disable=bare-except |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3840 | failures[dependent_branch] = 1 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3841 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3842 | finally: |
| 3843 | # Swap back to the original root branch. |
| 3844 | RunGit(['checkout', '-q', root_branch]) |
| 3845 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3846 | print() |
| 3847 | print('Upload complete for dependent branches!') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3848 | for dependent_branch in dependents: |
| 3849 | upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded' |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3850 | print(' %s : %s' % (dependent_branch, upload_status)) |
| 3851 | print() |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 3852 | |
| 3853 | return 0 |
| 3854 | |
| 3855 | |
Tibor Goldschwendt | 7c5efb2 | 2020-03-25 01:23:54 +0000 | [diff] [blame] | 3856 | def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern): |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3857 | """Given a proposed tag name, returns a tag name that is guaranteed to be |
| 3858 | unique. If 'foo' is proposed but already exists, then 'foo-2' is used, |
| 3859 | or 'foo-3', and so on.""" |
| 3860 | |
Tibor Goldschwendt | 7c5efb2 | 2020-03-25 01:23:54 +0000 | [diff] [blame] | 3861 | proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name}) |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3862 | for suffix_num in itertools.count(1): |
| 3863 | if suffix_num == 1: |
| 3864 | to_check = proposed_tag |
| 3865 | else: |
| 3866 | to_check = '%s-%d' % (proposed_tag, suffix_num) |
| 3867 | |
| 3868 | if to_check not in existing_tags: |
| 3869 | return to_check |
| 3870 | |
| 3871 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3872 | @metrics.collector.collect_metrics('git cl archive') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3873 | def CMDarchive(parser, args): |
| 3874 | """Archives and deletes branches associated with closed changelists.""" |
| 3875 | parser.add_option( |
| 3876 | '-j', '--maxjobs', action='store', type=int, |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3877 | help='The maximum number of jobs to use when retrieving review status.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3878 | parser.add_option( |
| 3879 | '-f', '--force', action='store_true', |
| 3880 | help='Bypasses the confirmation prompt.') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3881 | parser.add_option( |
| 3882 | '-d', '--dry-run', action='store_true', |
| 3883 | help='Skip the branch tagging and removal steps.') |
| 3884 | parser.add_option( |
| 3885 | '-t', '--notags', action='store_true', |
| 3886 | help='Do not tag archived branches. ' |
| 3887 | 'Note: local commit history may be lost.') |
Tibor Goldschwendt | 7c5efb2 | 2020-03-25 01:23:54 +0000 | [diff] [blame] | 3888 | parser.add_option( |
| 3889 | '-p', |
| 3890 | '--pattern', |
| 3891 | default='git-cl-archived-{issue}-{branch}', |
| 3892 | help='Format string for archive tags. ' |
| 3893 | 'E.g. \'archived-{issue}-{branch}\'.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3894 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3895 | options, args = parser.parse_args(args) |
| 3896 | if args: |
| 3897 | parser.error('Unsupported args: %s' % ' '.join(args)) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3898 | |
| 3899 | branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads']) |
| 3900 | if not branches: |
| 3901 | return 0 |
| 3902 | |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3903 | tags = RunGit(['for-each-ref', '--format=%(refname)', |
| 3904 | 'refs/tags']).splitlines() or [] |
| 3905 | tags = [t.split('/')[-1] for t in tags] |
| 3906 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3907 | print('Finding all branches associated with closed issues...') |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 3908 | changes = [Changelist(branchref=b) |
| 3909 | for b in branches.splitlines()] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3910 | alignment = max(5, max(len(c.GetBranch()) for c in changes)) |
| 3911 | statuses = get_cl_statuses(changes, |
| 3912 | fine_grained=True, |
| 3913 | max_processes=options.maxjobs) |
| 3914 | proposal = [(cl.GetBranch(), |
Tibor Goldschwendt | 7c5efb2 | 2020-03-25 01:23:54 +0000 | [diff] [blame] | 3915 | GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags, |
| 3916 | options.pattern)) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3917 | for cl, status in statuses |
Andrii Shyshkalov | 51bdf8c | 2018-10-18 01:07:58 +0000 | [diff] [blame] | 3918 | if status in ('closed', 'rietveld-not-supported')] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3919 | proposal.sort() |
| 3920 | |
| 3921 | if not proposal: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3922 | print('No branches with closed codereview issues found.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3923 | return 0 |
| 3924 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 3925 | current_branch = scm.GIT.GetBranch(settings.GetRoot()) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3926 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3927 | print('\nBranches with closed issues that will be archived:\n') |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3928 | if options.notags: |
| 3929 | for next_item in proposal: |
| 3930 | print(' ' + next_item[0]) |
| 3931 | else: |
| 3932 | print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name')) |
| 3933 | for next_item in proposal: |
| 3934 | print('%*s %s' % (alignment, next_item[0], next_item[1])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3935 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3936 | # Quit now on precondition failure or if instructed by the user, either |
| 3937 | # via an interactive prompt or by command line flags. |
| 3938 | if options.dry_run: |
| 3939 | print('\nNo changes were made (dry run).\n') |
| 3940 | return 0 |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 3941 | |
| 3942 | if any(branch == current_branch for branch, _ in proposal): |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3943 | print('You are currently on a branch \'%s\' which is associated with a ' |
| 3944 | 'closed codereview issue, so archive cannot proceed. Please ' |
| 3945 | 'checkout another branch and run this command again.' % |
| 3946 | current_branch) |
| 3947 | return 1 |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 3948 | |
| 3949 | if not options.force: |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 3950 | answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower() |
sergiyb | 4a5ecbe | 2016-06-20 09:46:00 -0700 | [diff] [blame] | 3951 | if answer not in ('y', ''): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3952 | print('Aborted.') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3953 | return 1 |
| 3954 | |
| 3955 | for branch, tagname in proposal: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3956 | if not options.notags: |
| 3957 | RunGit(['tag', tagname, branch]) |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 3958 | |
| 3959 | if RunGitWithCode(['branch', '-D', branch])[0] != 0: |
| 3960 | # Clean up the tag if we failed to delete the branch. |
| 3961 | RunGit(['tag', '-d', tagname]) |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 3962 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 3963 | print('\nJob\'s done!') |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 3964 | |
| 3965 | return 0 |
| 3966 | |
| 3967 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 3968 | @metrics.collector.collect_metrics('git cl status') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3969 | def CMDstatus(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3970 | """Show status of changelists. |
| 3971 | |
| 3972 | 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] | 3973 | - Blue waiting for review |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3974 | - 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] | 3975 | - Green LGTM'ed |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3976 | - Red 'not LGTM'ed |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 3977 | - Magenta in the CQ |
jsbell@chromium.org | aeab41a | 2013-12-10 20:01:22 +0000 | [diff] [blame] | 3978 | - Cyan was committed, branch can be deleted |
Aaron Gable | 9ab38c6 | 2017-04-06 14:36:33 -0700 | [diff] [blame] | 3979 | - White error, or unknown status |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 3980 | |
| 3981 | Also see 'git cl comments'. |
| 3982 | """ |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 3983 | parser.add_option( |
| 3984 | '--no-branch-color', |
| 3985 | action='store_true', |
| 3986 | help='Disable colorized branch names') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 3987 | parser.add_option('--field', |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 3988 | help='print only specific field (desc|id|patch|status|url)') |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 3989 | parser.add_option('-f', '--fast', action='store_true', |
| 3990 | help='Do not retrieve review status') |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 3991 | parser.add_option( |
| 3992 | '-j', '--maxjobs', action='store', type=int, |
| 3993 | help='The maximum number of jobs to use when retrieving review status') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 3994 | parser.add_option( |
| 3995 | '-i', '--issue', type=int, |
| 3996 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 3997 | 'issue. Requires --field to be set.') |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 3998 | parser.add_option('-d', |
| 3999 | '--date-order', |
| 4000 | action='store_true', |
| 4001 | help='Order branches by committer date.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4002 | options, args = parser.parse_args(args) |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 4003 | if args: |
| 4004 | parser.error('Unsupported args: %s' % args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4005 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 4006 | if options.issue is not None and not options.field: |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 4007 | parser.error('--field must be given when --issue is set.') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 4008 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4009 | if options.field: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4010 | cl = Changelist(issue=options.issue) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4011 | if options.field.startswith('desc'): |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 4012 | if cl.GetIssue(): |
| 4013 | print(cl.FetchDescription()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4014 | elif options.field == 'id': |
| 4015 | issueid = cl.GetIssue() |
| 4016 | if issueid: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4017 | print(issueid) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4018 | elif options.field == 'patch': |
Aaron Gable | e8856ee | 2017-12-07 12:41:46 -0800 | [diff] [blame] | 4019 | patchset = cl.GetMostRecentPatchset() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4020 | if patchset: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4021 | print(patchset) |
phajdan.jr | 289d03e | 2016-08-16 08:21:06 -0700 | [diff] [blame] | 4022 | elif options.field == 'status': |
| 4023 | print(cl.GetStatus()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4024 | elif options.field == 'url': |
| 4025 | url = cl.GetIssueURL() |
| 4026 | if url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4027 | print(url) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 4028 | return 0 |
| 4029 | |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 4030 | branches = RunGit([ |
| 4031 | 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads' |
| 4032 | ]) |
maruel@chromium.org | e25c75b | 2013-07-23 18:30:56 +0000 | [diff] [blame] | 4033 | if not branches: |
| 4034 | print('No local branch found.') |
| 4035 | return 0 |
| 4036 | |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4037 | changes = [ |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 4038 | Changelist(branchref=b, commit_date=ct) |
| 4039 | for b, ct in map(lambda line: line.split(' '), branches.splitlines()) |
| 4040 | ] |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4041 | print('Branches associated with reviews:') |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4042 | output = get_cl_statuses(changes, |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 4043 | fine_grained=not options.fast, |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4044 | max_processes=options.maxjobs) |
maruel@chromium.org | 1033efd | 2013-07-23 23:25:09 +0000 | [diff] [blame] | 4045 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 4046 | current_branch = scm.GIT.GetBranch(settings.GetRoot()) |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 4047 | |
| 4048 | def FormatBranchName(branch, colorize=False): |
| 4049 | """Simulates 'git branch' behavior. Colorizes and prefixes branch name with |
| 4050 | an asterisk when it is the current branch.""" |
| 4051 | |
| 4052 | asterisk = "" |
| 4053 | color = Fore.RESET |
| 4054 | if branch == current_branch: |
| 4055 | asterisk = "* " |
| 4056 | color = Fore.GREEN |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 4057 | branch_name = scm.GIT.ShortBranchName(branch) |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 4058 | |
| 4059 | if colorize: |
| 4060 | return asterisk + color + branch_name + Fore.RESET |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 4061 | return asterisk + branch_name |
| 4062 | |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 4063 | branch_statuses = {} |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 4064 | |
| 4065 | alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes)) |
Sigurd Schneider | 1bfda8e | 2021-06-30 14:46:25 +0000 | [diff] [blame] | 4066 | |
| 4067 | if options.date_order or settings.IsStatusCommitOrderByDate(): |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 4068 | sorted_changes = sorted(changes, |
| 4069 | key=lambda c: c.GetCommitDate(), |
| 4070 | reverse=True) |
| 4071 | else: |
| 4072 | sorted_changes = sorted(changes, key=lambda c: c.GetBranch()) |
| 4073 | for cl in sorted_changes: |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4074 | branch = cl.GetBranch() |
calamity@chromium.org | ffde55c | 2015-03-12 00:44:17 +0000 | [diff] [blame] | 4075 | while branch not in branch_statuses: |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4076 | c, status = next(output) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4077 | branch_statuses[c.GetBranch()] = status |
| 4078 | status = branch_statuses.pop(branch) |
Andrii Shyshkalov | 1ee78cd | 2020-03-12 01:31:53 +0000 | [diff] [blame] | 4079 | url = cl.GetIssueURL(short=True) |
clemensh@chromium.org | cbd7dc3 | 2016-05-31 10:33:50 +0000 | [diff] [blame] | 4080 | if url and (not status or status == 'error'): |
| 4081 | # The issue probably doesn't exist anymore. |
| 4082 | url += ' (broken)' |
| 4083 | |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 4084 | color = color_for_status(status) |
Bruce Dawson | b73f8a9 | 2020-03-27 22:03:08 +0000 | [diff] [blame] | 4085 | # Turn off bold as well as colors. |
| 4086 | END = '\033[0m' |
| 4087 | reset = Fore.RESET + END |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 4088 | if not setup_color.IS_TTY: |
maruel@chromium.org | 885f651 | 2013-07-27 02:17:26 +0000 | [diff] [blame] | 4089 | color = '' |
| 4090 | reset = '' |
nodir@chromium.org | a6de1f4 | 2015-06-10 04:23:17 +0000 | [diff] [blame] | 4091 | status_str = '(%s)' % status if status else '' |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 4092 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 4093 | branch_display = FormatBranchName(branch) |
| 4094 | padding = ' ' * (alignment - len(branch_display)) |
| 4095 | if not options.no_branch_color: |
| 4096 | branch_display = FormatBranchName(branch, colorize=True) |
Daniel McArdle | 452a49f | 2019-02-14 17:28:31 +0000 | [diff] [blame] | 4097 | |
Alan Cutter | a3be9a5 | 2019-03-04 18:50:33 +0000 | [diff] [blame] | 4098 | print(' %s : %s%s %s%s' % (padding + branch_display, color, url, |
| 4099 | status_str, reset)) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 4100 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4101 | print() |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 4102 | print('Current branch: %s' % current_branch) |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 4103 | for cl in changes: |
Daniel McArdle | a23bf59 | 2019-02-12 00:25:12 +0000 | [diff] [blame] | 4104 | if cl.GetBranch() == current_branch: |
Andrii Shyshkalov | d0e1d9d | 2017-01-24 17:10:51 +0100 | [diff] [blame] | 4105 | break |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 4106 | if not cl.GetIssue(): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4107 | print('No issue assigned.') |
dpranke@chromium.org | ee87f58 | 2015-07-31 18:46:25 +0000 | [diff] [blame] | 4108 | return 0 |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4109 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
maruel@chromium.org | 85616e0 | 2014-07-28 15:37:55 +0000 | [diff] [blame] | 4110 | if not options.fast: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4111 | print('Issue description:') |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 4112 | print(cl.FetchDescription(pretty=True)) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4113 | return 0 |
| 4114 | |
| 4115 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 4116 | def colorize_CMDstatus_doc(): |
| 4117 | """To be called once in main() to add colors to git cl status help.""" |
| 4118 | colors = [i for i in dir(Fore) if i[0].isupper()] |
| 4119 | |
| 4120 | def colorize_line(line): |
| 4121 | for color in colors: |
| 4122 | if color in line.upper(): |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 4123 | # Extract whitespace first and the leading '-'. |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 4124 | indent = len(line) - len(line.lstrip(' ')) + 1 |
| 4125 | return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET |
| 4126 | return line |
| 4127 | |
| 4128 | lines = CMDstatus.__doc__.splitlines() |
| 4129 | CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines) |
| 4130 | |
| 4131 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 4132 | def write_json(path, contents): |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4133 | if path == '-': |
| 4134 | json.dump(contents, sys.stdout) |
| 4135 | else: |
| 4136 | with open(path, 'w') as f: |
| 4137 | json.dump(contents, f) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 4138 | |
| 4139 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4140 | @subcommand.usage('[issue_number]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4141 | @metrics.collector.collect_metrics('git cl issue') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4142 | def CMDissue(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4143 | """Sets or displays the current code review issue number. |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4144 | |
| 4145 | Pass issue number 0 to clear the current issue. |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4146 | """ |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4147 | parser.add_option('-r', '--reverse', action='store_true', |
| 4148 | help='Lookup the branch(es) for the specified issues. If ' |
| 4149 | 'no issues are specified, all branches with mapped ' |
| 4150 | 'issues will be listed.') |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4151 | parser.add_option('--json', |
| 4152 | help='Path to JSON output file, or "-" for stdout.') |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4153 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4154 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4155 | if options.reverse: |
| 4156 | branches = RunGit(['for-each-ref', 'refs/heads', |
Aaron Gable | ad64abd | 2017-12-04 09:49:13 -0800 | [diff] [blame] | 4157 | '--format=%(refname)']).splitlines() |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4158 | # Reverse issue lookup. |
| 4159 | issue_branch_map = {} |
Daniel Bratell | b56a43a | 2018-09-06 15:49:03 +0000 | [diff] [blame] | 4160 | |
| 4161 | git_config = {} |
| 4162 | for config in RunGit(['config', '--get-regexp', |
| 4163 | r'branch\..*issue']).splitlines(): |
| 4164 | name, _space, val = config.partition(' ') |
| 4165 | git_config[name] = val |
| 4166 | |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4167 | for branch in branches: |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 4168 | issue = git_config.get( |
| 4169 | 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY)) |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 4170 | if issue: |
| 4171 | issue_branch_map.setdefault(int(issue), []).append(branch) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4172 | if not args: |
Carlos Caballero | 81923d6 | 2020-07-06 18:22:27 +0000 | [diff] [blame] | 4173 | args = sorted(issue_branch_map.keys()) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 4174 | result = {} |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4175 | for issue in args: |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 4176 | try: |
| 4177 | issue_num = int(issue) |
| 4178 | except ValueError: |
| 4179 | print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4180 | continue |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 4181 | result[issue_num] = issue_branch_map.get(issue_num) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4182 | print('Branch for issue number %s: %s' % ( |
Lei Zhang | 5a368d4 | 2019-03-25 23:18:19 +0000 | [diff] [blame] | 4183 | issue, ', '.join(issue_branch_map.get(issue_num) or ('None',)))) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 4184 | if options.json: |
| 4185 | write_json(options.json, result) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4186 | return 0 |
| 4187 | |
| 4188 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4189 | issue = ParseIssueNumberArgument(args[0]) |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4190 | if not issue.valid: |
| 4191 | DieWithError('Pass a url or number to set the issue, 0 to unset it, ' |
| 4192 | 'or no argument to list it.\n' |
| 4193 | 'Maybe you want to run git cl status?') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4194 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4195 | cl.SetIssue(issue.issue) |
dnj@chromium.org | 406c440 | 2015-03-03 17:22:28 +0000 | [diff] [blame] | 4196 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4197 | cl = Changelist() |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4198 | print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())) |
| 4199 | if options.json: |
| 4200 | write_json(options.json, { |
Nodir Turakulov | 2737963 | 2021-03-17 18:53:29 +0000 | [diff] [blame] | 4201 | 'gerrit_host': cl.GetGerritHost(), |
| 4202 | 'gerrit_project': cl.GetGerritProject(), |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4203 | 'issue_url': cl.GetIssueURL(), |
Nodir Turakulov | 2737963 | 2021-03-17 18:53:29 +0000 | [diff] [blame] | 4204 | 'issue': cl.GetIssue(), |
Aaron Gable | 78753da | 2017-06-15 10:35:49 -0700 | [diff] [blame] | 4205 | }) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4206 | return 0 |
| 4207 | |
| 4208 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4209 | @metrics.collector.collect_metrics('git cl comments') |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4210 | def CMDcomments(parser, args): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4211 | """Shows or posts review comments for any changelist.""" |
| 4212 | parser.add_option('-a', '--add-comment', dest='comment', |
| 4213 | help='comment to add to an issue') |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 4214 | parser.add_option('-p', '--publish', action='store_true', |
| 4215 | help='marks CL as ready and sends comment to reviewers') |
Andrii Shyshkalov | 0d6b46e | 2017-03-17 22:23:22 +0100 | [diff] [blame] | 4216 | parser.add_option('-i', '--issue', dest='issue', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4217 | help='review issue id (defaults to current issue).') |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 4218 | parser.add_option('-m', '--machine-readable', dest='readable', |
| 4219 | action='store_false', default=True, |
| 4220 | help='output comments in a format compatible with ' |
| 4221 | 'editor parsing') |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 4222 | parser.add_option('-j', '--json-file', |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 4223 | help='File to write JSON summary to, or "-" for stdout') |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4224 | options, args = parser.parse_args(args) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4225 | |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4226 | issue = None |
| 4227 | if options.issue: |
| 4228 | try: |
| 4229 | issue = int(options.issue) |
| 4230 | except ValueError: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4231 | DieWithError('A review issue ID is expected to be a number.') |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4232 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4233 | cl = Changelist(issue=issue) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4234 | |
| 4235 | if options.comment: |
Sergiy Byelozyorov | cb629a4 | 2018-10-28 19:20:39 +0000 | [diff] [blame] | 4236 | cl.AddComment(options.comment, options.publish) |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4237 | return 0 |
| 4238 | |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 4239 | summary = sorted(cl.GetCommentsSummary(readable=options.readable), |
| 4240 | key=lambda c: c.date) |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4241 | for comment in summary: |
| 4242 | if comment.disapproval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4243 | color = Fore.RED |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4244 | elif comment.approval: |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4245 | color = Fore.GREEN |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4246 | elif comment.sender == cl.GetIssueOwner(): |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4247 | color = Fore.MAGENTA |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 4248 | elif comment.autogenerated: |
| 4249 | color = Fore.CYAN |
apavlov@chromium.org | e4efd51 | 2014-11-05 09:05:29 +0000 | [diff] [blame] | 4250 | else: |
| 4251 | color = Fore.BLUE |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4252 | print('\n%s%s %s%s\n%s' % ( |
| 4253 | color, |
| 4254 | comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'), |
| 4255 | comment.sender, |
| 4256 | Fore.RESET, |
| 4257 | '\n'.join(' ' + l for l in comment.message.strip().splitlines()))) |
| 4258 | |
smut@google.com | c85ac94 | 2015-09-15 16:34:43 +0000 | [diff] [blame] | 4259 | if options.json_file: |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4260 | def pre_serialize(c): |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4261 | dct = c._asdict().copy() |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 4262 | dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f') |
| 4263 | return dct |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 4264 | write_json(options.json_file, [pre_serialize(x) for x in summary]) |
maruel@chromium.org | 9977a2e | 2012-06-06 22:30:56 +0000 | [diff] [blame] | 4265 | return 0 |
| 4266 | |
| 4267 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4268 | @subcommand.usage('[codereview url or issue id]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4269 | @metrics.collector.collect_metrics('git cl description') |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4270 | def CMDdescription(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4271 | """Brings up the editor for the current CL's description.""" |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4272 | parser.add_option('-d', '--display', action='store_true', |
| 4273 | help='Display the description instead of opening an editor') |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4274 | parser.add_option('-n', '--new-description', |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4275 | help='New description to set for this issue (- for stdin, ' |
| 4276 | '+ to load from local commit HEAD)') |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4277 | parser.add_option('-f', '--force', action='store_true', |
| 4278 | help='Delete any unpublished Gerrit edits for this issue ' |
| 4279 | 'without prompting') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4280 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4281 | options, args = parser.parse_args(args) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4282 | |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4283 | target_issue_arg = None |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4284 | if len(args) > 0: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4285 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4286 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4287 | parser.error('Invalid issue ID or URL.') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 4288 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4289 | kwargs = {} |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 4290 | if target_issue_arg: |
| 4291 | kwargs['issue'] = target_issue_arg.issue |
| 4292 | kwargs['codereview_host'] = target_issue_arg.hostname |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 4293 | |
| 4294 | cl = Changelist(**kwargs) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4295 | if not cl.GetIssue(): |
| 4296 | DieWithError('This branch has no associated changelist.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4297 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 4298 | if args and not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4299 | logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 4300 | |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 4301 | description = ChangeDescription(cl.FetchDescription()) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4302 | |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4303 | if options.display: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4304 | print(description.description) |
smut@google.com | 34fb6b1 | 2015-07-13 20:03:26 +0000 | [diff] [blame] | 4305 | return 0 |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4306 | |
| 4307 | if options.new_description: |
| 4308 | text = options.new_description |
| 4309 | if text == '-': |
| 4310 | text = '\n'.join(l.rstrip() for l in sys.stdin) |
dnj | ba1b0f3 | 2016-09-02 12:37:42 -0700 | [diff] [blame] | 4311 | elif text == '+': |
| 4312 | base_branch = cl.GetCommonAncestorWithUpstream() |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 4313 | text = _create_description_from_log([base_branch]) |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 4314 | |
| 4315 | description.set_description(text) |
| 4316 | else: |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4317 | description.prompt() |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 4318 | if cl.FetchDescription().strip() != description.description: |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 4319 | cl.UpdateDescription(description.description, force=options.force) |
rsesek@chromium.org | eec7659 | 2013-05-20 16:27:57 +0000 | [diff] [blame] | 4320 | return 0 |
| 4321 | |
| 4322 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4323 | @metrics.collector.collect_metrics('git cl lint') |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4324 | def CMDlint(parser, args): |
| 4325 | """Runs cpplint on the current changelist.""" |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4326 | parser.add_option('--filter', action='append', metavar='-x,+y', |
| 4327 | help='Comma-separated list of cpplint\'s category-filters') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4328 | options, args = parser.parse_args(args) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4329 | |
| 4330 | # Access to a protected member _XX of a client class |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 4331 | # pylint: disable=protected-access |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4332 | try: |
| 4333 | import cpplint |
| 4334 | import cpplint_chromium |
| 4335 | except ImportError: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4336 | 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] | 4337 | return 1 |
| 4338 | |
| 4339 | # Change the current working directory before calling lint so that it |
| 4340 | # shows the correct base. |
| 4341 | previous_cwd = os.getcwd() |
| 4342 | os.chdir(settings.GetRoot()) |
| 4343 | try: |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4344 | cl = Changelist() |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 4345 | files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream()) |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4346 | if not files: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4347 | print('Cannot lint an empty CL') |
thestig@chromium.org | 5839eb5 | 2014-05-30 16:20:51 +0000 | [diff] [blame] | 4348 | return 1 |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4349 | |
Lei Zhang | b8c62cf | 2020-07-15 20:09:37 +0000 | [diff] [blame] | 4350 | # Process cpplint arguments, if any. |
| 4351 | filters = presubmit_canned_checks.GetCppLintFilters(options.filter) |
| 4352 | command = ['--filter=' + ','.join(filters)] + args + files |
tzik@chromium.org | f204d4b | 2014-03-13 07:40:55 +0000 | [diff] [blame] | 4353 | filenames = cpplint.ParseArguments(command) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4354 | |
Lei Zhang | 379d1ad | 2020-07-15 19:40:06 +0000 | [diff] [blame] | 4355 | include_regex = re.compile(settings.GetLintRegex()) |
| 4356 | ignore_regex = re.compile(settings.GetLintIgnoreRegex()) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4357 | extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace] |
| 4358 | for filename in filenames: |
Lei Zhang | 379d1ad | 2020-07-15 19:40:06 +0000 | [diff] [blame] | 4359 | if not include_regex.match(filename): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4360 | print('Skipping file %s' % filename) |
Lei Zhang | 379d1ad | 2020-07-15 19:40:06 +0000 | [diff] [blame] | 4361 | continue |
| 4362 | |
| 4363 | if ignore_regex.match(filename): |
| 4364 | print('Ignoring file %s' % filename) |
| 4365 | continue |
| 4366 | |
| 4367 | cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level, |
| 4368 | extra_check_functions) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4369 | finally: |
| 4370 | os.chdir(previous_cwd) |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4371 | print('Total errors found: %d\n' % cpplint._cpplint_state.error_count) |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 4372 | if cpplint._cpplint_state.error_count != 0: |
| 4373 | return 1 |
| 4374 | return 0 |
| 4375 | |
| 4376 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4377 | @metrics.collector.collect_metrics('git cl presubmit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4378 | def CMDpresubmit(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 4379 | """Runs presubmit tests on the current changelist.""" |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4380 | parser.add_option('-u', '--upload', action='store_true', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4381 | help='Run upload hook instead of the push hook') |
ilevy@chromium.org | 375a902 | 2013-01-07 01:12:05 +0000 | [diff] [blame] | 4382 | parser.add_option('-f', '--force', action='store_true', |
sbc@chromium.org | 495ad15 | 2012-09-04 23:07:42 +0000 | [diff] [blame] | 4383 | help='Run checks even if tree is dirty') |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4384 | parser.add_option('--all', action='store_true', |
| 4385 | help='Run checks against all files, not just modified ones') |
Josip Sokcevic | 017544d | 2022-03-31 23:47:53 +0000 | [diff] [blame] | 4386 | parser.add_option('--files', |
| 4387 | nargs=1, |
| 4388 | help='Semicolon-separated list of files to be marked as ' |
| 4389 | 'modified when executing presubmit or post-upload hooks. ' |
| 4390 | 'fnmatch wildcards can also be used.') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4391 | parser.add_option('--parallel', action='store_true', |
| 4392 | help='Run all tests specified by input_api.RunTests in all ' |
| 4393 | 'PRESUBMIT files in parallel.') |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 4394 | parser.add_option('--resultdb', action='store_true', |
| 4395 | help='Run presubmit checks in the ResultSink environment ' |
| 4396 | 'and send results to the ResultDB database.') |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 4397 | parser.add_option('--realm', help='LUCI realm if reporting to ResultDB') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4398 | options, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4399 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4400 | if not options.force and git_common.is_dirty_git_tree('presubmit'): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 4401 | print('use --force to check even if tree is dirty.') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4402 | return 1 |
| 4403 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4404 | cl = Changelist() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4405 | if args: |
| 4406 | base_branch = args[0] |
| 4407 | else: |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 4408 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 4409 | base_branch = cl.GetCommonAncestorWithUpstream() |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4410 | |
Bruce Dawson | eb8426e | 2022-08-05 23:58:15 +0000 | [diff] [blame] | 4411 | start = time.time() |
| 4412 | try: |
| 4413 | if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue(): |
| 4414 | description = cl.FetchDescription() |
| 4415 | else: |
| 4416 | description = _create_description_from_log([base_branch]) |
| 4417 | except Exception as e: |
| 4418 | print('Failed to fetch CL description - %s' % str(e)) |
Edward Lemur | a12175c | 2020-03-09 16:58:26 +0000 | [diff] [blame] | 4419 | description = _create_description_from_log([base_branch]) |
Bruce Dawson | eb8426e | 2022-08-05 23:58:15 +0000 | [diff] [blame] | 4420 | elapsed = time.time() - start |
| 4421 | if elapsed > 5: |
| 4422 | print('%.1f s to get CL description.' % elapsed) |
Aaron Gable | 8076c28 | 2017-11-29 14:39:41 -0800 | [diff] [blame] | 4423 | |
Bruce Dawson | 13acea3 | 2022-05-03 22:13:08 +0000 | [diff] [blame] | 4424 | if not base_branch: |
| 4425 | if not options.force: |
| 4426 | print('use --force to check even when not on a branch.') |
| 4427 | return 1 |
| 4428 | base_branch = 'HEAD' |
| 4429 | |
Josip Sokcevic | 017544d | 2022-03-31 23:47:53 +0000 | [diff] [blame] | 4430 | cl.RunHook(committing=not options.upload, |
| 4431 | may_prompt=False, |
| 4432 | verbose=options.verbose, |
| 4433 | parallel=options.parallel, |
| 4434 | upstream=base_branch, |
| 4435 | description=description, |
| 4436 | all_files=options.all, |
| 4437 | files=options.files, |
| 4438 | resultdb=options.resultdb, |
| 4439 | realm=options.realm) |
dpranke@chromium.org | 0a2bb37 | 2011-03-25 01:16:22 +0000 | [diff] [blame] | 4440 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4441 | |
| 4442 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4443 | def GenerateGerritChangeId(message): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4444 | """Returns the Change ID footer value (Ixxxxxx...xxx). |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4445 | |
| 4446 | Works the same way as |
| 4447 | https://gerrit-review.googlesource.com/tools/hooks/commit-msg |
| 4448 | but can be called on demand on all platforms. |
| 4449 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4450 | The basic idea is to generate git hash of a state of the tree, original |
| 4451 | commit message, author/committer info and timestamps. |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4452 | """ |
| 4453 | lines = [] |
| 4454 | tree_hash = RunGitSilent(['write-tree']) |
| 4455 | lines.append('tree %s' % tree_hash.strip()) |
| 4456 | code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False) |
| 4457 | if code == 0: |
| 4458 | lines.append('parent %s' % parent.strip()) |
| 4459 | author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT']) |
| 4460 | lines.append('author %s' % author.strip()) |
| 4461 | committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT']) |
| 4462 | lines.append('committer %s' % committer.strip()) |
| 4463 | lines.append('') |
| 4464 | # Note: Gerrit's commit-hook actually cleans message of some lines and |
| 4465 | # whitespace. This code is not doing this, but it clearly won't decrease |
| 4466 | # entropy. |
| 4467 | lines.append(message) |
| 4468 | change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'], |
Raul Tambre | b946b23 | 2019-03-26 14:48:46 +0000 | [diff] [blame] | 4469 | stdin=('\n'.join(lines)).encode()) |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 4470 | return 'I%s' % change_hash.strip() |
| 4471 | |
| 4472 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 4473 | def GetTargetRef(remote, remote_branch, target_branch): |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4474 | """Computes the remote branch ref to use for the CL. |
| 4475 | |
| 4476 | Args: |
| 4477 | remote (str): The git remote for the CL. |
| 4478 | remote_branch (str): The git remote branch for the CL. |
| 4479 | target_branch (str): The target branch specified by the user. |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4480 | """ |
| 4481 | if not (remote and remote_branch): |
| 4482 | return None |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4483 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4484 | if target_branch: |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 4485 | # Canonicalize branch references to the equivalent local full symbolic |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4486 | # refs, which are then translated into the remote full symbolic refs |
| 4487 | # below. |
| 4488 | if '/' not in target_branch: |
| 4489 | remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch) |
| 4490 | else: |
| 4491 | prefix_replacements = ( |
| 4492 | ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'), |
| 4493 | ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote), |
| 4494 | ('^(refs/)?heads/', 'refs/remotes/%s/' % remote), |
| 4495 | ) |
| 4496 | match = None |
| 4497 | for regex, replacement in prefix_replacements: |
| 4498 | match = re.search(regex, target_branch) |
| 4499 | if match: |
| 4500 | remote_branch = target_branch.replace(match.group(0), replacement) |
| 4501 | break |
| 4502 | if not match: |
| 4503 | # This is a branch path but not one we recognize; use as-is. |
| 4504 | remote_branch = target_branch |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 4505 | # pylint: disable=consider-using-get |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 4506 | elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS: |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 4507 | # pylint: enable=consider-using-get |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 4508 | # Handle the refs that need to land in different refs. |
| 4509 | remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4510 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4511 | # Create the true path to the remote branch. |
| 4512 | # Does the following translation: |
| 4513 | # * refs/remotes/origin/refs/diff/test -> refs/diff/test |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 4514 | # * refs/remotes/origin/main -> refs/heads/main |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4515 | # * refs/remotes/branch-heads/test -> refs/branch-heads/test |
| 4516 | if remote_branch.startswith('refs/remotes/%s/refs/' % remote): |
| 4517 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '') |
| 4518 | elif remote_branch.startswith('refs/remotes/%s/' % remote): |
| 4519 | remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, |
| 4520 | 'refs/heads/') |
| 4521 | elif remote_branch.startswith('refs/remotes/branch-heads'): |
| 4522 | remote_branch = remote_branch.replace('refs/remotes/', 'refs/') |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 4523 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4524 | return remote_branch |
| 4525 | |
| 4526 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4527 | def cleanup_list(l): |
| 4528 | """Fixes a list so that comma separated items are put as individual items. |
| 4529 | |
| 4530 | So that "--reviewers joe@c,john@c --reviewers joa@c" results in |
| 4531 | options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']). |
| 4532 | """ |
| 4533 | items = sum((i.split(',') for i in l), []) |
| 4534 | stripped_items = (i.strip() for i in items) |
| 4535 | return sorted(filter(None, stripped_items)) |
| 4536 | |
| 4537 | |
Aaron Gable | 4db38df | 2017-11-03 14:59:07 -0700 | [diff] [blame] | 4538 | @subcommand.usage('[flags]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4539 | @metrics.collector.collect_metrics('git cl upload') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4540 | def CMDupload(parser, args): |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4541 | """Uploads the current changelist to codereview. |
| 4542 | |
| 4543 | Can skip dependency patchset uploads for a branch by running: |
| 4544 | git config branch.branch_name.skip-deps-uploads True |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4545 | To unset, run: |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4546 | git config --unset branch.branch_name.skip-deps-uploads |
| 4547 | Can also set the above globally by using the --global flag. |
Dominic Battre | 7d1c484 | 2017-10-27 09:17:28 +0200 | [diff] [blame] | 4548 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4549 | If the name of the checked out branch starts with "bug-" or "fix-" followed |
| 4550 | 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] | 4551 | description. |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4552 | |
| 4553 | If subject contains text in square brackets or has "<text>: " prefix, such |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4554 | text(s) is treated as Gerrit hashtags. For example, CLs with subjects: |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4555 | [git-cl] add support for hashtags |
| 4556 | Foo bar: implement foo |
| 4557 | will be hashtagged with "git-cl" and "foo-bar" respectively. |
rmistry@google.com | 78948ed | 2015-07-08 23:09:57 +0000 | [diff] [blame] | 4558 | """ |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4559 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4560 | help='bypass upload presubmit hook') |
brettw@chromium.org | b65c43c | 2013-06-10 22:04:49 +0000 | [diff] [blame] | 4561 | parser.add_option('--bypass-watchlists', action='store_true', |
| 4562 | dest='bypass_watchlists', |
| 4563 | help='bypass watchlists auto CC-ing reviewers') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4564 | parser.add_option('-f', '--force', action='store_true', dest='force', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4565 | help="force yes to questions (don't prompt)") |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4566 | parser.add_option('--message', '-m', dest='message', |
| 4567 | help='message for patchset') |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 4568 | parser.add_option('-b', '--bug', |
| 4569 | help='pre-populate the bug number(s) for this issue. ' |
| 4570 | 'If several, separate with commas') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4571 | parser.add_option('--message-file', dest='message_file', |
| 4572 | help='file which contains message for patchset') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4573 | parser.add_option('--title', '-t', dest='title', |
| 4574 | help='title for patchset') |
Mario Bianucci | cebfb4e | 2020-07-22 23:08:16 +0000 | [diff] [blame] | 4575 | parser.add_option('-T', '--skip-title', action='store_true', |
| 4576 | dest='skip_title', |
| 4577 | help='Use the most recent commit message as the title of ' |
| 4578 | 'the patchset') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4579 | parser.add_option('-r', '--reviewers', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4580 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4581 | help='reviewer email addresses') |
| 4582 | parser.add_option('--cc', |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4583 | action='append', default=[], |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4584 | help='cc email addresses') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4585 | parser.add_option('--hashtag', dest='hashtags', |
| 4586 | action='append', default=[], |
| 4587 | help=('Gerrit hashtag for new CL; ' |
| 4588 | 'can be applied multiple times')) |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 4589 | parser.add_option('-s', |
| 4590 | '--send-mail', |
| 4591 | '--send-email', |
| 4592 | dest='send_mail', |
| 4593 | action='store_true', |
Aaron Gable | 59f4851 | 2017-01-12 10:54:46 -0800 | [diff] [blame] | 4594 | help='send email to reviewer(s) and cc(s) immediately') |
ukai@chromium.org | 8ef7ab2 | 2012-11-28 04:24:52 +0000 | [diff] [blame] | 4595 | parser.add_option('--target_branch', |
pgervais@chromium.org | b9f2751 | 2014-08-08 15:52:33 +0000 | [diff] [blame] | 4596 | '--target-branch', |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 4597 | metavar='TARGET', |
| 4598 | help='Apply CL to remote ref TARGET. ' + |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 4599 | 'Default: remote branch head, or main') |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 4600 | parser.add_option('--squash', action='store_true', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4601 | help='Squash multiple commits into one') |
Mike Frysinger | a989d55 | 2019-08-14 20:51:23 +0000 | [diff] [blame] | 4602 | parser.add_option('--no-squash', action='store_false', dest='squash', |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4603 | help='Don\'t squash multiple commits into one') |
rmistry | 9eadede | 2016-09-19 11:22:43 -0700 | [diff] [blame] | 4604 | parser.add_option('--topic', default=None, |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4605 | help='Topic to specify when uploading') |
Robert Iannucci | f2708bd | 2017-04-17 15:49:02 -0700 | [diff] [blame] | 4606 | parser.add_option('--r-owners', dest='add_owners_to', action='store_const', |
| 4607 | const='R', help='add a set of OWNERS to R') |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 4608 | parser.add_option('-c', |
| 4609 | '--use-commit-queue', |
| 4610 | action='store_true', |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4611 | default=False, |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 4612 | help='tell the CQ to commit this patchset; ' |
Thiago Perrotta | b0fb8d5 | 2022-08-30 21:26:19 +0000 | [diff] [blame] | 4613 | 'implies --send-mail') |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4614 | parser.add_option('-d', '--cq-dry-run', |
| 4615 | action='store_true', default=False, |
rmistry@google.com | ef96622 | 2015-04-07 11:15:01 +0000 | [diff] [blame] | 4616 | help='Send the patchset to do a CQ dry run right after ' |
| 4617 | 'upload.') |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 4618 | parser.add_option( |
| 4619 | '-q', |
| 4620 | '--cq-quick-run', |
| 4621 | action='store_true', |
| 4622 | default=False, |
| 4623 | help='Send the patchset to do a CQ quick run right after ' |
| 4624 | 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do' |
| 4625 | 'cs/cq_quick_run.md) (chromium only).') |
Edward Lesmes | 10c3dd6 | 2021-02-08 21:13:57 +0000 | [diff] [blame] | 4626 | parser.add_option('--set-bot-commit', action='store_true', |
| 4627 | help=optparse.SUPPRESS_HELP) |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 4628 | parser.add_option('--preserve-tryjobs', action='store_true', |
| 4629 | help='instruct the CQ to let tryjobs running even after ' |
| 4630 | 'new patchsets are uploaded instead of canceling ' |
| 4631 | 'prior patchset\' tryjobs') |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4632 | parser.add_option('--dependencies', action='store_true', |
| 4633 | help='Uploads CLs of all the local branches that depend on ' |
| 4634 | 'the current branch') |
Ravi Mistry | 31e7d56 | 2018-04-02 12:53:57 -0400 | [diff] [blame] | 4635 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4636 | help='Sends your change to the CQ after an approval. Only ' |
| 4637 | 'works on repos that have the Auto-Submit label ' |
| 4638 | 'enabled') |
Edward Lesmes | 8e28279 | 2018-04-03 18:50:29 -0400 | [diff] [blame] | 4639 | parser.add_option('--parallel', action='store_true', |
| 4640 | help='Run all tests specified by input_api.RunTests in all ' |
| 4641 | 'PRESUBMIT files in parallel.') |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4642 | parser.add_option('--no-autocc', action='store_true', |
| 4643 | help='Disables automatic addition of CC emails') |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 4644 | parser.add_option('--private', action='store_true', |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4645 | help='Set the review private. This implies --no-autocc.') |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4646 | parser.add_option('-R', '--retry-failed', action='store_true', |
| 4647 | help='Retry failed tryjobs from old patchset immediately ' |
| 4648 | 'after uploading new patchset. Cannot be used with ' |
| 4649 | '--use-commit-queue or --cq-dry-run.') |
| 4650 | parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 4651 | help='Host of buildbucket. The default host is %default.') |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 4652 | parser.add_option('--fixed', '-x', |
| 4653 | help='List of bugs that will be commented on and marked ' |
| 4654 | 'fixed (pre-populates "Fixed:" tag). Same format as ' |
| 4655 | '-b option / "Bug:" tag. If fixing several issues, ' |
| 4656 | 'separate with commas.') |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 4657 | parser.add_option('--edit-description', action='store_true', default=False, |
| 4658 | help='Modify description before upload. Cannot be used ' |
| 4659 | 'with --force. It is a noop when --no-squash is set ' |
| 4660 | 'or a new commit is created.') |
Ng Zhi An | cdaf0be | 2020-05-27 20:57:28 +0000 | [diff] [blame] | 4661 | parser.add_option('--git-completion-helper', action="store_true", |
| 4662 | help=optparse.SUPPRESS_HELP) |
Saagar Sanghavi | 9949ab7 | 2020-07-20 20:56:40 +0000 | [diff] [blame] | 4663 | parser.add_option('--resultdb', action='store_true', |
| 4664 | help='Run presubmit checks in the ResultSink environment ' |
| 4665 | 'and send results to the ResultDB database.') |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 4666 | parser.add_option('--realm', help='LUCI realm if reporting to ResultDB') |
Josip Sokcevic | f2cfd3d | 2021-03-30 18:39:18 +0000 | [diff] [blame] | 4667 | parser.add_option('-o', |
| 4668 | '--push-options', |
| 4669 | action='append', |
| 4670 | default=[], |
| 4671 | help='Transmit the given string to the server when ' |
| 4672 | 'performing git push (pass-through). See git-push ' |
| 4673 | 'documentation for more details.') |
Gregory Nisbet | 48d9e1e | 2021-04-15 23:35:54 +0000 | [diff] [blame] | 4674 | parser.add_option('--no-add-changeid', |
| 4675 | action='store_true', |
| 4676 | dest='no_add_changeid', |
| 4677 | help='Do not add change-ids to messages.') |
Brian Sheedy | 7326ca2 | 2022-11-02 18:36:17 +0000 | [diff] [blame] | 4678 | parser.add_option('--no-python2-post-upload-hooks', |
| 4679 | action='store_true', |
| 4680 | help='Only run post-upload hooks in Python 3.') |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 4681 | parser.add_option('--stacked-exp', |
| 4682 | action='store_true', |
| 4683 | help=optparse.SUPPRESS_HELP) |
Sergiy Byelozyorov | 1aa405f | 2018-09-18 17:38:43 +0000 | [diff] [blame] | 4684 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 4685 | orig_args = args |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4686 | (options, args) = parser.parse_args(args) |
| 4687 | |
Ng Zhi An | cdaf0be | 2020-05-27 20:57:28 +0000 | [diff] [blame] | 4688 | if options.git_completion_helper: |
Edward Lesmes | b7db183 | 2020-06-22 20:22:27 +0000 | [diff] [blame] | 4689 | print(' '.join(opt.get_opt_string() for opt in parser.option_list |
| 4690 | if opt.help != optparse.SUPPRESS_HELP)) |
| 4691 | return |
Ng Zhi An | cdaf0be | 2020-05-27 20:57:28 +0000 | [diff] [blame] | 4692 | |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 4693 | if git_common.is_dirty_git_tree('upload'): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4694 | return 1 |
| 4695 | |
maruel@chromium.org | eb52a5c | 2013-04-10 23:17:09 +0000 | [diff] [blame] | 4696 | options.reviewers = cleanup_list(options.reviewers) |
| 4697 | options.cc = cleanup_list(options.cc) |
| 4698 | |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 4699 | if options.edit_description and options.force: |
| 4700 | parser.error('Only one of --force and --edit-description allowed') |
| 4701 | |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4702 | if options.message_file: |
| 4703 | if options.message: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4704 | parser.error('Only one of --message and --message-file allowed.') |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4705 | options.message = gclient_utils.FileRead(options.message_file) |
tandrii | b80458a | 2016-06-23 12:20:07 -0700 | [diff] [blame] | 4706 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4707 | if ([options.cq_dry_run, |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 4708 | options.cq_quick_run, |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4709 | options.use_commit_queue, |
| 4710 | options.retry_failed].count(True) > 1): |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 4711 | parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run ' |
| 4712 | 'or --retry-failed is allowed.') |
tandrii | 4d0545a | 2016-07-06 03:56:49 -0700 | [diff] [blame] | 4713 | |
Mario Bianucci | cebfb4e | 2020-07-22 23:08:16 +0000 | [diff] [blame] | 4714 | if options.skip_title and options.title: |
| 4715 | parser.error('Only one of --title and --skip-title allowed.') |
| 4716 | |
Aaron Gable | edbc413 | 2017-09-11 13:22:28 -0700 | [diff] [blame] | 4717 | if options.use_commit_queue: |
| 4718 | options.send_mail = True |
| 4719 | |
Edward Lesmes | 0dd5482 | 2020-03-26 18:24:25 +0000 | [diff] [blame] | 4720 | if options.squash is None: |
| 4721 | # Load default for user, repo, squash=true, in this order. |
| 4722 | options.squash = settings.GetSquashGerritUploads() |
| 4723 | |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 4724 | if options.stacked_exp: |
| 4725 | orig_args.remove('--stacked-exp') |
| 4726 | |
| 4727 | UploadAllSquashed(options, orig_args) |
| 4728 | return 0 |
| 4729 | |
Josip Sokcevic | 1cabb17 | 2021-04-08 19:15:35 +0000 | [diff] [blame] | 4730 | cl = Changelist(branchref=options.target_branch) |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 4731 | # Warm change details cache now to avoid RPCs later, reducing latency for |
| 4732 | # developers. |
| 4733 | if cl.GetIssue(): |
| 4734 | cl._GetChangeDetail( |
| 4735 | ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']) |
| 4736 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4737 | if options.retry_failed and not cl.GetIssue(): |
| 4738 | print('No previous patchsets, so --retry-failed has no effect.') |
| 4739 | options.retry_failed = False |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 4740 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4741 | # cl.GetMostRecentPatchset uses cached information, and can return the last |
| 4742 | # patchset before upload. Calling it here makes it clear that it's the |
| 4743 | # last patchset before upload. Note that GetMostRecentPatchset will fail |
| 4744 | # if no CL has been uploaded yet. |
| 4745 | if options.retry_failed: |
| 4746 | patchset = cl.GetMostRecentPatchset() |
Andrii Shyshkalov | 9f27443 | 2018-10-15 16:40:23 +0000 | [diff] [blame] | 4747 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4748 | ret = cl.CMDUpload(options, args, orig_args) |
| 4749 | |
| 4750 | if options.retry_failed: |
| 4751 | if ret != 0: |
| 4752 | print('Upload failed, so --retry-failed has no effect.') |
| 4753 | return ret |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 4754 | builds, _ = _fetch_latest_builds( |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 4755 | cl, options.buildbucket_host, latest_patchset=patchset) |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 4756 | jobs = _filter_failed_for_retry(builds) |
| 4757 | if len(jobs) == 0: |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4758 | print('No failed tryjobs, so --retry-failed has no effect.') |
| 4759 | return ret |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 4760 | _trigger_tryjobs(cl, jobs, options, patchset + 1) |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 4761 | |
| 4762 | return ret |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 4763 | |
| 4764 | |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 4765 | def UploadAllSquashed(options, orig_args): |
| 4766 | # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool] |
| 4767 | """Uploads the current and upstream branches (if necessary).""" |
| 4768 | _cls, _cherry_pick_current = _UploadAllPrecheck(options, orig_args) |
| 4769 | |
| 4770 | # TODO(b/265929888): parse cls and create commits. |
| 4771 | |
| 4772 | |
| 4773 | def _UploadAllPrecheck(options, orig_args): |
| 4774 | # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool] |
| 4775 | """Checks the state of the tree and gives the user uploading options |
| 4776 | |
| 4777 | Returns: A tuple of the ordered list of changes that have new commits |
| 4778 | since their last upload and a boolean of whether the user wants to |
| 4779 | cherry-pick and upload the current branch instead of uploading all cls. |
| 4780 | """ |
| 4781 | branch_ref = None |
| 4782 | cls = [] |
| 4783 | must_upload_upstream = False |
| 4784 | |
| 4785 | Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force) |
| 4786 | |
| 4787 | while True: |
| 4788 | if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD: |
| 4789 | DieWithError( |
| 4790 | 'More than %s branches in the stack have not been uploaded.\n' |
| 4791 | 'Are your branches in a misconfigured state?\n' |
| 4792 | 'If not, please upload some upstream changes first.' % |
| 4793 | (_MAX_STACKED_BRANCHES_UPLOAD)) |
| 4794 | |
| 4795 | cl = Changelist(branchref=branch_ref) |
| 4796 | cls.append(cl) |
| 4797 | |
| 4798 | origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch()) |
| 4799 | upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref) |
| 4800 | branch_ref = upstream_branch_ref # set branch for next run. |
| 4801 | |
| 4802 | # Case 1: We've reached the beginning of the tree. |
| 4803 | if origin != '.': |
| 4804 | break |
| 4805 | |
| 4806 | upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(), |
| 4807 | upstream_branch, |
| 4808 | LAST_UPLOAD_HASH_CONFIG_KEY) |
| 4809 | |
| 4810 | # Case 2: If any upstream branches have never been uploaded, |
| 4811 | # the user MUST upload them. |
| 4812 | if not upstream_last_upload: |
| 4813 | must_upload_upstream = True |
| 4814 | continue |
| 4815 | |
| 4816 | base_commit = cl.GetCommonAncestorWithUpstream() |
| 4817 | |
| 4818 | # Case 3: If upstream's last_upload == cl.base_commit we do |
| 4819 | # not need to upload any more upstreams from this point on. |
| 4820 | # (Even if there may be diverged branches higher up the tree) |
| 4821 | if base_commit == upstream_last_upload: |
| 4822 | break |
| 4823 | |
| 4824 | # Case 4: If upstream's last_upload < cl.base_commit we are |
| 4825 | # uploading cl and upstream_cl. |
| 4826 | # Continue up the tree to check other branch relations. |
Joanna Wang | ab9c6ba | 2023-01-21 01:46:36 +0000 | [diff] [blame] | 4827 | if scm.GIT.IsAncestor(upstream_last_upload, base_commit): |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 4828 | continue |
| 4829 | |
| 4830 | # Case 5: If cl.base_commit < upstream's last_upload the user |
| 4831 | # must rebase before uploading. |
Joanna Wang | ab9c6ba | 2023-01-21 01:46:36 +0000 | [diff] [blame] | 4832 | if scm.GIT.IsAncestor(base_commit, upstream_last_upload): |
Joanna Wang | 18de1f6 | 2023-01-21 01:24:24 +0000 | [diff] [blame] | 4833 | DieWithError( |
| 4834 | 'At least one branch in the stack has diverged from its upstream ' |
| 4835 | 'branch and does not contain its upstream\'s last upload.\n' |
| 4836 | 'Please rebase the stack with `git rebase-update` before uploading.') |
| 4837 | |
| 4838 | # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has |
| 4839 | # any relation to commits in the tree. Continue up the tree until we hit |
| 4840 | # the root. |
| 4841 | |
| 4842 | # We assume all cls in the stack have the same auth requirements and only |
| 4843 | # check this once. |
| 4844 | cls[0].EnsureAuthenticated(force=options.force) |
| 4845 | |
| 4846 | cherry_pick = False |
| 4847 | if len(cls) > 1: |
| 4848 | message = '' |
| 4849 | if len(orig_args): |
| 4850 | message = ('options %s will be used for all uploads.\n' % orig_args) |
| 4851 | if must_upload_upstream: |
| 4852 | confirm_or_exit('\n' + message + |
| 4853 | 'There are upstream branches that must be uploaded.\n') |
| 4854 | else: |
| 4855 | answer = gclient_utils.AskForData( |
| 4856 | '\n' + message + |
| 4857 | 'Press enter to update branches %s.\nOr type `n` to upload only ' |
| 4858 | '`%s` cherry-picked on %s\'s last upload:' % |
| 4859 | ([cl.branch for cl in cls], cls[0].branch, cls[1].branch)) |
| 4860 | if answer.lower() == 'n': |
| 4861 | cherry_pick = True |
| 4862 | return cls, cherry_pick |
| 4863 | |
| 4864 | |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4865 | @subcommand.usage('--description=<description file>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4866 | @metrics.collector.collect_metrics('git cl split') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4867 | def CMDsplit(parser, args): |
| 4868 | """Splits a branch into smaller branches and uploads CLs. |
| 4869 | |
| 4870 | Creates a branch and uploads a CL for each group of files modified in the |
| 4871 | current branch that share a common OWNERS file. In the CL description and |
Edward Lemur | ac5c55f | 2020-02-29 00:17:16 +0000 | [diff] [blame] | 4872 | comment, the string '$directory', is replaced with the directory containing |
| 4873 | the shared OWNERS file. |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4874 | """ |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4875 | parser.add_option('-d', '--description', dest='description_file', |
| 4876 | help='A text file containing a CL description in which ' |
| 4877 | '$directory will be replaced by each CL\'s directory.') |
| 4878 | parser.add_option('-c', '--comment', dest='comment_file', |
| 4879 | help='A text file containing a CL comment.') |
| 4880 | parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true', |
Chris Watkins | ba28e46 | 2017-12-13 11:22:17 +1100 | [diff] [blame] | 4881 | default=False, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 4882 | help='List the files and reviewers for each CL that would ' |
| 4883 | 'be created, but don\'t create branches or CLs.') |
| 4884 | parser.add_option('--cq-dry-run', action='store_true', |
| 4885 | help='If set, will do a cq dry run for each uploaded CL. ' |
| 4886 | 'Please be careful when doing this; more than ~10 CLs ' |
| 4887 | 'has the potential to overload our build ' |
| 4888 | 'infrastructure. Try to upload these not during high ' |
| 4889 | 'load times (usually 11-3 Mountain View time). Email ' |
| 4890 | 'infra-dev@chromium.org with any questions.') |
Takuto Ikuta | 51eca59 | 2019-02-14 19:40:52 +0000 | [diff] [blame] | 4891 | parser.add_option('-a', '--enable-auto-submit', action='store_true', |
| 4892 | default=True, |
| 4893 | help='Sends your change to the CQ after an approval. Only ' |
| 4894 | 'works on repos that have the Auto-Submit label ' |
| 4895 | 'enabled') |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 4896 | parser.add_option('--max-depth', |
| 4897 | type='int', |
| 4898 | default=0, |
| 4899 | help='The max depth to look for OWNERS files. Useful for ' |
| 4900 | 'controlling the granularity of the split CLs, e.g. ' |
| 4901 | '--max-depth=1 will only split by top-level ' |
| 4902 | 'directory. Specifying a value less than 1 means no ' |
| 4903 | 'limit on max depth.') |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4904 | options, _ = parser.parse_args(args) |
| 4905 | |
| 4906 | if not options.description_file: |
| 4907 | parser.error('No --description flag specified.') |
| 4908 | |
| 4909 | def WrappedCMDupload(args): |
| 4910 | return CMDupload(OptionParser(), args) |
| 4911 | |
Daniel Cheng | 403c44e | 2022-10-05 22:24:58 +0000 | [diff] [blame] | 4912 | return split_cl.SplitCl(options.description_file, options.comment_file, |
| 4913 | Changelist, WrappedCMDupload, options.dry_run, |
| 4914 | options.cq_dry_run, options.enable_auto_submit, |
| 4915 | options.max_depth, settings.GetRoot()) |
Francois Doray | d42c681 | 2017-05-30 15:10:20 -0400 | [diff] [blame] | 4916 | |
| 4917 | |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4918 | @subcommand.usage('DEPRECATED') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4919 | @metrics.collector.collect_metrics('git cl commit') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4920 | def CMDdcommit(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4921 | """DEPRECATED: Used to commit the current changelist via git-svn.""" |
| 4922 | message = ('git-cl no longer supports committing to SVN repositories via ' |
| 4923 | 'git-svn. You probably want to use `git cl land` instead.') |
| 4924 | print(message) |
| 4925 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4926 | |
| 4927 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 4928 | @subcommand.usage('[upstream branch to apply against]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4929 | @metrics.collector.collect_metrics('git cl land') |
pgervais@chromium.org | cee6dc4 | 2014-05-07 17:04:03 +0000 | [diff] [blame] | 4930 | def CMDland(parser, args): |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4931 | """Commits the current changelist via git. |
| 4932 | |
| 4933 | In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes |
| 4934 | upstream and closes the issue automatically and atomically. |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4935 | """ |
| 4936 | parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks', |
| 4937 | help='bypass upload presubmit hook') |
Aaron Gable | f7543cd | 2017-07-20 14:26:31 -0700 | [diff] [blame] | 4938 | parser.add_option('-f', '--force', action='store_true', dest='force', |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4939 | help="force yes to questions (don't prompt)") |
Edward Lesmes | 67b3faa | 2018-04-13 17:50:52 -0400 | [diff] [blame] | 4940 | parser.add_option('--parallel', action='store_true', |
| 4941 | help='Run all tests specified by input_api.RunTests in all ' |
| 4942 | 'PRESUBMIT files in parallel.') |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 4943 | parser.add_option('--resultdb', action='store_true', |
| 4944 | help='Run presubmit checks in the ResultSink environment ' |
| 4945 | 'and send results to the ResultDB database.') |
| 4946 | parser.add_option('--realm', help='LUCI realm if reporting to ResultDB') |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4947 | (options, args) = parser.parse_args(args) |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4948 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4949 | cl = Changelist() |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 4950 | |
Robert Iannucci | 2e73d43 | 2018-03-14 01:10:47 -0700 | [diff] [blame] | 4951 | if not cl.GetIssue(): |
| 4952 | DieWithError('You must upload the change first to Gerrit.\n' |
| 4953 | ' If you would rather have `git cl land` upload ' |
| 4954 | 'automatically for you, see http://crbug.com/642759') |
Saagar Sanghavi | 03b1513 | 2020-08-10 16:43:41 +0000 | [diff] [blame] | 4955 | return cl.CMDLand(options.force, options.bypass_hooks, options.verbose, |
| 4956 | options.parallel, options.resultdb, options.realm) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4957 | |
| 4958 | |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4959 | @subcommand.usage('<patch url or issue id or issue url>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 4960 | @metrics.collector.collect_metrics('git cl patch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4961 | def CMDpatch(parser, args): |
marq@chromium.org | e5e5900 | 2013-10-02 23:21:25 +0000 | [diff] [blame] | 4962 | """Patches in a code review.""" |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4963 | parser.add_option('-b', dest='newbranch', |
| 4964 | help='create a new branch off trunk for the patch') |
qsr@chromium.org | 1ef44af | 2013-10-16 16:24:32 +0000 | [diff] [blame] | 4965 | parser.add_option('-f', '--force', action='store_true', |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 4966 | help='overwrite state on the current or chosen branch') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4967 | parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit', |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 4968 | help='don\'t commit after patch applies.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4969 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4970 | group = optparse.OptionGroup( |
| 4971 | parser, |
| 4972 | 'Options for continuing work on the current issue uploaded from a ' |
| 4973 | 'different clone (e.g. different machine). Must be used independently ' |
| 4974 | 'from the other options. No issue number should be specified, and the ' |
| 4975 | 'branch must have an issue number associated with it') |
| 4976 | group.add_option('--reapply', action='store_true', dest='reapply', |
| 4977 | help='Reset the branch and reapply the issue.\n' |
| 4978 | 'CAUTION: This will undo any local changes in this ' |
| 4979 | 'branch') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4980 | |
| 4981 | group.add_option('--pull', action='store_true', dest='pull', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 4982 | help='Performs a pull before reapplying.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4983 | parser.add_option_group(group) |
| 4984 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 4985 | (options, args) = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 4986 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4987 | if options.reapply: |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4988 | if options.newbranch: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4989 | parser.error('--reapply works on the current branch only.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4990 | if len(args) > 0: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4991 | parser.error('--reapply implies no additional arguments.') |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 4992 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 4993 | cl = Changelist() |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4994 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4995 | parser.error('Current branch must have an associated issue.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 4996 | |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 4997 | upstream = cl.GetUpstreamBranch() |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 4998 | if upstream is None: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 4999 | parser.error('No upstream branch specified. Cannot reset branch.') |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 5000 | |
| 5001 | RunGit(['reset', '--hard', upstream]) |
| 5002 | if options.pull: |
| 5003 | RunGit(['pull']) |
mtrofin@chromium.org | 1d88dd3 | 2016-02-04 16:25:12 +0000 | [diff] [blame] | 5004 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 5005 | target_issue_arg = ParseIssueNumberArgument(cl.GetIssue()) |
Bruce Dawson | f362f6f | 2021-02-18 23:15:17 +0000 | [diff] [blame] | 5006 | return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False, |
| 5007 | False) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5008 | |
| 5009 | if len(args) != 1 or not args[0]: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5010 | parser.error('Must specify issue number or URL.') |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5011 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5012 | target_issue_arg = ParseIssueNumberArgument(args[0]) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5013 | if not target_issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5014 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5015 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5016 | # We don't want uncommitted changes mixed up with the patch. |
| 5017 | if git_common.is_dirty_git_tree('patch'): |
dsinclair@chromium.org | fbed656 | 2015-09-25 21:22:36 +0000 | [diff] [blame] | 5018 | return 1 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5019 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5020 | if options.newbranch: |
| 5021 | if options.force: |
| 5022 | RunGit(['branch', '-D', options.newbranch], |
| 5023 | stderr=subprocess2.PIPE, error_ok=True) |
Edward Lemur | 8410164 | 2020-02-21 21:40:34 +0000 | [diff] [blame] | 5024 | git_new_branch.create_new_branch(options.newbranch) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5025 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 5026 | cl = Changelist( |
| 5027 | codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 5028 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 5029 | if not args[0].isdigit(): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5030 | print('canonical issue/change URL: %s\n' % cl.GetIssueURL()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5031 | |
Bruce Dawson | f362f6f | 2021-02-18 23:15:17 +0000 | [diff] [blame] | 5032 | return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, |
| 5033 | options.force, options.newbranch) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5034 | |
| 5035 | |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 5036 | def GetTreeStatus(url=None): |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5037 | """Fetches the tree status and returns either 'open', 'closed', |
| 5038 | 'unknown' or 'unset'.""" |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 5039 | url = url or settings.GetTreeStatusUrl(error_ok=True) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5040 | if url: |
Daniel McArdle | 8b4eeff | 2020-07-20 17:02:47 +0000 | [diff] [blame] | 5041 | status = str(urllib.request.urlopen(url).read().lower()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5042 | if status.find('closed') != -1 or status == '0': |
| 5043 | return 'closed' |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 5044 | |
| 5045 | if status.find('open') != -1 or status == '1': |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5046 | return 'open' |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 5047 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5048 | return 'unknown' |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5049 | return 'unset' |
| 5050 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 5051 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5052 | def GetTreeStatusReason(): |
| 5053 | """Fetches the tree status from a json url and returns the message |
| 5054 | with the reason for the tree to be opened or closed.""" |
msb@chromium.org | bf1a7ba | 2011-02-01 16:21:46 +0000 | [diff] [blame] | 5055 | url = settings.GetTreeStatusUrl() |
Daniel McArdle | 8b4eeff | 2020-07-20 17:02:47 +0000 | [diff] [blame] | 5056 | json_url = urllib.parse.urljoin(url, '/current?format=json') |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 5057 | connection = urllib.request.urlopen(json_url) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5058 | status = json.loads(connection.read()) |
| 5059 | connection.close() |
| 5060 | return status['message'] |
| 5061 | |
dpranke@chromium.org | 970c522 | 2011-03-12 00:32:24 +0000 | [diff] [blame] | 5062 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5063 | @metrics.collector.collect_metrics('git cl tree') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5064 | def CMDtree(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5065 | """Shows the status of the tree.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 5066 | _, args = parser.parse_args(args) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5067 | status = GetTreeStatus() |
| 5068 | if 'unset' == status: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5069 | 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] | 5070 | return 2 |
| 5071 | |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5072 | print('The tree is %s' % status) |
| 5073 | print() |
| 5074 | print(GetTreeStatusReason()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5075 | if status != 'open': |
| 5076 | return 1 |
| 5077 | return 0 |
| 5078 | |
| 5079 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5080 | @metrics.collector.collect_metrics('git cl try') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5081 | def CMDtry(parser, args): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5082 | """Triggers tryjobs using either Buildbucket or CQ dry run.""" |
| 5083 | group = optparse.OptionGroup(parser, 'Tryjob options') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5084 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5085 | '-b', '--bot', action='append', |
| 5086 | help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple ' |
| 5087 | 'times to specify multiple builders. ex: ' |
| 5088 | '"-b win_rel -b win_layout". See ' |
| 5089 | 'the try server waterfall for the builders name and the tests ' |
| 5090 | 'available.')) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5091 | group.add_option( |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 5092 | '-B', '--bucket', default='', |
Ben Pastene | 08a30b2 | 2022-05-04 17:46:38 +0000 | [diff] [blame] | 5093 | help=('Buildbucket bucket to send the try requests. Format: ' |
| 5094 | '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"')) |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 5095 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5096 | '-r', '--revision', |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5097 | help='Revision to use for the tryjob; default: the revision will ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 5098 | 'be determined by the try recipe that builder runs, which usually ' |
Josip Sokcevic | c39ab99 | 2020-09-24 20:09:15 +0000 | [diff] [blame] | 5099 | 'defaults to HEAD of origin/master or origin/main') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5100 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5101 | '-c', '--clobber', action='store_true', default=False, |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 5102 | help='Force a clobber before building; that is don\'t do an ' |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5103 | 'incremental build') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5104 | group.add_option( |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5105 | '-q', |
| 5106 | '--quick-run', |
| 5107 | action='store_true', |
| 5108 | default=False, |
| 5109 | help='trigger in quick run mode ' |
| 5110 | '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q' |
| 5111 | 'uick_run.md) (chromium only).') |
| 5112 | group.add_option( |
Andrii Shyshkalov | f9648b5 | 2018-02-21 22:32:42 -0800 | [diff] [blame] | 5113 | '--category', default='git_cl_try', help='Specify custom build category.') |
| 5114 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5115 | '--project', |
| 5116 | help='Override which project to use. Projects are defined ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 5117 | 'in recipe to determine to which repository or directory to ' |
| 5118 | 'apply the patch') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5119 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5120 | '-p', '--property', dest='properties', action='append', default=[], |
| 5121 | help='Specify generic properties in the form -p key1=value1 -p ' |
tandrii | f7b29d4 | 2016-10-07 08:45:41 -0700 | [diff] [blame] | 5122 | 'key2=value2 etc. The value will be treated as ' |
| 5123 | 'json if decodable, or as string otherwise. ' |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5124 | 'NOTE: using this may make your tryjob not usable for CQ, ' |
| 5125 | 'which will then schedule another tryjob with default properties') |
sheyang@chromium.org | db37557 | 2015-08-17 19:22:23 +0000 | [diff] [blame] | 5126 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5127 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 5128 | help='Host of buildbucket. The default host is %default.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5129 | parser.add_option_group(group) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5130 | parser.add_option( |
| 5131 | '-R', '--retry-failed', action='store_true', default=False, |
| 5132 | help='Retry failed jobs from the latest set of tryjobs. ' |
| 5133 | 'Not allowed with --bucket and --bot options.') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5134 | parser.add_option( |
| 5135 | '-i', '--issue', type=int, |
| 5136 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 5137 | 'issue.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5138 | options, args = parser.parse_args(args) |
| 5139 | |
machenbach@chromium.org | 4545314 | 2015-09-15 08:45:22 +0000 | [diff] [blame] | 5140 | # Make sure that all properties are prop=value pairs. |
| 5141 | bad_params = [x for x in options.properties if '=' not in x] |
| 5142 | if bad_params: |
| 5143 | parser.error('Got properties with missing "=": %s' % bad_params) |
| 5144 | |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5145 | if args: |
| 5146 | parser.error('Unknown arguments: %s' % args) |
| 5147 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5148 | cl = Changelist(issue=options.issue) |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5149 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5150 | parser.error('Need to upload first.') |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5151 | |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5152 | # HACK: warm up Gerrit change detail cache to save on RPCs. |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 5153 | cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS']) |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 5154 | |
tandrii | e113dfd | 2016-10-11 10:20:12 -0700 | [diff] [blame] | 5155 | error_message = cl.CannotTriggerTryJobReason() |
| 5156 | if error_message: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5157 | parser.error('Can\'t trigger tryjobs: %s' % error_message) |
jrobbins@chromium.org | 16f10f7 | 2014-06-24 22:14:36 +0000 | [diff] [blame] | 5158 | |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 5159 | if options.bot: |
| 5160 | if options.retry_failed: |
| 5161 | parser.error('--bot is not compatible with --retry-failed.') |
| 5162 | if not options.bucket: |
| 5163 | parser.error('A bucket (e.g. "chromium/try") is required.') |
| 5164 | |
| 5165 | triggered = [b for b in options.bot if 'triggered' in b] |
| 5166 | if triggered: |
| 5167 | parser.error( |
| 5168 | 'Cannot schedule builds on triggered bots: %s.\n' |
| 5169 | 'This type of bot requires an initial job from a parent (usually a ' |
| 5170 | 'builder). Schedule a job on the parent instead.\n' % triggered) |
| 5171 | |
| 5172 | if options.bucket.startswith('.master'): |
| 5173 | parser.error('Buildbot masters are not supported.') |
| 5174 | |
| 5175 | project, bucket = _parse_bucket(options.bucket) |
| 5176 | if project is None or bucket is None: |
| 5177 | parser.error('Invalid bucket: %s.' % options.bucket) |
| 5178 | jobs = sorted((project, bucket, bot) for bot in options.bot) |
| 5179 | elif options.retry_failed: |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5180 | print('Searching for failed tryjobs...') |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 5181 | builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5182 | if options.verbose: |
| 5183 | print('Got %d builds in patchset #%d' % (len(builds), patchset)) |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 5184 | jobs = _filter_failed_for_retry(builds) |
| 5185 | if not jobs: |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5186 | print('There are no failed jobs in the latest set of jobs ' |
| 5187 | '(patchset #%d), doing nothing.' % patchset) |
| 5188 | return 0 |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame] | 5189 | num_builders = len(jobs) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5190 | if num_builders > 10: |
| 5191 | confirm_or_exit('There are %d builders with failed builds.' |
| 5192 | % num_builders, action='continue') |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5193 | elif options.quick_run: |
| 5194 | print('Scheduling CQ quick run on: %s' % cl.GetIssueURL()) |
| 5195 | return cl.SetCQState(_CQState.QUICK_RUN) |
Quinten Yearsley | 983111f | 2019-09-26 17:18:48 +0000 | [diff] [blame] | 5196 | else: |
qyearsley | 1fdfcb6 | 2016-10-24 13:22:03 -0700 | [diff] [blame] | 5197 | if options.verbose: |
Quinten Yearsley | fc5fd92 | 2017-05-31 11:50:52 -0700 | [diff] [blame] | 5198 | print('git cl try with no bots now defaults to CQ dry run.') |
| 5199 | print('Scheduling CQ dry run on: %s' % cl.GetIssueURL()) |
| 5200 | return cl.SetCQState(_CQState.DRY_RUN) |
stip@chromium.org | 43064fd | 2013-12-18 20:07:44 +0000 | [diff] [blame] | 5201 | |
ilevy@chromium.org | 36e420b | 2013-08-06 23:21:12 +0000 | [diff] [blame] | 5202 | patchset = cl.GetMostRecentPatchset() |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 5203 | try: |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 5204 | _trigger_tryjobs(cl, jobs, options, patchset) |
Edward Lemur | 2c210a4 | 2019-09-16 23:58:35 +0000 | [diff] [blame] | 5205 | except BuildbucketResponseException as ex: |
| 5206 | print('ERROR: %s' % ex) |
| 5207 | return 1 |
| 5208 | return 0 |
maruel@chromium.org | 1519240 | 2012-09-06 12:38:29 +0000 | [diff] [blame] | 5209 | |
| 5210 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5211 | @metrics.collector.collect_metrics('git cl try-results') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5212 | def CMDtry_results(parser, args): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 5213 | """Prints info about results for tryjobs associated with the current CL.""" |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5214 | group = optparse.OptionGroup(parser, 'Tryjob results options') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5215 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5216 | '-p', '--patchset', type=int, help='patchset number if not current.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5217 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5218 | '--print-master', action='store_true', help='print master name as well.') |
tandrii@chromium.org | 6cf98c8 | 2016-03-15 11:56:00 +0000 | [diff] [blame] | 5219 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5220 | '--color', action='store_true', default=setup_color.IS_TTY, |
| 5221 | help='force color output, useful when piping output.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5222 | group.add_option( |
tandrii | 1838bad | 2016-10-06 00:10:52 -0700 | [diff] [blame] | 5223 | '--buildbucket-host', default='cr-buildbucket.appspot.com', |
| 5224 | help='Host of buildbucket. The default host is %default.') |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 5225 | group.add_option( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5226 | '--json', help=('Path of JSON output file to write tryjob results to,' |
Stefan Zager | 1306bd0 | 2017-06-22 19:26:46 -0700 | [diff] [blame] | 5227 | 'or "-" for stdout.')) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5228 | parser.add_option_group(group) |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5229 | parser.add_option( |
| 5230 | '-i', '--issue', type=int, |
| 5231 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 5232 | 'issue.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5233 | options, args = parser.parse_args(args) |
| 5234 | if args: |
| 5235 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 5236 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5237 | cl = Changelist(issue=options.issue) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5238 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5239 | parser.error('Need to upload first.') |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5240 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 5241 | patchset = options.patchset |
| 5242 | if not patchset: |
Gavin Mak | e61ccc5 | 2020-11-13 00:12:57 +0000 | [diff] [blame] | 5243 | patchset = cl.GetMostRecentDryRunPatchset() |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 5244 | if not patchset: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5245 | parser.error('Code review host doesn\'t know about issue %s. ' |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 5246 | 'No access to issue or wrong issue number?\n' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5247 | 'Either upload first, or pass --patchset explicitly.' % |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 5248 | cl.GetIssue()) |
| 5249 | |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5250 | try: |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 5251 | jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5252 | except BuildbucketResponseException as ex: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5253 | print('Buildbucket error: %s' % ex) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5254 | return 1 |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 5255 | if options.json: |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 5256 | write_json(options.json, jobs) |
qyearsley | 53f48a1 | 2016-09-01 10:45:13 -0700 | [diff] [blame] | 5257 | else: |
Quinten Yearsley | 777660f | 2020-03-04 23:37:06 +0000 | [diff] [blame] | 5258 | _print_tryjobs(options, jobs) |
tandrii@chromium.org | b015fac | 2016-02-26 14:52:01 +0000 | [diff] [blame] | 5259 | return 0 |
| 5260 | |
| 5261 | |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5262 | @subcommand.usage('[new upstream branch]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5263 | @metrics.collector.collect_metrics('git cl upstream') |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5264 | def CMDupstream(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5265 | """Prints or sets the name of the upstream branch, if any.""" |
dpranke@chromium.org | 97ae58e | 2011-03-18 00:29:20 +0000 | [diff] [blame] | 5266 | _, args = parser.parse_args(args) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 5267 | if len(args) > 1: |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5268 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 5269 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5270 | cl = Changelist() |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 5271 | if args: |
| 5272 | # One arg means set upstream branch. |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 5273 | branch = cl.GetBranch() |
stip | 7a3dd35 | 2016-09-22 17:32:28 -0700 | [diff] [blame] | 5274 | RunGit(['branch', '--set-upstream-to', args[0], branch]) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 5275 | cl = Changelist() |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5276 | print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),)) |
bauerb@chromium.org | c9cf90a | 2014-04-28 20:32:31 +0000 | [diff] [blame] | 5277 | |
| 5278 | # Clear configured merge-base, if there is one. |
| 5279 | git_common.remove_merge_base(branch) |
brettw@chromium.org | ac0ba33 | 2012-08-09 23:42:53 +0000 | [diff] [blame] | 5280 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5281 | print(cl.GetUpstreamBranch()) |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 5282 | return 0 |
| 5283 | |
| 5284 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5285 | @metrics.collector.collect_metrics('git cl web') |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 5286 | def CMDweb(parser, args): |
| 5287 | """Opens the current CL in the web browser.""" |
Orr Bernstein | 0b96058 | 2022-12-22 20:16:18 +0000 | [diff] [blame] | 5288 | parser.add_option('-p', |
| 5289 | '--print-only', |
| 5290 | action='store_true', |
| 5291 | dest='print_only', |
| 5292 | help='Only print the Gerrit URL, don\'t open it in the ' |
| 5293 | 'browser.') |
| 5294 | (options, args) = parser.parse_args(args) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 5295 | if args: |
| 5296 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
| 5297 | |
| 5298 | issue_url = Changelist().GetIssueURL() |
| 5299 | if not issue_url: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5300 | print('ERROR No issue to open', file=sys.stderr) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 5301 | return 1 |
| 5302 | |
Orr Bernstein | 0b96058 | 2022-12-22 20:16:18 +0000 | [diff] [blame] | 5303 | if options.print_only: |
| 5304 | print(issue_url) |
| 5305 | return 0 |
| 5306 | |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 5307 | # 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] | 5308 | # allows us to hide the "Created new window in existing browser session." |
| 5309 | # message from Chrome. Based on https://stackoverflow.com/a/2323563. |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 5310 | saved_stdout = os.dup(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 5311 | saved_stderr = os.dup(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 5312 | os.close(1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 5313 | os.close(2) |
Sergiy Byelozyorov | 2b71832 | 2018-10-24 17:43:31 +0000 | [diff] [blame] | 5314 | os.open(os.devnull, os.O_RDWR) |
| 5315 | try: |
| 5316 | webbrowser.open(issue_url) |
| 5317 | finally: |
| 5318 | os.dup2(saved_stdout, 1) |
Sergiy Belozorov | 0668403 | 2019-03-06 16:53:08 +0000 | [diff] [blame] | 5319 | os.dup2(saved_stderr, 2) |
thestig@chromium.org | 00858c8 | 2013-12-02 23:08:03 +0000 | [diff] [blame] | 5320 | return 0 |
| 5321 | |
| 5322 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5323 | @metrics.collector.collect_metrics('git cl set-commit') |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5324 | def CMDset_commit(parser, args): |
Andrii Shyshkalov | 0e889b7 | 2019-07-15 22:28:48 +0000 | [diff] [blame] | 5325 | """Sets the commit bit to trigger the CQ.""" |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5326 | parser.add_option('-d', '--dry-run', action='store_true', |
| 5327 | help='trigger in dry run mode') |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5328 | parser.add_option( |
| 5329 | '-q', |
| 5330 | '--quick-run', |
| 5331 | action='store_true', |
| 5332 | help='trigger in quick run mode ' |
| 5333 | '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu' |
| 5334 | 'ick_run.md) (chromium only).') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5335 | parser.add_option('-c', '--clear', action='store_true', |
| 5336 | help='stop CQ run, if any') |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5337 | parser.add_option( |
| 5338 | '-i', '--issue', type=int, |
| 5339 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 5340 | 'issue.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5341 | options, args = parser.parse_args(args) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5342 | if args: |
| 5343 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5344 | if [options.dry_run, options.quick_run, options.clear].count(True) > 1: |
| 5345 | parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5346 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5347 | cl = Changelist(issue=options.issue) |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5348 | if not cl.GetIssue(): |
| 5349 | parser.error('Must upload the issue first.') |
| 5350 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5351 | if options.clear: |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 5352 | state = _CQState.NONE |
Greg Guterman | be5fccd | 2021-06-14 17:58:20 +0000 | [diff] [blame] | 5353 | elif options.quick_run: |
| 5354 | state = _CQState.QUICK_RUN |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 5355 | elif options.dry_run: |
| 5356 | state = _CQState.DRY_RUN |
| 5357 | else: |
| 5358 | state = _CQState.COMMIT |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 5359 | cl.SetCQState(state) |
maruel@chromium.org | 27bb387 | 2011-05-30 20:33:19 +0000 | [diff] [blame] | 5360 | return 0 |
| 5361 | |
| 5362 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5363 | @metrics.collector.collect_metrics('git cl set-close') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5364 | def CMDset_close(parser, args): |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5365 | """Closes the issue.""" |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5366 | parser.add_option( |
| 5367 | '-i', '--issue', type=int, |
| 5368 | help='Operate on this issue instead of the current branch\'s implicit ' |
| 5369 | 'issue.') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5370 | options, args = parser.parse_args(args) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5371 | if args: |
| 5372 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5373 | cl = Changelist(issue=options.issue) |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5374 | # Ensure there actually is an issue to close. |
Aaron Gable | 7139a4e | 2017-09-05 17:53:09 -0700 | [diff] [blame] | 5375 | if not cl.GetIssue(): |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5376 | DieWithError('ERROR: No issue to close.') |
groby@chromium.org | 411034a | 2013-02-26 15:12:01 +0000 | [diff] [blame] | 5377 | cl.CloseIssue() |
| 5378 | return 0 |
| 5379 | |
| 5380 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5381 | @metrics.collector.collect_metrics('git cl diff') |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5382 | def CMDdiff(parser, args): |
wychen@chromium.org | 37b2ec0 | 2015-04-03 00:49:15 +0000 | [diff] [blame] | 5383 | """Shows differences between local tree and last upload.""" |
thomasanderson | 074beb2 | 2016-08-29 14:03:20 -0700 | [diff] [blame] | 5384 | parser.add_option( |
| 5385 | '--stat', |
| 5386 | action='store_true', |
| 5387 | dest='stat', |
| 5388 | help='Generate a diffstat') |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5389 | options, args = parser.parse_args(args) |
vadimsh@chromium.org | cf6a5d2 | 2015-04-09 22:02:00 +0000 | [diff] [blame] | 5390 | if args: |
| 5391 | parser.error('Unrecognized args: %s' % ' '.join(args)) |
wychen@chromium.org | 46309bf | 2015-04-03 21:04:49 +0000 | [diff] [blame] | 5392 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5393 | cl = Changelist() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 5394 | issue = cl.GetIssue() |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5395 | branch = cl.GetBranch() |
sbc@chromium.org | 78dc984 | 2013-11-25 18:43:44 +0000 | [diff] [blame] | 5396 | if not issue: |
| 5397 | DieWithError('No issue found for current branch (%s)' % branch) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5398 | |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 5399 | base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY) |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 5400 | if not base: |
Gavin Mak | be2e926 | 2022-11-08 23:41:55 +0000 | [diff] [blame] | 5401 | base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 5402 | if not base: |
| 5403 | detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT']) |
| 5404 | revision_info = detail['revisions'][detail['current_revision']] |
| 5405 | fetch_info = revision_info['fetch']['http'] |
| 5406 | RunGit(['fetch', fetch_info['url'], fetch_info['ref']]) |
| 5407 | base = 'FETCH_HEAD' |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5408 | |
Aaron Gable | a718c3e | 2017-08-28 17:47:28 -0700 | [diff] [blame] | 5409 | cmd = ['git', 'diff'] |
| 5410 | if options.stat: |
| 5411 | cmd.append('--stat') |
| 5412 | cmd.append(base) |
| 5413 | subprocess2.check_call(cmd) |
sbc@chromium.org | 87b9bf0 | 2013-09-26 20:35:15 +0000 | [diff] [blame] | 5414 | |
| 5415 | return 0 |
| 5416 | |
| 5417 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5418 | @metrics.collector.collect_metrics('git cl owners') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5419 | def CMDowners(parser, args): |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5420 | """Finds potential owners for reviewing.""" |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5421 | parser.add_option( |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 5422 | '--ignore-current', |
| 5423 | action='store_true', |
| 5424 | help='Ignore the CL\'s current reviewers and start from scratch.') |
| 5425 | parser.add_option( |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 5426 | '--ignore-self', |
| 5427 | action='store_true', |
| 5428 | help='Do not consider CL\'s author as an owners.') |
| 5429 | parser.add_option( |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5430 | '--no-color', |
| 5431 | action='store_true', |
| 5432 | help='Use this option to disable color output') |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5433 | parser.add_option( |
| 5434 | '--batch', |
| 5435 | action='store_true', |
| 5436 | help='Do not run interactively, just suggest some') |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5437 | # TODO: Consider moving this to another command, since other |
| 5438 | # git-cl owners commands deal with owners for a given CL. |
| 5439 | parser.add_option( |
| 5440 | '--show-all', |
| 5441 | action='store_true', |
| 5442 | help='Show all owners for a particular file') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5443 | options, args = parser.parse_args(args) |
| 5444 | |
Edward Lemur | 934836a | 2019-09-09 20:16:54 +0000 | [diff] [blame] | 5445 | cl = Changelist() |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 5446 | author = cl.GetAuthor() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5447 | |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5448 | if options.show_all: |
Bruce Dawson | 97ed44a | 2020-05-06 17:04:03 +0000 | [diff] [blame] | 5449 | if len(args) == 0: |
| 5450 | print('No files specified for --show-all. Nothing to do.') |
| 5451 | return 0 |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 5452 | owners_by_path = cl.owners_client.BatchListOwners(args) |
Edward Lesmes | 0e4e5ae | 2021-01-08 18:28:46 +0000 | [diff] [blame] | 5453 | for path in args: |
| 5454 | print('Owners for %s:' % path) |
| 5455 | print('\n'.join( |
| 5456 | ' - %s' % owner |
| 5457 | for owner in owners_by_path.get(path, ['No owners found']))) |
Yang Guo | 6e269a0 | 2019-06-26 11:17:02 +0000 | [diff] [blame] | 5458 | return 0 |
| 5459 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5460 | if args: |
| 5461 | if len(args) > 1: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5462 | parser.error('Unknown args.') |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5463 | base_branch = args[0] |
| 5464 | else: |
| 5465 | # Default to diffing against the common ancestor of the upstream branch. |
thestig@chromium.org | 8b0553c | 2014-02-11 00:33:37 +0000 | [diff] [blame] | 5466 | base_branch = cl.GetCommonAncestorWithUpstream() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5467 | |
Edward Lemur | 2c62b33 | 2020-03-12 22:12:33 +0000 | [diff] [blame] | 5468 | affected_files = cl.GetAffectedFiles(base_branch) |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5469 | |
| 5470 | if options.batch: |
Edward Lesmes | e157691 | 2021-02-16 21:53:34 +0000 | [diff] [blame] | 5471 | owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author]) |
| 5472 | print('\n'.join(owners)) |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5473 | return 0 |
| 5474 | |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5475 | return owners_finder.OwnersFinder( |
Dirk Pranke | bf98088 | 2017-09-02 15:08:00 -0700 | [diff] [blame] | 5476 | affected_files, |
Edward Lemur | 707d70b | 2018-02-07 00:50:14 +0100 | [diff] [blame] | 5477 | author, |
Sidney San MartÃn | 8e6f58c | 2018-06-08 01:02:56 +0000 | [diff] [blame] | 5478 | [] if options.ignore_current else cl.GetReviewers(), |
Edward Lesmes | 5cd7547 | 2021-02-19 00:34:25 +0000 | [diff] [blame] | 5479 | cl.owners_client, |
Jochen Eisinger | d0573ec | 2017-04-13 10:55:06 +0200 | [diff] [blame] | 5480 | disable_color=options.no_color, |
Sylvain Defresne | b1f865d | 2019-02-12 12:38:22 +0000 | [diff] [blame] | 5481 | ignore_author=options.ignore_self).run() |
ikarienator@chromium.org | faf3fdf | 2013-09-20 02:11:48 +0000 | [diff] [blame] | 5482 | |
| 5483 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5484 | def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5485 | """Generates a diff command.""" |
| 5486 | # Generate diff for the current branch's changes. |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5487 | diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff'] |
| 5488 | |
Aiden Benner | 6c18a1a | 2018-11-23 20:18:23 +0000 | [diff] [blame] | 5489 | if allow_prefix: |
| 5490 | # explicitly setting --src-prefix and --dst-prefix is necessary in the |
| 5491 | # case that diff.noprefix is set in the user's git config. |
| 5492 | diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/'] |
| 5493 | else: |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5494 | diff_cmd += ['--no-prefix'] |
| 5495 | |
| 5496 | diff_cmd += [diff_type, upstream_commit, '--'] |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5497 | |
| 5498 | if args: |
| 5499 | for arg in args: |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5500 | if os.path.isdir(arg) or os.path.isfile(arg): |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5501 | diff_cmd.append(arg) |
| 5502 | else: |
| 5503 | DieWithError('Argument "%s" is not a file or a directory' % arg) |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5504 | |
| 5505 | return diff_cmd |
| 5506 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5507 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5508 | def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit): |
| 5509 | """Runs clang-format-diff and sets a return value if necessary.""" |
| 5510 | |
| 5511 | if not clang_diff_files: |
| 5512 | return 0 |
| 5513 | |
| 5514 | # Set to 2 to signal to CheckPatchFormatted() that this patch isn't |
| 5515 | # formatted. This is used to block during the presubmit. |
| 5516 | return_value = 0 |
| 5517 | |
| 5518 | # Locate the clang-format binary in the checkout |
| 5519 | try: |
| 5520 | clang_format_tool = clang_format.FindClangFormatToolInChromiumTree() |
| 5521 | except clang_format.NotFoundError as e: |
| 5522 | DieWithError(e) |
| 5523 | |
| 5524 | if opts.full or settings.GetFormatFullByDefault(): |
| 5525 | cmd = [clang_format_tool] |
| 5526 | if not opts.dry_run and not opts.diff: |
| 5527 | cmd.append('-i') |
| 5528 | if opts.dry_run: |
| 5529 | for diff_file in clang_diff_files: |
| 5530 | with open(diff_file, 'r') as myfile: |
| 5531 | code = myfile.read().replace('\r\n', '\n') |
| 5532 | stdout = RunCommand(cmd + [diff_file], cwd=top_dir) |
| 5533 | stdout = stdout.replace('\r\n', '\n') |
| 5534 | if opts.diff: |
| 5535 | sys.stdout.write(stdout) |
| 5536 | if code != stdout: |
| 5537 | return_value = 2 |
| 5538 | else: |
| 5539 | stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir) |
| 5540 | if opts.diff: |
| 5541 | sys.stdout.write(stdout) |
| 5542 | else: |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5543 | try: |
| 5544 | script = clang_format.FindClangFormatScriptInChromiumTree( |
| 5545 | 'clang-format-diff.py') |
| 5546 | except clang_format.NotFoundError as e: |
| 5547 | DieWithError(e) |
| 5548 | |
Josip Sokcevic | 2a827fc | 2022-03-04 17:51:47 +0000 | [diff] [blame] | 5549 | cmd = ['vpython3', script, '-p0'] |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5550 | if not opts.dry_run and not opts.diff: |
| 5551 | cmd.append('-i') |
| 5552 | |
| 5553 | diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files) |
Edward Lemur | 1a83da1 | 2020-03-04 21:18:36 +0000 | [diff] [blame] | 5554 | diff_output = RunGit(diff_cmd).encode('utf-8') |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5555 | |
Edward Lesmes | 89624cd | 2020-04-06 17:51:56 +0000 | [diff] [blame] | 5556 | env = os.environ.copy() |
| 5557 | env['PATH'] = ( |
| 5558 | str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH']) |
| 5559 | stdout = RunCommand( |
| 5560 | cmd, stdin=diff_output, cwd=top_dir, env=env, |
Ilya Sherman | 7aed4bb | 2020-05-20 22:34:14 +0000 | [diff] [blame] | 5561 | shell=sys.platform.startswith('win32')) |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5562 | if opts.diff: |
| 5563 | sys.stdout.write(stdout) |
| 5564 | if opts.dry_run and len(stdout) > 0: |
| 5565 | return_value = 2 |
| 5566 | |
| 5567 | return return_value |
| 5568 | |
| 5569 | |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5570 | def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit): |
| 5571 | """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that |
| 5572 | presubmit checks have failed (and returns 0 otherwise).""" |
| 5573 | |
| 5574 | if not rust_diff_files: |
| 5575 | return 0 |
| 5576 | |
| 5577 | # Locate the rustfmt binary. |
| 5578 | try: |
| 5579 | rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree() |
| 5580 | except rustfmt.NotFoundError as e: |
| 5581 | DieWithError(e) |
| 5582 | |
| 5583 | # TODO(crbug.com/1231317): Support formatting only the changed lines |
| 5584 | # if `opts.full or settings.GetFormatFullByDefault()` is False. See also: |
| 5585 | # https://github.com/emilio/rustfmt-format-diff |
| 5586 | cmd = [rustfmt_tool] |
| 5587 | if opts.dry_run: |
| 5588 | cmd.append('--check') |
| 5589 | cmd += rust_diff_files |
| 5590 | rustfmt_exitcode = subprocess2.call(cmd) |
| 5591 | |
| 5592 | if opts.presubmit and rustfmt_exitcode != 0: |
| 5593 | return 2 |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 5594 | |
| 5595 | return 0 |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5596 | |
| 5597 | |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5598 | def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit): |
| 5599 | """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate |
| 5600 | that presubmit checks have failed (and returns 0 otherwise).""" |
| 5601 | |
| 5602 | if not swift_diff_files: |
| 5603 | return 0 |
| 5604 | |
| 5605 | # Locate the swift-format binary. |
| 5606 | try: |
| 5607 | swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree() |
| 5608 | except swift_format.NotFoundError as e: |
| 5609 | DieWithError(e) |
| 5610 | |
| 5611 | cmd = [swift_format_tool] |
| 5612 | if opts.dry_run: |
Olivier Robin | 7f39e3d | 2022-04-28 08:20:49 +0000 | [diff] [blame] | 5613 | cmd += ['lint', '-s'] |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5614 | else: |
| 5615 | cmd += ['format', '-i'] |
| 5616 | cmd += swift_diff_files |
| 5617 | swift_format_exitcode = subprocess2.call(cmd) |
| 5618 | |
| 5619 | if opts.presubmit and swift_format_exitcode != 0: |
| 5620 | return 2 |
| 5621 | |
| 5622 | return 0 |
| 5623 | |
| 5624 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5625 | def MatchingFileType(file_name, extensions): |
Quinten Yearsley | d242ed7 | 2019-07-25 17:17:55 +0000 | [diff] [blame] | 5626 | """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] | 5627 | 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] | 5628 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5629 | |
enne@chromium.org | 555cfe4 | 2014-01-29 18:21:39 +0000 | [diff] [blame] | 5630 | @subcommand.usage('[files or directories to diff]') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5631 | @metrics.collector.collect_metrics('git cl format') |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5632 | def CMDformat(parser, args): |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5633 | """Runs auto-formatting tools (clang-format etc.) on the diff.""" |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5634 | CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java'] |
kylechar | 58edce2 | 2016-06-17 06:07:51 -0700 | [diff] [blame] | 5635 | GN_EXTS = ['.gn', '.gni', '.typemap'] |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5636 | RUST_EXTS = ['.rs'] |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5637 | SWIFT_EXTS = ['.swift'] |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 5638 | parser.add_option('--full', action='store_true', |
| 5639 | help='Reformat the full content of all touched files') |
Tomasz Åšniatowski | 5819446 | 2021-08-27 17:36:16 +0000 | [diff] [blame] | 5640 | parser.add_option('--upstream', help='Branch to check against') |
enne@chromium.org | 3b7e15c | 2014-01-21 17:44:47 +0000 | [diff] [blame] | 5641 | parser.add_option('--dry-run', action='store_true', |
| 5642 | help='Don\'t modify any file on disk.') |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5643 | parser.add_option( |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5644 | '--no-clang-format', |
| 5645 | dest='clang_format', |
| 5646 | action='store_false', |
| 5647 | default=True, |
| 5648 | help='Disables formatting of various file types using clang-format.') |
| 5649 | parser.add_option( |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5650 | '--python', |
| 5651 | action='store_true', |
| 5652 | default=None, |
| 5653 | help='Enables python formatting on all python files.') |
| 5654 | parser.add_option( |
| 5655 | '--no-python', |
| 5656 | action='store_true', |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5657 | default=False, |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5658 | help='Disables python formatting on all python files. ' |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5659 | 'If neither --python or --no-python are set, python files that have a ' |
| 5660 | '.style.yapf file in an ancestor directory will be formatted. ' |
| 5661 | 'It is an error to set both.') |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5662 | parser.add_option( |
| 5663 | '--js', |
| 5664 | action='store_true', |
| 5665 | help='Format javascript code with clang-format. ' |
| 5666 | 'Has no effect if --no-clang-format is set.') |
wittman@chromium.org | 04d5a22 | 2014-03-07 18:30:42 +0000 | [diff] [blame] | 5667 | parser.add_option('--diff', action='store_true', |
| 5668 | help='Print diff to stdout rather than modifying files.') |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5669 | parser.add_option('--presubmit', action='store_true', |
| 5670 | help='Used when running the script from a presubmit.') |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5671 | |
| 5672 | parser.add_option('--rust-fmt', |
| 5673 | dest='use_rust_fmt', |
| 5674 | action='store_true', |
| 5675 | default=rustfmt.IsRustfmtSupported(), |
| 5676 | help='Enables formatting of Rust file types using rustfmt.') |
| 5677 | parser.add_option( |
| 5678 | '--no-rust-fmt', |
| 5679 | dest='use_rust_fmt', |
| 5680 | action='store_false', |
| 5681 | help='Disables formatting of Rust file types using rustfmt.') |
| 5682 | |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5683 | parser.add_option( |
| 5684 | '--swift-format', |
| 5685 | dest='use_swift_format', |
| 5686 | action='store_true', |
Olivier Robin | 7f39e3d | 2022-04-28 08:20:49 +0000 | [diff] [blame] | 5687 | default=swift_format.IsSwiftFormatSupported(), |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5688 | help='Enables formatting of Swift file types using swift-format ' |
| 5689 | '(macOS host only).') |
| 5690 | parser.add_option( |
| 5691 | '--no-swift-format', |
| 5692 | dest='use_swift_format', |
| 5693 | action='store_false', |
| 5694 | help='Disables formatting of Swift file types using swift-format.') |
| 5695 | |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5696 | opts, args = parser.parse_args(args) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5697 | |
Garrett Beaty | 91a6f33 | 2020-01-06 16:57:24 +0000 | [diff] [blame] | 5698 | if opts.python is not None and opts.no_python: |
| 5699 | raise parser.error('Cannot set both --python and --no-python') |
| 5700 | if opts.no_python: |
| 5701 | opts.python = False |
| 5702 | |
Daniel Cheng | c55eecf | 2016-12-30 03:11:02 -0800 | [diff] [blame] | 5703 | # Normalize any remaining args against the current path, so paths relative to |
| 5704 | # the current directory are still resolved as expected. |
| 5705 | args = [os.path.join(os.getcwd(), arg) for arg in args] |
| 5706 | |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5707 | # git diff generates paths against the root of the repository. Change |
| 5708 | # 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] | 5709 | rel_base_path = settings.GetRelativeRoot() |
enne@chromium.org | ff7a1fb | 2013-12-10 19:21:41 +0000 | [diff] [blame] | 5710 | if rel_base_path: |
| 5711 | os.chdir(rel_base_path) |
| 5712 | |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5713 | # Grab the merge-base commit, i.e. the upstream commit of the current |
| 5714 | # branch when it was created or the last time it was rebased. This is |
| 5715 | # to cover the case where the user may have called "git fetch origin", |
| 5716 | # moving the origin branch to a newer commit, but hasn't rebased yet. |
| 5717 | upstream_commit = None |
Tomasz Åšniatowski | 5819446 | 2021-08-27 17:36:16 +0000 | [diff] [blame] | 5718 | upstream_branch = opts.upstream |
| 5719 | if not upstream_branch: |
| 5720 | cl = Changelist() |
| 5721 | upstream_branch = cl.GetUpstreamBranch() |
digit@chromium.org | 29e4727 | 2013-05-17 17:01:46 +0000 | [diff] [blame] | 5722 | if upstream_branch: |
| 5723 | upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch]) |
| 5724 | upstream_commit = upstream_commit.strip() |
| 5725 | |
| 5726 | if not upstream_commit: |
| 5727 | DieWithError('Could not find base commit for this branch. ' |
| 5728 | 'Are you in detached state?') |
| 5729 | |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5730 | changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args) |
| 5731 | diff_output = RunGit(changed_files_cmd) |
| 5732 | diff_files = diff_output.splitlines() |
jkarlin@chromium.org | ad21b92 | 2016-01-28 17:48:42 +0000 | [diff] [blame] | 5733 | # Filter out files deleted by this CL |
| 5734 | 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] | 5735 | |
Andreas Haas | 417d89c | 2020-02-06 10:24:27 +0000 | [diff] [blame] | 5736 | if opts.js: |
Deepanjan Roy | 605dd31 | 2018-07-02 17:48:54 +0000 | [diff] [blame] | 5737 | CLANG_EXTS.extend(['.js', '.ts']) |
Christopher Lam | c5ba692 | 2017-01-24 11:19:14 +1100 | [diff] [blame] | 5738 | |
Garrett Beaty | ed0cc5f | 2020-01-06 17:26:13 +0000 | [diff] [blame] | 5739 | clang_diff_files = [] |
| 5740 | if opts.clang_format: |
| 5741 | clang_diff_files = [ |
| 5742 | x for x in diff_files if MatchingFileType(x, CLANG_EXTS) |
| 5743 | ] |
jkarlin@chromium.org | 6f7fa5e | 2016-01-20 19:32:21 +0000 | [diff] [blame] | 5744 | python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])] |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5745 | rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)] |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5746 | swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)] |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5747 | 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] | 5748 | |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 5749 | top_dir = settings.GetRoot() |
nick@chromium.org | 3ac1c4e | 2014-01-16 02:44:42 +0000 | [diff] [blame] | 5750 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 5751 | return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir, |
| 5752 | upstream_commit) |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5753 | |
Lukasz Anforowicz | b4d3954 | 2021-09-30 23:39:25 +0000 | [diff] [blame] | 5754 | if opts.use_rust_fmt: |
| 5755 | rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir, |
| 5756 | upstream_commit) |
| 5757 | if rust_fmt_return_value == 2: |
| 5758 | return_value = 2 |
| 5759 | |
Olivier Robin | 0a6b544 | 2022-04-07 07:25:04 +0000 | [diff] [blame] | 5760 | if opts.use_swift_format: |
| 5761 | if sys.platform != 'darwin': |
| 5762 | DieWithError('swift-format is only supported on macOS.') |
| 5763 | swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir, |
| 5764 | upstream_commit) |
| 5765 | if swift_format_return_value == 2: |
| 5766 | return_value = 2 |
| 5767 | |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5768 | # Similar code to above, but using yapf on .py files rather than clang-format |
| 5769 | # on C/C++ files |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5770 | py_explicitly_disabled = opts.python is not None and not opts.python |
| 5771 | if python_diff_files and not py_explicitly_disabled: |
Aiden Benner | e47ac15 | 2018-11-20 16:44:03 +0000 | [diff] [blame] | 5772 | depot_tools_path = os.path.dirname(os.path.abspath(__file__)) |
| 5773 | yapf_tool = os.path.join(depot_tools_path, 'yapf') |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5774 | |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5775 | # Used for caching. |
| 5776 | yapf_configs = {} |
| 5777 | for f in python_diff_files: |
| 5778 | # Find the yapf style config for the current file, defaults to depot |
| 5779 | # tools default. |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5780 | _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5781 | |
| 5782 | # Turn on python formatting by default if a yapf config is specified. |
| 5783 | # This breaks in the case of this repo though since the specified |
| 5784 | # style file is also the global default. |
| 5785 | if opts.python is None: |
| 5786 | filtered_py_files = [] |
| 5787 | for f in python_diff_files: |
| 5788 | if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None: |
| 5789 | filtered_py_files.append(f) |
| 5790 | else: |
| 5791 | filtered_py_files = python_diff_files |
| 5792 | |
| 5793 | # Note: yapf still seems to fix indentation of the entire file |
| 5794 | # even if line ranges are specified. |
| 5795 | # See https://github.com/google/yapf/issues/499 |
| 5796 | if not opts.full and filtered_py_files: |
| 5797 | py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit) |
| 5798 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 5799 | yapfignore_patterns = _GetYapfIgnorePatterns(top_dir) |
| 5800 | filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files, |
| 5801 | yapfignore_patterns) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 5802 | |
Aiden Benner | 99b0ccb | 2018-11-20 19:53:31 +0000 | [diff] [blame] | 5803 | for f in filtered_py_files: |
Andrew Grieve | fa40bfa | 2020-01-07 02:32:57 +0000 | [diff] [blame] | 5804 | yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir) |
| 5805 | # Default to pep8 if not .style.yapf is found. |
| 5806 | if not yapf_style: |
| 5807 | yapf_style = 'pep8' |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5808 | |
Peter Wen | d939992 | 2020-06-17 17:33:49 +0000 | [diff] [blame] | 5809 | with open(f, 'r') as py_f: |
Andrew Grieve | b9e694c | 2021-11-15 19:04:46 +0000 | [diff] [blame] | 5810 | if 'python2' in py_f.readline(): |
Peter Wen | d939992 | 2020-06-17 17:33:49 +0000 | [diff] [blame] | 5811 | vpython_script = 'vpython' |
Andrew Grieve | b9e694c | 2021-11-15 19:04:46 +0000 | [diff] [blame] | 5812 | else: |
| 5813 | vpython_script = 'vpython3' |
Peter Wen | d939992 | 2020-06-17 17:33:49 +0000 | [diff] [blame] | 5814 | |
| 5815 | cmd = [vpython_script, yapf_tool, '--style', yapf_style, f] |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5816 | |
| 5817 | has_formattable_lines = False |
| 5818 | if not opts.full: |
| 5819 | # Only run yapf over changed line ranges. |
| 5820 | for diff_start, diff_len in py_line_diffs[f]: |
| 5821 | diff_end = diff_start + diff_len - 1 |
| 5822 | # Yapf errors out if diff_end < diff_start but this |
| 5823 | # is a valid line range diff for a removal. |
| 5824 | if diff_end >= diff_start: |
| 5825 | has_formattable_lines = True |
| 5826 | cmd += ['-l', '{}-{}'.format(diff_start, diff_end)] |
| 5827 | # If all line diffs were removals we have nothing to format. |
| 5828 | if not has_formattable_lines: |
| 5829 | continue |
| 5830 | |
| 5831 | if opts.diff or opts.dry_run: |
| 5832 | cmd += ['--diff'] |
| 5833 | # Will return non-zero exit code if non-empty diff. |
Edward Lesmes | b7db183 | 2020-06-22 20:22:27 +0000 | [diff] [blame] | 5834 | stdout = RunCommand(cmd, |
| 5835 | error_ok=True, |
Josip Sokcevic | 673e8ed | 2021-10-27 23:46:18 +0000 | [diff] [blame] | 5836 | stderr=subprocess2.PIPE, |
Edward Lesmes | b7db183 | 2020-06-22 20:22:27 +0000 | [diff] [blame] | 5837 | cwd=top_dir, |
| 5838 | shell=sys.platform.startswith('win32')) |
Aiden Benner | c08566e | 2018-10-03 17:52:42 +0000 | [diff] [blame] | 5839 | if opts.diff: |
| 5840 | sys.stdout.write(stdout) |
| 5841 | elif len(stdout) > 0: |
| 5842 | return_value = 2 |
| 5843 | else: |
| 5844 | cmd += ['-i'] |
Edward Lesmes | b7db183 | 2020-06-22 20:22:27 +0000 | [diff] [blame] | 5845 | RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32')) |
sbc@chromium.org | 9d0644d | 2015-06-05 23:16:54 +0000 | [diff] [blame] | 5846 | |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5847 | # Format GN build files. Always run on full build files for canonical form. |
| 5848 | if gn_diff_files: |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 5849 | cmd = ['gn', 'format'] |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5850 | if opts.dry_run or opts.diff: |
| 5851 | cmd.append('--dry-run') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5852 | for gn_diff_file in gn_diff_files: |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5853 | gn_ret = subprocess2.call(cmd + [gn_diff_file], |
Ilya Sherman | 7aed4bb | 2020-05-20 22:34:14 +0000 | [diff] [blame] | 5854 | shell=sys.platform.startswith('win'), |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5855 | cwd=top_dir) |
| 5856 | if opts.dry_run and gn_ret == 2: |
| 5857 | return_value = 2 # Not formatted. |
| 5858 | elif opts.diff and gn_ret == 2: |
| 5859 | # TODO this should compute and print the actual diff. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5860 | print('This change has GN build file diff for ' + gn_diff_file) |
brettw | 4b8ed59 | 2016-08-05 16:19:12 -0700 | [diff] [blame] | 5861 | elif gn_ret != 0: |
| 5862 | # For non-dry run cases (and non-2 return values for dry-run), a |
| 5863 | # nonzero error code indicates a failure, probably because the file |
| 5864 | # doesn't parse. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5865 | DieWithError('gn format failed on ' + gn_diff_file + |
| 5866 | '\nTry running `gn format` on this file manually.') |
kylechar@chromium.org | 8b61f11 | 2016-02-05 13:28:58 +0000 | [diff] [blame] | 5867 | |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5868 | # Skip the metrics formatting from the global presubmit hook. These files have |
| 5869 | # a separate presubmit hook that issues an error if the files need formatting, |
| 5870 | # whereas the top-level presubmit script merely issues a warning. Formatting |
| 5871 | # these files is somewhat slow, so it's important not to duplicate the work. |
| 5872 | if not opts.presubmit: |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5873 | for diff_xml in GetDiffXMLs(diff_files): |
| 5874 | xml_dir = GetMetricsDir(diff_xml) |
| 5875 | if not xml_dir: |
| 5876 | continue |
| 5877 | |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5878 | tool_dir = os.path.join(top_dir, xml_dir) |
Ilya Sherman | 7aed4bb | 2020-05-20 22:34:14 +0000 | [diff] [blame] | 5879 | pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py') |
Fabrice de Gans | ecfab09 | 2022-09-15 20:59:01 +0000 | [diff] [blame] | 5880 | cmd = ['vpython3', pretty_print_tool, '--non-interactive'] |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5881 | |
| 5882 | # If the XML file is histograms.xml or enums.xml, add the xml path to the |
| 5883 | # command as histograms/pretty_print.py now needs a relative path argument |
| 5884 | # after splitting the histograms into multiple directories. |
| 5885 | # For example, in tools/metrics/ukm, pretty-print could be run using: |
| 5886 | # $ python pretty_print.py |
| 5887 | # But in tools/metrics/histogrmas, pretty-print should be run with an |
| 5888 | # additional relative path argument, like: |
Peter Kasting | ee08888 | 2021-08-03 17:57:00 +0000 | [diff] [blame] | 5889 | # $ python pretty_print.py metadata/UMA/histograms.xml |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5890 | # $ python pretty_print.py enums.xml |
| 5891 | |
Weilun Shi | b92c4b7 | 2020-08-27 17:45:11 +0000 | [diff] [blame] | 5892 | if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml') |
Weilun Shi | 4f50adb | 2023-01-17 20:43:17 +0000 | [diff] [blame] | 5893 | or diff_xml.endswith('histogram_suffixes_list.xml')): |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5894 | cmd.append(diff_xml) |
| 5895 | |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5896 | if opts.dry_run or opts.diff: |
| 5897 | cmd.append('--diff') |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5898 | |
Ilya Sherman | 7aed4bb | 2020-05-20 22:34:14 +0000 | [diff] [blame] | 5899 | # TODO(isherman): Once this file runs only on Python 3.3+, drop the |
| 5900 | # `shell` param and instead replace `'vpython'` with |
| 5901 | # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942 |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5902 | stdout = RunCommand(cmd, |
| 5903 | cwd=top_dir, |
Ilya Sherman | 7aed4bb | 2020-05-20 22:34:14 +0000 | [diff] [blame] | 5904 | shell=sys.platform.startswith('win32')) |
Ilya Sherman | e081cbe | 2017-08-15 17:51:04 -0700 | [diff] [blame] | 5905 | if opts.diff: |
| 5906 | sys.stdout.write(stdout) |
| 5907 | if opts.dry_run and stdout: |
| 5908 | return_value = 2 # Not formatted. |
Alexei Svitkine | f3cac41 | 2017-02-06 11:08:50 -0500 | [diff] [blame] | 5909 | |
erg@chromium.org | e0a7c5d | 2015-02-23 20:30:08 +0000 | [diff] [blame] | 5910 | return return_value |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5911 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5912 | |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5913 | def GetDiffXMLs(diff_files): |
| 5914 | return [ |
| 5915 | os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml']) |
| 5916 | ] |
| 5917 | |
| 5918 | |
| 5919 | def GetMetricsDir(diff_xml): |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5920 | metrics_xml_dirs = [ |
| 5921 | os.path.join('tools', 'metrics', 'actions'), |
| 5922 | os.path.join('tools', 'metrics', 'histograms'), |
| 5923 | os.path.join('tools', 'metrics', 'rappor'), |
Ilya Sherman | b67e60c | 2020-05-20 22:27:03 +0000 | [diff] [blame] | 5924 | os.path.join('tools', 'metrics', 'structured'), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 5925 | os.path.join('tools', 'metrics', 'ukm'), |
| 5926 | ] |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5927 | for xml_dir in metrics_xml_dirs: |
Wenhan (Han) Zhang | 3bd3c99 | 2020-08-14 16:27:39 +0000 | [diff] [blame] | 5928 | if diff_xml.startswith(xml_dir): |
| 5929 | return xml_dir |
| 5930 | return None |
Steven Holte | 2e664bf | 2017-04-21 13:10:47 -0700 | [diff] [blame] | 5931 | |
agable@chromium.org | fab8f82 | 2013-05-06 17:43:09 +0000 | [diff] [blame] | 5932 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5933 | @subcommand.usage('<codereview url or issue id>') |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 5934 | @metrics.collector.collect_metrics('git cl checkout') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5935 | def CMDcheckout(parser, args): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 5936 | """Checks out a branch associated with a given Gerrit issue.""" |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5937 | _, args = parser.parse_args(args) |
| 5938 | |
| 5939 | if len(args) != 1: |
| 5940 | parser.print_help() |
| 5941 | return 1 |
| 5942 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 5943 | issue_arg = ParseIssueNumberArgument(args[0]) |
tandrii@chromium.org | de6c9a1 | 2016-04-11 15:33:53 +0000 | [diff] [blame] | 5944 | if not issue_arg.valid: |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 5945 | parser.error('Invalid issue ID or URL.') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 5946 | |
tandrii@chromium.org | abd27e5 | 2016-04-11 15:43:32 +0000 | [diff] [blame] | 5947 | target_issue = str(issue_arg.issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5948 | |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5949 | output = RunGit(['config', '--local', '--get-regexp', |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 5950 | r'branch\..*\.' + ISSUE_CONFIG_KEY], |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5951 | error_ok=True) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5952 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 5953 | branches = [] |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5954 | for key, issue in [x.split() for x in output.splitlines()]: |
| 5955 | if issue == target_issue: |
Edward Lesmes | 50da770 | 2020-03-30 19:23:43 +0000 | [diff] [blame] | 5956 | branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key)) |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 5957 | |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5958 | if len(branches) == 0: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5959 | print('No branch found for issue %s.' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5960 | return 1 |
| 5961 | if len(branches) == 1: |
| 5962 | RunGit(['checkout', branches[0]]) |
| 5963 | else: |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5964 | print('Multiple branches match issue %s:' % target_issue) |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5965 | for i in range(len(branches)): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5966 | print('%d: %s' % (i, branches[i])) |
Edward Lesmes | ae3586b | 2020-03-23 21:21:14 +0000 | [diff] [blame] | 5967 | which = gclient_utils.AskForData('Choose by index: ') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5968 | try: |
| 5969 | RunGit(['checkout', branches[int(which)]]) |
| 5970 | except (IndexError, ValueError): |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5971 | print('Invalid selection, not checking out any branch.') |
scottmg@chromium.org | 84a80c4 | 2015-09-22 20:40:37 +0000 | [diff] [blame] | 5972 | return 1 |
| 5973 | |
| 5974 | return 0 |
| 5975 | |
| 5976 | |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5977 | def CMDlol(parser, args): |
| 5978 | # This command is intentionally undocumented. |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 5979 | print(zlib.decompress(base64.b64decode( |
thakis@chromium.org | 3421c99 | 2014-11-02 02:20:32 +0000 | [diff] [blame] | 5980 | 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE' |
| 5981 | 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9' |
| 5982 | 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W' |
Gavin Mak | 18f45d2 | 2020-12-04 21:45:10 +0000 | [diff] [blame] | 5983 | 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8')) |
maruel@chromium.org | 29404b5 | 2014-09-08 22:58:00 +0000 | [diff] [blame] | 5984 | return 0 |
| 5985 | |
| 5986 | |
Josip Sokcevic | 0399e17 | 2022-03-21 23:11:51 +0000 | [diff] [blame] | 5987 | def CMDversion(parser, args): |
| 5988 | import utils |
| 5989 | print(utils.depot_tools_version()) |
| 5990 | |
| 5991 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5992 | class OptionParser(optparse.OptionParser): |
| 5993 | """Creates the option parse and add --verbose support.""" |
Sigurd Schneider | 9abde8c | 2020-11-17 08:44:52 +0000 | [diff] [blame] | 5994 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5995 | def __init__(self, *args, **kwargs): |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 5996 | optparse.OptionParser.__init__( |
| 5997 | self, *args, prog='git cl', version=__version__, **kwargs) |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 5998 | self.add_option( |
| 5999 | '-v', '--verbose', action='count', default=0, |
| 6000 | help='Use 2 times for more debugging info') |
| 6001 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 6002 | def parse_args(self, args=None, _values=None): |
Andrii Shyshkalov | 46f20cd | 2018-10-30 06:42:54 +0000 | [diff] [blame] | 6003 | try: |
| 6004 | return self._parse_args(args) |
| 6005 | finally: |
| 6006 | # Regardless of success or failure of args parsing, we want to report |
| 6007 | # metrics, but only after logging has been initialized (if parsing |
| 6008 | # succeeded). |
| 6009 | global settings |
| 6010 | settings = Settings() |
| 6011 | |
Edward Lesmes | 9c34906 | 2021-05-06 20:02:39 +0000 | [diff] [blame] | 6012 | if metrics.collector.config.should_collect_metrics: |
Andrii Shyshkalov | 46f20cd | 2018-10-30 06:42:54 +0000 | [diff] [blame] | 6013 | # GetViewVCUrl ultimately calls logging method. |
| 6014 | project_url = settings.GetViewVCUrl().strip('/+') |
| 6015 | if project_url in metrics_utils.KNOWN_PROJECT_URLS: |
| 6016 | metrics.collector.add('project_urls', [project_url]) |
| 6017 | |
| 6018 | def _parse_args(self, args=None): |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 6019 | # Create an optparse.Values object that will store only the actual passed |
| 6020 | # options, without the defaults. |
| 6021 | actual_options = optparse.Values() |
| 6022 | _, args = optparse.OptionParser.parse_args(self, args, actual_options) |
| 6023 | # Create an optparse.Values object with the default options. |
| 6024 | options = optparse.Values(self.get_default_values().__dict__) |
| 6025 | # Update it with the options passed by the user. |
| 6026 | options._update_careful(actual_options.__dict__) |
| 6027 | # Store the options passed by the user in an _actual_options attribute. |
| 6028 | # We store only the keys, and not the values, since the values can contain |
| 6029 | # arbitrary information, which might be PII. |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 6030 | metrics.collector.add('arguments', list(actual_options.__dict__.keys())) |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 6031 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 6032 | levels = [logging.WARNING, logging.INFO, logging.DEBUG] |
Andrii Shyshkalov | 5b04a57 | 2017-01-23 17:44:41 +0100 | [diff] [blame] | 6033 | logging.basicConfig( |
| 6034 | level=levels[min(options.verbose, len(levels) - 1)], |
| 6035 | format='[%(levelname).1s%(asctime)s %(process)d %(thread)d ' |
| 6036 | '%(filename)s] %(message)s') |
Edward Lemur | 83bd7f4 | 2018-10-10 00:14:21 +0000 | [diff] [blame] | 6037 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 6038 | return options, args |
| 6039 | |
iannucci@chromium.org | d9c1b20 | 2013-07-24 23:52:11 +0000 | [diff] [blame] | 6040 | |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 6041 | def main(argv): |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 6042 | if sys.hexversion < 0x02060000: |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 6043 | print('\nYour Python version %s is unsupported, please upgrade.\n' % |
vapier | a7fbd5a | 2016-06-16 09:17:49 -0700 | [diff] [blame] | 6044 | (sys.version.split(' ', 1)[0],), file=sys.stderr) |
maruel@chromium.org | 82798cb | 2012-02-23 18:16:12 +0000 | [diff] [blame] | 6045 | return 2 |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 6046 | |
maruel@chromium.org | 39c0b22 | 2013-08-17 16:57:01 +0000 | [diff] [blame] | 6047 | colorize_CMDstatus_doc() |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 6048 | dispatcher = subcommand.CommandDispatcher(__name__) |
| 6049 | try: |
| 6050 | return dispatcher.execute(OptionParser(), argv) |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 6051 | except auth.LoginRequiredError as e: |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 6052 | DieWithError(str(e)) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 6053 | except urllib.error.HTTPError as e: |
maruel@chromium.org | 0633fb4 | 2013-08-16 20:06:14 +0000 | [diff] [blame] | 6054 | if e.code != 500: |
| 6055 | raise |
| 6056 | DieWithError( |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 6057 | ('App Engine is misbehaving and returned HTTP %d, again. Keep faith ' |
Quinten Yearsley | c420221 | 2019-07-22 23:34:40 +0000 | [diff] [blame] | 6058 | '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] | 6059 | return 0 |
chase@chromium.org | cc51cd0 | 2010-12-23 00:48:39 +0000 | [diff] [blame] | 6060 | |
| 6061 | |
| 6062 | if __name__ == '__main__': |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 6063 | # These affect sys.stdout, so do it outside of main() to simplify mocks in |
| 6064 | # the unit tests. |
maruel@chromium.org | 6f09cd9 | 2011-04-01 16:38:12 +0000 | [diff] [blame] | 6065 | fix_encoding.fix_encoding() |
iannucci@chromium.org | 596cd5c | 2016-04-04 21:34:39 +0000 | [diff] [blame] | 6066 | setup_color.init() |
Edward Lemur | 6f812e1 | 2018-07-31 22:45:57 +0000 | [diff] [blame] | 6067 | with metrics.collector.print_notice_and_exit(): |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 6068 | sys.exit(main(sys.argv[1:])) |