dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

patman: Allow specifying the message ID your series is in reply to

Browse Source 
Some versions of git don't seem to prompt you for the message ID that
your series is in reply to.  Allow specifying this from the command
line.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Doug Anderson
2013-03-17 10:31:04 +00:00
committed by Simon Glass
parent 28b3594eb9
commit 6d819925d0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/patman/gitutil.py
View File

@@ -317,7 +317,7 @@ def BuildEmailList(in_list, tag=None, alias=None):
return result return result
def EmailPatches(series, cover_fname, args, dry_run, cc_fname, def EmailPatches(series, cover_fname, args, dry_run, cc_fname,
self_only=False, alias=None): self_only=False, alias=None, in_reply_to=None):
"""Email a patch series. """Email a patch series.
Args: Args:
@@ -327,6 +327,8 @@ def EmailPatches(series, cover_fname, args, dry_run, cc_fname,
dry_run: Just return the command that would be run dry_run: Just return the command that would be run
cc_fname: Filename of Cc file for per-commit Cc cc_fname: Filename of Cc file for per-commit Cc
self_only: True to just email to yourself as a test self_only: True to just email to yourself as a test
in_reply_to: If set we'll pass this to git as --in-reply-to.
Should be a message ID that this is in reply to.
Returns: Returns:
Git command that was/would be run Git command that was/would be run
@@ -376,6 +378,9 @@ def EmailPatches(series, cover_fname, args, dry_run, cc_fname,
to = BuildEmailList([os.getenv('USER')], '--to', alias) to = BuildEmailList([os.getenv('USER')], '--to', alias)
cc = [] cc = []
cmd = ['git', 'send-email', '--annotate'] cmd = ['git', 'send-email', '--annotate']
if in_reply_to:
cmd.append('--in-reply-to="%s"' % in_reply_to)
cmd += to cmd += to
cmd += cc cmd += cc
cmd += ['--cc-cmd', '"%s --cc-cmd %s"' % (sys.argv[0], cc_fname)] cmd += ['--cc-cmd', '"%s --cc-cmd %s"' % (sys.argv[0], cc_fname)]

4
tools/patman/patman.py
View File

@@ -53,6 +53,8 @@ parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run',
parser.add_option('-p', '--project', default=project.DetectProject(), parser.add_option('-p', '--project', default=project.DetectProject(),
help="Project name; affects default option values and " help="Project name; affects default option values and "
"aliases [default: %default]") "aliases [default: %default]")
parser.add_option('-r', '--in-reply-to', type='string', action='store',
help="Message ID that this series is in reply to")
parser.add_option('-s', '--start', dest='start', type='int', parser.add_option('-s', '--start', dest='start', type='int',
default=0, help='Commit to start creating patches from (0 = HEAD)') default=0, help='Commit to start creating patches from (0 = HEAD)')
parser.add_option('-t', '--test', action='store_true', dest='test', parser.add_option('-t', '--test', action='store_true', dest='test',
@@ -163,7 +165,7 @@ else:
cmd = '' cmd = ''
if ok or options.ignore_errors: if ok or options.ignore_errors:
cmd = gitutil.EmailPatches(series, cover_fname, args, cmd = gitutil.EmailPatches(series, cover_fname, args,
options.dry_run, cc_file) options.dry_run, cc_file, in_reply_to=options.in_reply_to)
# For a dry run, just show our actions as a sanity check # For a dry run, just show our actions as a sanity check
if options.dry_run: if options.dry_run: