Josip Sokcevic | 4de5dea | 2022-03-23 21:15:14 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 2 | # Copyright 2014 The Chromium Authors. All rights reserved. |
| 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
| 6 | import argparse |
martiniss@chromium.org | 456ca7f | 2016-05-23 21:33:28 +0000 | [diff] [blame] | 7 | import json |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 8 | import re |
| 9 | import sys |
| 10 | |
| 11 | from collections import defaultdict |
| 12 | |
| 13 | import git_common as git |
| 14 | |
agable@chromium.org | d629fb4 | 2014-10-01 09:40:10 +0000 | [diff] [blame] | 15 | |
Andrii Shyshkalov | 80cae42 | 2017-04-27 01:01:42 +0200 | [diff] [blame] | 16 | FOOTER_PATTERN = re.compile(r'^\s*([\w-]+): *(.*)$') |
Andrii Shyshkalov | 49fe922 | 2016-12-15 11:05:06 +0100 | [diff] [blame] | 17 | CHROME_COMMIT_POSITION_PATTERN = re.compile(r'^([\w/\-\.]+)@{#(\d+)}$') |
Ayu Ishii | 0985861 | 2020-06-26 18:00:52 +0000 | [diff] [blame] | 18 | FOOTER_KEY_BLOCKLIST = set(['http', 'https']) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 19 | |
agable@chromium.org | d629fb4 | 2014-10-01 09:40:10 +0000 | [diff] [blame] | 20 | |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 21 | def normalize_name(header): |
| 22 | return '-'.join([ word.title() for word in header.strip().split('-') ]) |
| 23 | |
| 24 | |
| 25 | def parse_footer(line): |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 26 | """Returns footer's (key, value) if footer is valid, else None.""" |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 27 | match = FOOTER_PATTERN.match(line) |
Ayu Ishii | 0985861 | 2020-06-26 18:00:52 +0000 | [diff] [blame] | 28 | if match and match.group(1) not in FOOTER_KEY_BLOCKLIST: |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 29 | return (match.group(1), match.group(2)) |
Aaron Gable | d9a6756 | 2018-01-03 15:56:08 -0800 | [diff] [blame] | 30 | return None |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 31 | |
| 32 | |
| 33 | def parse_footers(message): |
| 34 | """Parses a git commit message into a multimap of footers.""" |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 35 | _, _, parsed_footers = split_footers(message) |
| 36 | footer_map = defaultdict(list) |
| 37 | if parsed_footers: |
| 38 | # Read footers from bottom to top, because latter takes precedense, |
| 39 | # and we want it to be first in the multimap value. |
| 40 | for (k, v) in reversed(parsed_footers): |
| 41 | footer_map[normalize_name(k)].append(v.strip()) |
| 42 | return footer_map |
| 43 | |
| 44 | |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 45 | def matches_footer_key(line, key): |
| 46 | """Returns whether line is a valid footer whose key matches a given one. |
| 47 | |
| 48 | Keys are compared in normalized form. |
| 49 | """ |
| 50 | r = parse_footer(line) |
| 51 | if r is None: |
Andrii Shyshkalov | 1a91c60 | 2017-05-11 14:35:56 +0200 | [diff] [blame] | 52 | return False |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 53 | return normalize_name(r[0]) == normalize_name(key) |
| 54 | |
| 55 | |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 56 | def split_footers(message): |
| 57 | """Returns (non_footer_lines, footer_lines, parsed footers). |
| 58 | |
| 59 | Guarantees that: |
Aaron Gable | 4be3187 | 2018-01-03 16:30:46 -0800 | [diff] [blame] | 60 | (non_footer_lines + footer_lines) ~= message.splitlines(), with at |
| 61 | most one new newline, if the last paragraph is text followed by footers. |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 62 | parsed_footers is parse_footer applied on each line of footer_lines. |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 63 | There could be fewer parsed_footers than footer lines if some lines in |
| 64 | last paragraph are malformed. |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 65 | """ |
Shahbaz Youssefi | 407b5a5 | 2020-09-22 19:39:00 +0000 | [diff] [blame] | 66 | message_lines = list(message.rstrip().splitlines()) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 67 | footer_lines = [] |
Aaron Gable | 4be3187 | 2018-01-03 16:30:46 -0800 | [diff] [blame] | 68 | maybe_footer_lines = [] |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 69 | for line in reversed(message_lines): |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 70 | if line == '' or line.isspace(): |
| 71 | break |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 72 | |
| 73 | if parse_footer(line): |
Aaron Gable | 4be3187 | 2018-01-03 16:30:46 -0800 | [diff] [blame] | 74 | footer_lines.extend(maybe_footer_lines) |
| 75 | maybe_footer_lines = [] |
| 76 | footer_lines.append(line) |
| 77 | else: |
Quinten Yearsley | 925cedb | 2020-04-13 17:49:39 +0000 | [diff] [blame] | 78 | # We only want to include malformed lines if they are preceded by |
Aaron Gable | 4be3187 | 2018-01-03 16:30:46 -0800 | [diff] [blame] | 79 | # well-formed lines. So keep them in holding until we see a well-formed |
| 80 | # line (case above). |
| 81 | maybe_footer_lines.append(line) |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 82 | else: |
| 83 | # The whole description was consisting of footers, |
| 84 | # which means those aren't footers. |
| 85 | footer_lines = [] |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 86 | |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 87 | footer_lines.reverse() |
Edward Lemur | 5da394f | 2019-10-03 21:57:25 +0000 | [diff] [blame] | 88 | footers = [footer for footer in map(parse_footer, footer_lines) if footer] |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 89 | if not footers: |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 90 | return message_lines, [], [] |
Aaron Gable | 4be3187 | 2018-01-03 16:30:46 -0800 | [diff] [blame] | 91 | if maybe_footer_lines: |
| 92 | # If some malformed lines were left over, add a newline to split them |
| 93 | # from the well-formed ones. |
| 94 | return message_lines[:-len(footer_lines)] + [''], footer_lines, footers |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 95 | return message_lines[:-len(footer_lines)], footer_lines, footers |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 96 | |
| 97 | |
tandrii@chromium.org | 3c3c034 | 2016-03-04 11:59:28 +0000 | [diff] [blame] | 98 | def get_footer_change_id(message): |
| 99 | """Returns a list of Gerrit's ChangeId from given commit message.""" |
| 100 | return parse_footers(message).get(normalize_name('Change-Id'), []) |
| 101 | |
| 102 | |
| 103 | def add_footer_change_id(message, change_id): |
| 104 | """Returns message with Change-ID footer in it. |
| 105 | |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 106 | Assumes that Change-Id is not yet in footers, which is then inserted at |
| 107 | earliest footer line which is after all of these footers: |
| 108 | Bug|Issue|Test|Feature. |
tandrii@chromium.org | 3c3c034 | 2016-03-04 11:59:28 +0000 | [diff] [blame] | 109 | """ |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 110 | assert 'Change-Id' not in parse_footers(message) |
| 111 | return add_footer(message, 'Change-Id', change_id, |
| 112 | after_keys=['Bug', 'Issue', 'Test', 'Feature']) |
| 113 | |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 114 | |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 115 | def add_footer(message, key, value, after_keys=None, before_keys=None): |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 116 | """Returns a message with given footer appended. |
| 117 | |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 118 | If after_keys and before_keys are both None (default), appends footer last. |
| 119 | If after_keys is provided and matches footers already present, inserts footer |
| 120 | as *early* as possible while still appearing after all provided keys, even |
| 121 | if doing so conflicts with before_keys. |
| 122 | If before_keys is provided, inserts footer as late as possible while still |
| 123 | appearing before all provided keys. |
| 124 | |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 125 | For example, given |
| 126 | message='Header.\n\nAdded: 2016\nBug: 123\nVerified-By: CQ' |
| 127 | after_keys=['Bug', 'Issue'] |
| 128 | the new footer will be inserted between Bug and Verified-By existing footers. |
| 129 | """ |
| 130 | assert key == normalize_name(key), 'Use normalized key' |
| 131 | new_footer = '%s: %s' % (key, value) |
Edward Lemur | 69bb8be | 2020-02-03 20:37:38 +0000 | [diff] [blame] | 132 | if not FOOTER_PATTERN.match(new_footer): |
| 133 | raise ValueError('Invalid footer %r' % new_footer) |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 134 | |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 135 | top_lines, footer_lines, _ = split_footers(message) |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 136 | if not footer_lines: |
| 137 | if not top_lines or top_lines[-1] != '': |
| 138 | top_lines.append('') |
| 139 | footer_lines = [new_footer] |
tandrii@chromium.org | 9fc50db | 2016-03-17 12:38:55 +0000 | [diff] [blame] | 140 | else: |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 141 | after_keys = set(map(normalize_name, after_keys or [])) |
| 142 | after_indices = [ |
| 143 | footer_lines.index(x) for x in footer_lines for k in after_keys |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 144 | if matches_footer_key(x, k)] |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 145 | before_keys = set(map(normalize_name, before_keys or [])) |
| 146 | before_indices = [ |
| 147 | footer_lines.index(x) for x in footer_lines for k in before_keys |
Andrii Shyshkalov | 04b51d6 | 2017-05-11 13:21:30 +0200 | [diff] [blame] | 148 | if matches_footer_key(x, k)] |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 149 | if after_indices: |
| 150 | # after_keys takes precedence, even if there's a conflict. |
| 151 | insert_idx = max(after_indices) + 1 |
| 152 | elif before_indices: |
| 153 | insert_idx = min(before_indices) |
tandrii@chromium.org | 3c3c034 | 2016-03-04 11:59:28 +0000 | [diff] [blame] | 154 | else: |
Aaron Gable | c06db44 | 2017-04-26 17:29:49 -0700 | [diff] [blame] | 155 | insert_idx = len(footer_lines) |
| 156 | footer_lines.insert(insert_idx, new_footer) |
tandrii@chromium.org | f2aa52b | 2016-06-03 12:58:20 +0000 | [diff] [blame] | 157 | return '\n'.join(top_lines + footer_lines) |
tandrii@chromium.org | 3c3c034 | 2016-03-04 11:59:28 +0000 | [diff] [blame] | 158 | |
| 159 | |
Aaron Gable | b584c4f | 2017-04-26 16:28:08 -0700 | [diff] [blame] | 160 | def remove_footer(message, key): |
| 161 | """Returns a message with all instances of given footer removed.""" |
| 162 | key = normalize_name(key) |
| 163 | top_lines, footer_lines, _ = split_footers(message) |
| 164 | if not footer_lines: |
| 165 | return message |
Aaron Gable | b08ba65 | 2017-07-12 15:30:02 -0700 | [diff] [blame] | 166 | new_footer_lines = [] |
| 167 | for line in footer_lines: |
| 168 | try: |
| 169 | f = normalize_name(parse_footer(line)[0]) |
| 170 | if f != key: |
| 171 | new_footer_lines.append(line) |
| 172 | except TypeError: |
| 173 | # If the footer doesn't parse (i.e. is malformed), just let it carry over. |
| 174 | new_footer_lines.append(line) |
Aaron Gable | b584c4f | 2017-04-26 16:28:08 -0700 | [diff] [blame] | 175 | return '\n'.join(top_lines + new_footer_lines) |
| 176 | |
| 177 | |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 178 | def get_unique(footers, key): |
| 179 | key = normalize_name(key) |
| 180 | values = footers[key] |
| 181 | assert len(values) <= 1, 'Multiple %s footers' % key |
| 182 | if values: |
| 183 | return values[0] |
Aravind Vasudevan | c5f0cbb | 2022-01-24 23:56:57 +0000 | [diff] [blame] | 184 | |
| 185 | return None |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 186 | |
| 187 | |
| 188 | def get_position(footers): |
iannucci@chromium.org | 74c44f6 | 2014-09-09 22:35:03 +0000 | [diff] [blame] | 189 | """Get the commit position from the footers multimap using a heuristic. |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 190 | |
| 191 | Returns: |
| 192 | A tuple of the branch and the position on that branch. For example, |
| 193 | |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 194 | Cr-Commit-Position: refs/heads/main@{#292272} |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 195 | |
Josip Sokcevic | 9c0dc30 | 2020-11-20 18:41:25 +0000 | [diff] [blame] | 196 | would give the return value ('refs/heads/main', 292272). |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 197 | """ |
| 198 | |
| 199 | position = get_unique(footers, 'Cr-Commit-Position') |
| 200 | if position: |
| 201 | match = CHROME_COMMIT_POSITION_PATTERN.match(position) |
| 202 | assert match, 'Invalid Cr-Commit-Position value: %s' % position |
| 203 | return (match.group(1), match.group(2)) |
| 204 | |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 205 | raise ValueError('Unable to infer commit position from footers') |
| 206 | |
| 207 | |
| 208 | def main(args): |
| 209 | parser = argparse.ArgumentParser( |
| 210 | formatter_class=argparse.ArgumentDefaultsHelpFormatter |
| 211 | ) |
Andrii Shyshkalov | 22a9cf5 | 2017-07-13 14:23:58 +0200 | [diff] [blame] | 212 | parser.add_argument('ref', nargs='?', help='Git ref to retrieve footers from.' |
| 213 | ' Omit to parse stdin.') |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 214 | |
| 215 | g = parser.add_mutually_exclusive_group() |
| 216 | g.add_argument('--key', metavar='KEY', |
| 217 | help='Get all values for the given footer name, one per ' |
| 218 | 'line (case insensitive)') |
| 219 | g.add_argument('--position', action='store_true') |
| 220 | g.add_argument('--position-ref', action='store_true') |
| 221 | g.add_argument('--position-num', action='store_true') |
Andrii Shyshkalov | 22a9cf5 | 2017-07-13 14:23:58 +0200 | [diff] [blame] | 222 | g.add_argument('--json', help='filename to dump JSON serialized footers to.') |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 223 | |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 224 | opts = parser.parse_args(args) |
| 225 | |
martiniss@chromium.org | 456ca7f | 2016-05-23 21:33:28 +0000 | [diff] [blame] | 226 | if opts.ref: |
| 227 | message = git.run('log', '-1', '--format=%B', opts.ref) |
| 228 | else: |
Andrii Shyshkalov | 22a9cf5 | 2017-07-13 14:23:58 +0200 | [diff] [blame] | 229 | message = sys.stdin.read() |
martiniss@chromium.org | 456ca7f | 2016-05-23 21:33:28 +0000 | [diff] [blame] | 230 | |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 231 | footers = parse_footers(message) |
| 232 | |
| 233 | if opts.key: |
| 234 | for v in footers.get(normalize_name(opts.key), []): |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 235 | print(v) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 236 | elif opts.position: |
| 237 | pos = get_position(footers) |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 238 | print('%s@{#%s}' % (pos[0], pos[1] or '?')) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 239 | elif opts.position_ref: |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 240 | print(get_position(footers)[0]) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 241 | elif opts.position_num: |
| 242 | pos = get_position(footers) |
| 243 | assert pos[1], 'No valid position for commit' |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 244 | print(pos[1]) |
martiniss@chromium.org | 456ca7f | 2016-05-23 21:33:28 +0000 | [diff] [blame] | 245 | elif opts.json: |
| 246 | with open(opts.json, 'w') as f: |
| 247 | json.dump(footers, f) |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 248 | else: |
| 249 | for k in footers.keys(): |
| 250 | for v in footers[k]: |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 251 | print('%s: %s' % (k, v)) |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 252 | return 0 |
luqui@chromium.org | 0b88762 | 2014-09-03 02:31:03 +0000 | [diff] [blame] | 253 | |
| 254 | |
| 255 | if __name__ == '__main__': |
sbc@chromium.org | 013731e | 2015-02-26 18:28:43 +0000 | [diff] [blame] | 256 | try: |
| 257 | sys.exit(main(sys.argv[1:])) |
| 258 | except KeyboardInterrupt: |
| 259 | sys.stderr.write('interrupted\n') |
| 260 | sys.exit(1) |