Josip Sokcevic | 4de5dea | 2022-03-23 21:15:14 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 2 | # Copyright 2015 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 | """Usage: %prog <commit>* |
| 6 | |
| 7 | Given a commit, finds the release where it first appeared (e.g. 47.0.2500.0) as |
| 8 | well as attempting to determine the branches to which it was merged. |
| 9 | |
| 10 | Note that it uses the "cherry picked from" annotation to find merges, so it will |
| 11 | only work on merges that followed the "use cherry-pick -x" instructions. |
| 12 | """ |
| 13 | |
| 14 | import optparse |
| 15 | import re |
| 16 | import sys |
| 17 | |
| 18 | import git_common as git |
| 19 | |
| 20 | |
| 21 | def GetNameForCommit(sha1): |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 22 | name = re.sub(r'~.*$', '', git.run('name-rev', '--tags', '--name-only', |
| 23 | sha1)) |
| 24 | if name == 'undefined': |
| 25 | name = git.run('name-rev', '--refs', 'remotes/branch-heads/*', |
| 26 | '--name-only', sha1) + ' [untagged]' |
| 27 | return name |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 28 | |
| 29 | |
| 30 | def GetMergesForCommit(sha1): |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 31 | return [ |
| 32 | c.split()[0] |
| 33 | for c in git.run('log', '--oneline', '-F', '--all', '--no-abbrev', |
| 34 | '--grep', 'cherry picked from commit %s' % |
| 35 | sha1).splitlines() |
| 36 | ] |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 37 | |
| 38 | |
Josip Sokcevic | 1850bf6 | 2020-03-18 16:33:58 +0000 | [diff] [blame] | 39 | def main(args): |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 40 | parser = optparse.OptionParser(usage=sys.modules[__name__].__doc__) |
| 41 | _, args = parser.parse_args(args) |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 42 | |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 43 | if len(args) == 0: |
| 44 | parser.error('Need at least one commit.') |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 45 | |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 46 | for arg in args: |
| 47 | commit_name = GetNameForCommit(arg) |
| 48 | if not commit_name: |
| 49 | print('%s not found' % arg) |
| 50 | return 1 |
| 51 | print('commit %s was:' % arg) |
| 52 | print(' initially in ' + commit_name) |
| 53 | merges = GetMergesForCommit(arg) |
| 54 | for merge in merges: |
| 55 | print(' merged to ' + GetNameForCommit(merge) + ' (as ' + merge + |
| 56 | ')') |
| 57 | if not merges: |
| 58 | print('No merges found. If this seems wrong, be sure that you did:') |
| 59 | print(' git fetch origin && gclient sync --with_branch_heads') |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 60 | |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 61 | return 0 |
scottmg@chromium.org | f4ddadc | 2015-09-08 21:46:03 +0000 | [diff] [blame] | 62 | |
| 63 | |
| 64 | if __name__ == '__main__': |
Mike Frysinger | 124bb8e | 2023-09-06 05:48:55 +0000 | [diff] [blame] | 65 | try: |
| 66 | sys.exit(main(sys.argv[1:])) |
| 67 | except KeyboardInterrupt: |
| 68 | sys.stderr.write('interrupted\n') |
| 69 | sys.exit(1) |