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