ssoma-mda: Use the email subject as the commit message

This is more interesting than just using 'mda' all the time, but it's
harder to setup proper quoting around the message without using
third-party Perl modules (e.g. IPC::Run or String::ShellQuote).  This
proof-of-concept patch just assumes the subject doesn't contain
single-quotes (').  This patch also doesn't handle the empty/missing
subject case, which should probably fall back to '<no subject>' or
some such.

I'm fine dropping support for older Gits here, and just using the -m
option to commit-tree.  That landed with 96b8d93a (commit-tree: teach
-m/-F options to read logs from elsewhere, 2011-11-09) in Git v1.7.9,
which was released over 2.5 years ago on 2012-01-27.

It would also be useful (I think) to set the GIT_AUTHOR_NAME,
GIT_AUTHOR_EMAIL, and GIT_AUTHOR_DATE environment variables from the
message header before committing.  I know how to do that using
Python's subprocess module, but I don't know the Perl incantation.

diff --git a/lib/Ssoma/Git.pm b/lib/Ssoma/Git.pm
index 22118932c8043c99038dfa085359069a430fe4b8..e8d4cf625c4c91789a4877cf63acbc9bfc7b3bad 100644 (file)
--- a/lib/Ssoma/Git.pm
+++ b/lib/Ssoma/Git.pm
@@ -266,10 +266,9 @@ sub commit_index {
        my @cmd = qw/git commit-tree/;
        push @cmd, $tree;
        push @cmd, '-p', $parent if $parent;
+       push @cmd, '-m', "'$message'";
 
-       # git commit-tree -m didn't work in older git versions
-       $message =~ /\A\w+\z/ or die "message must be \\w+ only\n";
-       my $commit = $self->qx_sha1("echo $message |". join(' ', @cmd));
+       my $commit = $self->qx_sha1(join(' ', @cmd));
 
        # update the ref
        @cmd = (qw/git update-ref/, $ref, $commit);

diff --git a/lib/Ssoma/MDA.pm b/lib/Ssoma/MDA.pm
index 02816a5dd6da1f5f04d72b8c9233e835d795ef9f..6b58b430e6a4b8e4ea8d6b27c837f9518481d2f3 100644 (file)
--- a/lib/Ssoma/MDA.pm
+++ b/lib/Ssoma/MDA.pm
@@ -102,7 +102,8 @@ sub append {
                my $id = $git->simple_to_blob($simple);
                $gii->update('100644', $id, $path);
        }
-       $git->commit_index($gii, 0, $ref, "mda");
+       my $subject = $simple->header("Subject");
+       $git->commit_index($gii, 0, $ref, $subject);
 }
 
 # the main entry point takes an Email::Simple object