Simon Glass | e3986d9 | 2019-10-31 07:42:52 -0600 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
Tom Rini | 83d290c | 2018-05-06 17:58:06 -0400 | [diff] [blame] | 2 | # SPDX-License-Identifier: GPL-2.0+ |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 3 | # |
| 4 | # Copyright (c) 2011 The Chromium OS Authors. |
| 5 | # |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 6 | |
| 7 | """See README for more information""" |
| 8 | |
Simon Glass | fda1e37 | 2020-07-05 21:41:53 -0600 | [diff] [blame] | 9 | from argparse import ArgumentParser |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 10 | import os |
| 11 | import re |
Nicolas Boichat | b1b6efc | 2021-02-17 18:41:43 +0800 | [diff] [blame] | 12 | import shutil |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 13 | import sys |
Simon Glass | c9360f16 | 2020-07-05 21:41:59 -0600 | [diff] [blame] | 14 | import traceback |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 15 | |
Simon Glass | 0d7a8c4 | 2020-04-17 18:08:52 -0600 | [diff] [blame] | 16 | if __name__ == "__main__": |
Simon Glass | b4fa949 | 2020-04-17 18:09:05 -0600 | [diff] [blame] | 17 | # Allow 'from patman import xxx to work' |
Simon Glass | 0d7a8c4 | 2020-04-17 18:08:52 -0600 | [diff] [blame] | 18 | our_path = os.path.dirname(os.path.realpath(__file__)) |
| 19 | sys.path.append(os.path.join(our_path, '..')) |
| 20 | |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 21 | # Our modules |
Simon Glass | bf77667 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 22 | from patman import command |
Simon Glass | 7d5b04e | 2020-07-05 21:41:49 -0600 | [diff] [blame] | 23 | from patman import control |
Simon Glass | bf77667 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 24 | from patman import gitutil |
Simon Glass | bf77667 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 25 | from patman import project |
| 26 | from patman import settings |
| 27 | from patman import terminal |
Simon Glass | 0b3d24a | 2020-07-05 21:41:48 -0600 | [diff] [blame] | 28 | from patman import test_util |
Simon Glass | 40d9734 | 2020-06-14 10:54:04 -0600 | [diff] [blame] | 29 | from patman import test_checkpatch |
Paul Barker | 5fe50f9 | 2021-09-08 12:38:01 +0100 | [diff] [blame] | 30 | from patman import tools |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 31 | |
Simon Glass | fda1e37 | 2020-07-05 21:41:53 -0600 | [diff] [blame] | 32 | epilog = '''Create patches from commits in a branch, check them and email them |
| 33 | as specified by tags you place in the commits. Use -n to do a dry run first.''' |
Simon Glass | 57374b0 | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 34 | |
Simon Glass | fda1e37 | 2020-07-05 21:41:53 -0600 | [diff] [blame] | 35 | parser = ArgumentParser(epilog=epilog) |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 36 | parser.add_argument('-b', '--branch', type=str, |
| 37 | help="Branch to process (by default, the current branch)") |
| 38 | parser.add_argument('-c', '--count', dest='count', type=int, |
| 39 | default=-1, help='Automatically create patches from top n commits') |
| 40 | parser.add_argument('-e', '--end', type=int, default=0, |
| 41 | help='Commits to skip at end of patch list') |
| 42 | parser.add_argument('-D', '--debug', action='store_true', |
| 43 | help='Enabling debugging (provides a full traceback on error)') |
Simon Glass | 642df43 | 2022-01-29 14:14:12 -0700 | [diff] [blame] | 44 | parser.add_argument('-p', '--project', default=project.detect_project(), |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 45 | help="Project name; affects default option values and " |
| 46 | "aliases [default: %(default)s]") |
Simon Glass | a55be35 | 2020-11-03 13:54:15 -0700 | [diff] [blame] | 47 | parser.add_argument('-P', '--patchwork-url', |
| 48 | default='https://patchwork.ozlabs.org', |
| 49 | help='URL of patchwork server [default: %(default)s]') |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 50 | parser.add_argument('-s', '--start', dest='start', type=int, |
| 51 | default=0, help='Commit to start creating patches from (0 = HEAD)') |
| 52 | parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', |
| 53 | default=False, help='Verbose output of errors and warnings') |
| 54 | parser.add_argument('-H', '--full-help', action='store_true', dest='full_help', |
| 55 | default=False, help='Display the README file') |
| 56 | |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 57 | subparsers = parser.add_subparsers(dest='cmd') |
| 58 | send = subparsers.add_parser('send') |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 59 | send.add_argument('-i', '--ignore-errors', action='store_true', |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 60 | dest='ignore_errors', default=False, |
| 61 | help='Send patches email even if patch errors are found') |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 62 | send.add_argument('-l', '--limit-cc', dest='limit', type=int, default=None, |
| 63 | help='Limit the cc list to LIMIT entries [default: %(default)s]') |
| 64 | send.add_argument('-m', '--no-maintainers', action='store_false', |
Simon Glass | 983a274 | 2014-09-14 20:23:17 -0600 | [diff] [blame] | 65 | dest='add_maintainers', default=True, |
| 66 | help="Don't cc the file maintainers automatically") |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 67 | send.add_argument('-n', '--dry-run', action='store_true', dest='dry_run', |
Simon Glass | ca706e7 | 2013-03-26 13:09:45 +0000 | [diff] [blame] | 68 | default=False, help="Do a dry run (create but don't email patches)") |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 69 | send.add_argument('-r', '--in-reply-to', type=str, action='store', |
Doug Anderson | 6d81992 | 2013-03-17 10:31:04 +0000 | [diff] [blame] | 70 | help="Message ID that this series is in reply to") |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 71 | send.add_argument('-t', '--ignore-bad-tags', action='store_true', |
Simon Glass | 0fb560d | 2021-01-23 08:56:15 -0700 | [diff] [blame] | 72 | default=False, |
| 73 | help='Ignore bad tags / aliases (default=warn)') |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 74 | send.add_argument('-T', '--thread', action='store_true', dest='thread', |
| 75 | default=False, help='Create patches as a single thread') |
| 76 | send.add_argument('--cc-cmd', dest='cc_cmd', type=str, action='store', |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 77 | default=None, help='Output cc list for patch file (used by git)') |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 78 | send.add_argument('--no-binary', action='store_true', dest='ignore_binary', |
| 79 | default=False, |
| 80 | help="Do not output contents of changes in binary files") |
| 81 | send.add_argument('--no-check', action='store_false', dest='check_patch', |
| 82 | default=True, |
| 83 | help="Don't check for patch compliance") |
Douglas Anderson | dce4322 | 2022-07-19 14:56:27 -0700 | [diff] [blame] | 84 | send.add_argument('--tree', dest='check_patch_use_tree', default=False, |
| 85 | action='store_true', |
| 86 | help=("Set `tree` to True. If `tree` is False then we'll " |
| 87 | "pass '--no-tree' to checkpatch (default: tree=%(default)s)")) |
| 88 | send.add_argument('--no-tree', dest='check_patch_use_tree', |
| 89 | action='store_false', help="Set `tree` to False") |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 90 | send.add_argument('--no-tags', action='store_false', dest='process_tags', |
| 91 | default=True, help="Don't process subject tags as aliases") |
Philipp Tomsich | b3aff15 | 2020-11-24 18:14:52 +0100 | [diff] [blame] | 92 | send.add_argument('--no-signoff', action='store_false', dest='add_signoff', |
| 93 | default=True, help="Don't add Signed-off-by to patches") |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 94 | send.add_argument('--smtp-server', type=str, |
| 95 | help="Specify the SMTP server to 'git send-email'") |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 96 | |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 97 | send.add_argument('patchfiles', nargs='*') |
Simon Glass | 57374b0 | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 98 | |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 99 | test_parser = subparsers.add_parser('test', help='Run tests') |
Simon Glass | 4af9987 | 2020-10-29 21:46:28 -0600 | [diff] [blame] | 100 | test_parser.add_argument('testname', type=str, default=None, nargs='?', |
| 101 | help="Specify the test to run") |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 102 | |
Simon Glass | dc6df97 | 2020-10-29 21:46:35 -0600 | [diff] [blame] | 103 | status = subparsers.add_parser('status', |
| 104 | help='Check status of patches in patchwork') |
Simon Glass | dc4b2a9 | 2020-10-29 21:46:38 -0600 | [diff] [blame] | 105 | status.add_argument('-C', '--show-comments', action='store_true', |
| 106 | help='Show comments from each patch') |
Simon Glass | 8f9ba3a | 2020-10-29 21:46:36 -0600 | [diff] [blame] | 107 | status.add_argument('-d', '--dest-branch', type=str, |
| 108 | help='Name of branch to create with collected responses') |
| 109 | status.add_argument('-f', '--force', action='store_true', |
| 110 | help='Force overwriting an existing branch') |
Simon Glass | dc6df97 | 2020-10-29 21:46:35 -0600 | [diff] [blame] | 111 | |
Doug Anderson | a1dcee8 | 2012-12-03 14:43:18 +0000 | [diff] [blame] | 112 | # Parse options twice: first to get the project and second to handle |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 113 | # defaults properly (which depends on project) |
| 114 | # Use parse_known_args() in case 'cmd' is omitted |
Simon Glass | fda1e37 | 2020-07-05 21:41:53 -0600 | [diff] [blame] | 115 | argv = sys.argv[1:] |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 116 | args, rest = parser.parse_known_args(argv) |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 117 | if hasattr(args, 'project'): |
Simon Glass | 4600767 | 2020-11-03 13:54:10 -0700 | [diff] [blame] | 118 | settings.Setup(gitutil, parser, args.project, '') |
| 119 | args, rest = parser.parse_known_args(argv) |
| 120 | |
| 121 | # If we have a command, it is safe to parse all arguments |
| 122 | if args.cmd: |
| 123 | args = parser.parse_args(argv) |
| 124 | else: |
| 125 | # No command, so insert it after the known arguments and before the ones |
| 126 | # that presumably relate to the 'send' subcommand |
| 127 | nargs = len(rest) |
| 128 | argv = argv[:-nargs] + ['send'] + rest |
Simon Glass | c4e7902 | 2020-07-05 21:41:54 -0600 | [diff] [blame] | 129 | args = parser.parse_args(argv) |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 130 | |
Simon Glass | 9649e15 | 2015-07-30 13:47:41 -0600 | [diff] [blame] | 131 | if __name__ != "__main__": |
| 132 | pass |
| 133 | |
Simon Glass | c9360f16 | 2020-07-05 21:41:59 -0600 | [diff] [blame] | 134 | if not args.debug: |
| 135 | sys.tracebacklimit = 0 |
| 136 | |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 137 | # Run our meagre tests |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 138 | if args.cmd == 'test': |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 139 | import doctest |
Simon Glass | bf77667 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 140 | from patman import func_test |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 141 | |
Alper Nebi Yasak | d8318fe | 2022-04-02 20:06:06 +0300 | [diff] [blame] | 142 | result = test_util.run_test_suites( |
| 143 | 'patman', False, False, False, None, None, None, |
Simon Glass | 1d0f30e | 2022-01-22 05:07:28 -0700 | [diff] [blame] | 144 | [test_checkpatch.TestPatch, func_test.TestFunctional, |
| 145 | 'gitutil', 'settings', 'terminal']) |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 146 | |
Alper Nebi Yasak | d8318fe | 2022-04-02 20:06:06 +0300 | [diff] [blame] | 147 | sys.exit(0 if result.wasSuccessful() else 1) |
Tom Rini | 7208396 | 2020-07-24 08:42:06 -0400 | [diff] [blame] | 148 | |
Simon Glass | 0d24de9 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 149 | # Process commits, produce patches files, check them, email them |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 150 | elif args.cmd == 'send': |
| 151 | # Called from git with a patch filename as argument |
| 152 | # Printout a list of additional CC recipients for this patch |
| 153 | if args.cc_cmd: |
| 154 | fd = open(args.cc_cmd, 'r') |
| 155 | re_line = re.compile('(\S*) (.*)') |
| 156 | for line in fd.readlines(): |
| 157 | match = re_line.match(line) |
| 158 | if match and match.group(1) == args.patchfiles[0]: |
| 159 | for cc in match.group(2).split('\0'): |
| 160 | cc = cc.strip() |
| 161 | if cc: |
| 162 | print(cc) |
| 163 | fd.close() |
| 164 | |
| 165 | elif args.full_help: |
Simon Glass | c1aa66e | 2022-01-29 14:14:04 -0700 | [diff] [blame] | 166 | tools.print_full_help( |
Simon Glass | 37c42b7 | 2022-08-09 13:49:57 -0600 | [diff] [blame] | 167 | os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), |
| 168 | 'README.rst') |
Paul Barker | 5fe50f9 | 2021-09-08 12:38:01 +0100 | [diff] [blame] | 169 | ) |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 170 | |
| 171 | else: |
Simon Glass | 0fb560d | 2021-01-23 08:56:15 -0700 | [diff] [blame] | 172 | # If we are not processing tags, no need to warning about bad ones |
| 173 | if not args.process_tags: |
| 174 | args.ignore_bad_tags = True |
Simon Glass | 6bb74de | 2020-07-05 21:41:55 -0600 | [diff] [blame] | 175 | control.send(args) |
Simon Glass | dc6df97 | 2020-10-29 21:46:35 -0600 | [diff] [blame] | 176 | |
| 177 | # Check status of patches in patchwork |
| 178 | elif args.cmd == 'status': |
| 179 | ret_code = 0 |
| 180 | try: |
Simon Glass | 8f9ba3a | 2020-10-29 21:46:36 -0600 | [diff] [blame] | 181 | control.patchwork_status(args.branch, args.count, args.start, args.end, |
Simon Glass | dc4b2a9 | 2020-10-29 21:46:38 -0600 | [diff] [blame] | 182 | args.dest_branch, args.force, |
Simon Glass | a55be35 | 2020-11-03 13:54:15 -0700 | [diff] [blame] | 183 | args.show_comments, args.patchwork_url) |
Simon Glass | dc6df97 | 2020-10-29 21:46:35 -0600 | [diff] [blame] | 184 | except Exception as e: |
Simon Glass | 098b10f | 2022-01-29 14:14:18 -0700 | [diff] [blame] | 185 | terminal.tprint('patman: %s: %s' % (type(e).__name__, e), |
Simon Glass | dc6df97 | 2020-10-29 21:46:35 -0600 | [diff] [blame] | 186 | colour=terminal.Color.RED) |
| 187 | if args.debug: |
| 188 | print() |
| 189 | traceback.print_exc() |
| 190 | ret_code = 1 |
| 191 | sys.exit(ret_code) |