Simon Glass | efeac06 | 2019-10-31 07:42:52 -0600 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
Tom Rini | 10e4779 | 2018-05-06 17:58:06 -0400 | [diff] [blame] | 2 | # SPDX-License-Identifier: GPL-2.0+ |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 3 | # |
| 4 | # Copyright (c) 2011 The Chromium OS Authors. |
| 5 | # |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 6 | |
| 7 | """See README for more information""" |
| 8 | |
| 9 | from optparse import OptionParser |
| 10 | import os |
| 11 | import re |
| 12 | import sys |
| 13 | import unittest |
| 14 | |
Simon Glass | bdaad40 | 2020-04-17 18:08:52 -0600 | [diff] [blame] | 15 | if __name__ == "__main__": |
Simon Glass | 4214316 | 2020-04-17 18:09:05 -0600 | [diff] [blame] | 16 | # Allow 'from patman import xxx to work' |
Simon Glass | bdaad40 | 2020-04-17 18:08:52 -0600 | [diff] [blame] | 17 | our_path = os.path.dirname(os.path.realpath(__file__)) |
| 18 | sys.path.append(os.path.join(our_path, '..')) |
| 19 | |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 20 | # Our modules |
Simon Glass | a997ea5 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 21 | from patman import checkpatch |
| 22 | from patman import command |
| 23 | from patman import gitutil |
| 24 | from patman import patchstream |
| 25 | from patman import project |
| 26 | from patman import settings |
| 27 | from patman import terminal |
| 28 | from patman import test |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 29 | |
| 30 | |
| 31 | parser = OptionParser() |
| 32 | parser.add_option('-H', '--full-help', action='store_true', dest='full_help', |
| 33 | default=False, help='Display the README file') |
| 34 | parser.add_option('-c', '--count', dest='count', type='int', |
| 35 | default=-1, help='Automatically create patches from top n commits') |
| 36 | parser.add_option('-i', '--ignore-errors', action='store_true', |
| 37 | dest='ignore_errors', default=False, |
| 38 | help='Send patches email even if patch errors are found') |
Bin Meng | 5b0a511 | 2020-05-04 00:52:43 -0700 | [diff] [blame] | 39 | parser.add_option('-l', '--limit-cc', dest='limit', type='int', |
| 40 | default=None, help='Limit the cc list to LIMIT entries [default: %default]') |
Simon Glass | 46b84d8 | 2014-09-14 20:23:17 -0600 | [diff] [blame] | 41 | parser.add_option('-m', '--no-maintainers', action='store_false', |
| 42 | dest='add_maintainers', default=True, |
| 43 | help="Don't cc the file maintainers automatically") |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 44 | parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run', |
Simon Glass | 33bdd9e | 2013-03-26 13:09:45 +0000 | [diff] [blame] | 45 | default=False, help="Do a dry run (create but don't email patches)") |
Vadim Bendebury | c549f08 | 2013-01-09 16:00:10 +0000 | [diff] [blame] | 46 | parser.add_option('-p', '--project', default=project.DetectProject(), |
| 47 | help="Project name; affects default option values and " |
| 48 | "aliases [default: %default]") |
Doug Anderson | 06f27ac | 2013-03-17 10:31:04 +0000 | [diff] [blame] | 49 | parser.add_option('-r', '--in-reply-to', type='string', action='store', |
| 50 | help="Message ID that this series is in reply to") |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 51 | parser.add_option('-s', '--start', dest='start', type='int', |
| 52 | default=0, help='Commit to start creating patches from (0 = HEAD)') |
Simon Glass | 12ea5f4 | 2013-03-26 13:09:42 +0000 | [diff] [blame] | 53 | parser.add_option('-t', '--ignore-bad-tags', action='store_true', |
| 54 | default=False, help='Ignore bad tags / aliases') |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 55 | parser.add_option('-v', '--verbose', action='store_true', dest='verbose', |
| 56 | default=False, help='Verbose output of errors and warnings') |
Bin Meng | 5b0a511 | 2020-05-04 00:52:43 -0700 | [diff] [blame] | 57 | parser.add_option('-T', '--thread', action='store_true', dest='thread', |
| 58 | default=False, help='Create patches as a single thread') |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 59 | parser.add_option('--cc-cmd', dest='cc_cmd', type='string', action='store', |
| 60 | default=None, help='Output cc list for patch file (used by git)') |
Bin Meng | a04f121 | 2020-05-04 00:52:44 -0700 | [diff] [blame] | 61 | parser.add_option('--no-binary', action='store_true', dest='ignore_binary', |
| 62 | default=False, |
| 63 | help="Do not output contents of changes in binary files") |
Vadim Bendebury | c549f08 | 2013-01-09 16:00:10 +0000 | [diff] [blame] | 64 | parser.add_option('--no-check', action='store_false', dest='check_patch', |
| 65 | default=True, |
| 66 | help="Don't check for patch compliance") |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 67 | parser.add_option('--no-tags', action='store_false', dest='process_tags', |
Sean Anderson | 48f46d6 | 2020-05-04 16:28:34 -0400 | [diff] [blame^] | 68 | default=True, help="Don't process subject tags as aliases") |
Simon Glass | 8137e30 | 2018-06-19 09:56:07 -0600 | [diff] [blame] | 69 | parser.add_option('--smtp-server', type='str', |
| 70 | help="Specify the SMTP server to 'git send-email'") |
Bin Meng | 5b0a511 | 2020-05-04 00:52:43 -0700 | [diff] [blame] | 71 | parser.add_option('--test', action='store_true', dest='test', |
| 72 | default=False, help='run tests') |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 73 | |
Masahiro Yamada | a97f35f | 2014-08-21 14:28:03 +0900 | [diff] [blame] | 74 | parser.usage += """ |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 75 | |
| 76 | Create patches from commits in a branch, check them and email them as |
Simon Glass | 33bdd9e | 2013-03-26 13:09:45 +0000 | [diff] [blame] | 77 | specified by tags you place in the commits. Use -n to do a dry run first.""" |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 78 | |
Doug Anderson | 3d3077c | 2012-12-03 14:43:17 +0000 | [diff] [blame] | 79 | |
Doug Anderson | 31ffd7f | 2012-12-03 14:43:18 +0000 | [diff] [blame] | 80 | # Parse options twice: first to get the project and second to handle |
| 81 | # defaults properly (which depends on project). |
| 82 | (options, args) = parser.parse_args() |
| 83 | settings.Setup(parser, options.project, '') |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 84 | (options, args) = parser.parse_args() |
| 85 | |
Simon Glass | 2b68b36 | 2015-07-30 13:47:41 -0600 | [diff] [blame] | 86 | if __name__ != "__main__": |
| 87 | pass |
| 88 | |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 89 | # Run our meagre tests |
Simon Glass | 2b68b36 | 2015-07-30 13:47:41 -0600 | [diff] [blame] | 90 | elif options.test: |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 91 | import doctest |
Simon Glass | a997ea5 | 2020-04-17 18:09:04 -0600 | [diff] [blame] | 92 | from patman import func_test |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 93 | |
| 94 | sys.argv = [sys.argv[0]] |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 95 | result = unittest.TestResult() |
Simon Glass | df1bc5c | 2017-05-29 15:31:31 -0600 | [diff] [blame] | 96 | for module in (test.TestPatch, func_test.TestFunctional): |
| 97 | suite = unittest.TestLoader().loadTestsFromTestCase(module) |
| 98 | suite.run(result) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 99 | |
Simon Glass | 5f9325d | 2020-04-09 15:08:40 -0600 | [diff] [blame] | 100 | for module in ['gitutil', 'settings', 'terminal']: |
Doug Anderson | 06a9515 | 2012-12-03 14:43:19 +0000 | [diff] [blame] | 101 | suite = doctest.DocTestSuite(module) |
| 102 | suite.run(result) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 103 | |
| 104 | # TODO: Surely we can just 'print' result? |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 105 | print(result) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 106 | for test, err in result.errors: |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 107 | print(err) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 108 | for test, err in result.failures: |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 109 | print(err) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 110 | |
| 111 | # Called from git with a patch filename as argument |
| 112 | # Printout a list of additional CC recipients for this patch |
| 113 | elif options.cc_cmd: |
| 114 | fd = open(options.cc_cmd, 'r') |
| 115 | re_line = re.compile('(\S*) (.*)') |
| 116 | for line in fd.readlines(): |
| 117 | match = re_line.match(line) |
| 118 | if match and match.group(1) == args[0]: |
Dmitry Torokhov | ef7f67d | 2019-10-21 20:09:56 -0700 | [diff] [blame] | 119 | for cc in match.group(2).split('\0'): |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 120 | cc = cc.strip() |
| 121 | if cc: |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 122 | print(cc) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 123 | fd.close() |
| 124 | |
| 125 | elif options.full_help: |
| 126 | pager = os.getenv('PAGER') |
| 127 | if not pager: |
| 128 | pager = 'more' |
Simon Glass | c29101f | 2016-03-06 19:45:34 -0700 | [diff] [blame] | 129 | fname = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), |
| 130 | 'README') |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 131 | command.Run(pager, fname) |
| 132 | |
| 133 | # Process commits, produce patches files, check them, email them |
| 134 | else: |
| 135 | gitutil.Setup() |
| 136 | |
| 137 | if options.count == -1: |
| 138 | # Work out how many patches to send if we can |
| 139 | options.count = gitutil.CountCommitsToBranch() - options.start |
| 140 | |
| 141 | col = terminal.Color() |
| 142 | if not options.count: |
| 143 | str = 'No commits found to process - please use -c flag' |
Masahiro Yamada | 880828d | 2014-08-16 00:59:26 +0900 | [diff] [blame] | 144 | sys.exit(col.Color(col.RED, str)) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 145 | |
| 146 | # Read the metadata from the commits |
| 147 | if options.count: |
| 148 | series = patchstream.GetMetaData(options.start, options.count) |
| 149 | cover_fname, args = gitutil.CreatePatches(options.start, options.count, |
Bin Meng | a04f121 | 2020-05-04 00:52:44 -0700 | [diff] [blame] | 150 | options.ignore_binary, series) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 151 | |
| 152 | # Fix up the patch files to our liking, and insert the cover letter |
Simon Glass | fdf7002 | 2017-05-29 15:31:27 -0600 | [diff] [blame] | 153 | patchstream.FixPatches(series, args) |
| 154 | if cover_fname and series.get('cover'): |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 155 | patchstream.InsertCoverLetter(cover_fname, series, options.count) |
| 156 | |
| 157 | # Do a few checks on the series |
| 158 | series.DoChecks() |
| 159 | |
| 160 | # Check the patches, and run them through 'git am' just to be sure |
Vadim Bendebury | c549f08 | 2013-01-09 16:00:10 +0000 | [diff] [blame] | 161 | if options.check_patch: |
| 162 | ok = checkpatch.CheckPatches(options.verbose, args) |
| 163 | else: |
| 164 | ok = True |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 165 | |
Simon Glass | 12ea5f4 | 2013-03-26 13:09:42 +0000 | [diff] [blame] | 166 | cc_file = series.MakeCcFile(options.process_tags, cover_fname, |
Simon Glass | 46b84d8 | 2014-09-14 20:23:17 -0600 | [diff] [blame] | 167 | not options.ignore_bad_tags, |
Chris Packham | b84fb48 | 2018-06-07 20:45:06 +1200 | [diff] [blame] | 168 | options.add_maintainers, options.limit) |
Doug Anderson | 507e8e8 | 2012-12-03 14:40:42 +0000 | [diff] [blame] | 169 | |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 170 | # Email the patches out (giving the user time to check / cancel) |
| 171 | cmd = '' |
Vadim Bendebury | fbf8ee0 | 2014-09-04 10:45:13 -0700 | [diff] [blame] | 172 | its_a_go = ok or options.ignore_errors |
| 173 | if its_a_go: |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 174 | cmd = gitutil.EmailPatches(series, cover_fname, args, |
Simon Glass | 12ea5f4 | 2013-03-26 13:09:42 +0000 | [diff] [blame] | 175 | options.dry_run, not options.ignore_bad_tags, cc_file, |
Simon Glass | 8137e30 | 2018-06-19 09:56:07 -0600 | [diff] [blame] | 176 | in_reply_to=options.in_reply_to, thread=options.thread, |
| 177 | smtp_server=options.smtp_server) |
Vadim Bendebury | fbf8ee0 | 2014-09-04 10:45:13 -0700 | [diff] [blame] | 178 | else: |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 179 | print(col.Color(col.RED, "Not sending emails due to errors/warnings")) |
Simon Glass | 2613288 | 2012-01-14 15:12:45 +0000 | [diff] [blame] | 180 | |
| 181 | # For a dry run, just show our actions as a sanity check |
| 182 | if options.dry_run: |
| 183 | series.ShowActions(args, cmd, options.process_tags) |
Vadim Bendebury | fbf8ee0 | 2014-09-04 10:45:13 -0700 | [diff] [blame] | 184 | if not its_a_go: |
Paul Burton | c393134 | 2016-09-27 16:03:50 +0100 | [diff] [blame] | 185 | print(col.Color(col.RED, "Email would not be sent")) |
Doug Anderson | 507e8e8 | 2012-12-03 14:40:42 +0000 | [diff] [blame] | 186 | |
| 187 | os.remove(cc_file) |