distgit: new -H/--commit-header-file option

allows custom commit message header for new-version, patch and amend actions:

    rdopkg patch --commit-header-file myfile

Use '-' for stdin:

    echo 'My commit message' | rdopkg amend -H -

Change-Id: I902f10132c9c7390629cc8ddd44ec39cc1d913d5
Fixes: #118

Author: Jakub Ruzicka

rdopkg/actions/distgit/__init__.py

@@ -73,6 +73,9 @@
                Arg('changelog', shortcut='-C',
                    choices=['detect', 'count', 'plain'],
                    help="how to generate changelog from patches"),
+               Arg('commit_header_file', shortcut='-H', metavar='FILE',
+                   help="start commit message with FILE contents, "
+                        "- for stdin"),
            ],
            steps=[
                Action('get_package_env'),
@@ -113,6 +116,9 @@
                Arg('bug', shortcut='-B', metavar='BUG(S)',
                    help="reference BUG(S) in changelog. (example:"
                         " --bug rhbz#1234,rhbz#5678)"),
+               Arg('commit_header_file', shortcut='-H', metavar='FILE',
+                   help="start commit message with FILE contents, "
+                        "- for stdin"),
            ],
            steps=[
                Action('get_package_env'),
@@ -149,7 +155,12 @@
                    help="local git branch containing patches"),
            ]),
     Action('amend', atomic=True,
-           help="amend last commit and recreate commit message"),
+           help="amend last commit and recreate commit message",
+           optional_args=[
+               Arg('commit_header_file', shortcut='-H', metavar='FILE',
+                   help="start commit message with FILE contents, "
+                        "- for stdin"),
+           ]),
     Action('squash', atomic=True,
            help="squash HEAD into HEAD~ using HEAD~ commit message"),
     Action('get_source', atomic=True, help="fetch source archive",

rdopkg/actions/distgit/actions.py

@@ -5,6 +5,7 @@
 import itertools
 import os
 import re
+import sys
 
 from rdopkg.conf import cfg, cfg_files
 from rdopkg import exception
@@ -677,12 +678,20 @@ def new_sources(branch=None, fedpkg=FEDPKG, new_sources=False):
     run(*cmd, direct=True)
 
 
-def _commit_message(changes=None):
+def _commit_message(changes=None, header_file=None):
     if not changes:
         _, changes = specfile.Spec().get_last_changelog_entry(strip=True)
         if not changes:
             raise exception.IncompleteChangelog()
-    if len(changes) == 1:
+    if header_file:
+        try:
+            if header_file == '-':
+                msg = sys.stdin.read()
+            else:
+                msg = open(header_file).read()
+        except IOError as ex:
+            raise exception.FileNotFound(msg=str(ex))
+    elif len(changes) == 1:
         msg = re.sub(r'\s+\(.*\)\s*$', '', changes[0])
     else:
         msg = specfile.Spec().get_nvr(epoch=False)
@@ -700,17 +709,17 @@ def _commit_message(changes=None):
     return msg
 
 
-def commit_distgit_update(branch=None, amend=False):
+def commit_distgit_update(branch=None, amend=False, commit_header_file=None):
     _ensure_branch(branch)
-    msg = _commit_message()
+    msg = _commit_message(header_file=commit_header_file)
     cmd = ['commit', '-a', '-F', '-']
     if amend:
         cmd.append('--amend')
     git(*cmd, input=msg, print_output=True)
 
 
-def amend():
-    msg = _commit_message()
+def amend(commit_header_file=None):
+    msg = _commit_message(header_file=commit_header_file)
     git('commit', '-a', '--amend', '-F', '-', input=msg, print_output=True)
     print("")
     git('--no-pager', 'log', '--name-status', 'HEAD~..HEAD', direct=True)