![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/tools/git-notify b/tools/git-notify
index b3223a87a384f85b92d913e775b786e543da0267..088a58046331c7cbb2ad949d6ee4e8c4c151e27c 100755 (executable)
--- a/tools/git-notify
+++ b/tools/git-notify
# -A Omit the author name from the mail subject
# -C Show committer in the body if different from the author
# -c name Send CIA notifications under specified project name
-# -H The mail(1) utility doesn't accept headers via "-a"
# -m addr Send mail notifications to specified address
# -n max Set max number of individual mails to send
# -r name Set the git repository name
+# -S Enable compatibility with SourceForge's gitweb URLs
# -s bytes Set the maximum diff size in bytes (-1 for no limit)
# -T Prefix the mail subject with a [repository name] tag
# -t file Prevent duplicate notifications by saving state to this file
# some parameters you may want to change
-# set this to something that takes "-s"
-my $mailer = "/usr/bin/mail";
+# sendmail's pathname
+my $sendmail = "/usr/sbin/sendmail";
# CIA notification address
-my $cia_address = "cia\@cia.navi.cx";
+my $cia_address = "cia\@cia.vc";
# debug mode
my $debug = 0;
# configuration parameters
-# the $mailer doesn't accept headers via "-a" (can be set with the -H option)
-my $legacy_mail = git_config( "notify.legacymail" );
-
# omit the author from the mail subject (can be set with the -A option)
my $omit_author = git_config( "notify.omitauthor" );
# abbreviate the SHA1 name within gitweb URLs (can be set with the -z option)
my $abbreviate_url = git_config( "notify.shorturls" );
+# enable compatibility with SourceForge's gitweb (can be set with the -S option)
+my $sourceforge = git_config( "notify.sourceforge" );
+
# default repository name (can be changed with the -r option)
my $repos_name = git_config( "notify.repository" ) || get_repos_name();
print " -A Omit the author name from the mail subject\n";
print " -C Show committer in the body if different from the author\n";
print " -c name Send CIA notifications under specified project name\n";
- print " -H The mail(1) utility doesn't accept headers via `-a'\n";
print " -m addr Send mail notifications to specified address\n";
print " -n max Set max number of individual mails to send\n";
print " -r name Set the git repository name\n";
+ print " -S Enable compatibility with SourceForge's gitweb URLs\n";
print " -s bytes Set the maximum diff size in bytes (-1 for no limit)\n";
print " -T Prefix the mail subject with a [repository name] tag\n";
print " -t file Prevent duplicate notifications by saving state to this file\n";
die "Cannot open pipe: $!" if not defined $pid;
if (!$pid)
{
- exec "git", "rev-list", @revlist_options, @args or die "Cannot execute rev-list: $!";
+ exec "git", "rev-list", "--reverse", @revlist_options, @args or die "Cannot execute rev-list: $!";
}
while (<REVLIST>)
{
elsif ($arg eq '-A') { $omit_author = 1; }
elsif ($arg eq '-C') { $show_committer = 1; }
elsif ($arg eq '-c') { $cia_project_name = shift @ARGV; }
- elsif ($arg eq '-H') { $legacy_mail = 1; }
elsif ($arg eq '-m') { $commitlist_address = shift @ARGV; }
elsif ($arg eq '-n') { $max_individual_notices = shift @ARGV; }
elsif ($arg eq '-r') { $repos_name = shift @ARGV; }
+ elsif ($arg eq '-S') { $sourceforge = 1; }
elsif ($arg eq '-s') { $max_diff_size = shift @ARGV; }
elsif ($arg eq '-T') { $emit_repo = 1; }
elsif ($arg eq '-t') { $state_file = shift @ARGV; }
{
my ($name, $subject, $content_type, @text) = @_;
- $subject = "[$repos_name] $subject" if $emit_repo;
+ $subject = "[$repos_name] $subject" if ($emit_repo and $name ne $cia_address);
$subject = encode("MIME-Q",$subject);
+ my @header = ("To: $name", "Subject: $subject", "Content-Type: $content_type");
+
if ($debug)
{
binmode STDOUT, ":utf8";
print "---------------------\n";
- print "To: $name\n";
- print "Subject: $subject\n";
- print "Content-Type: $content_type\n";
- print "\n", join("\n", @text), "\n";
+ print join("\n", @header), "\n\n", join("\n", @text), "\n";
}
else
{
return unless defined $pid;
if (!$pid)
{
- my @mailer_options = ( "-s", $subject );
-
- unless ($legacy_mail)
- {
- push @mailer_options, "-a", "Content-Type: $content_type";
- }
- exec $mailer, @mailer_options, $name or die "Cannot exec $mailer";
+ exec $sendmail, "-t", "-oi", "-oem" or die "Cannot exec $sendmail";
}
binmode MAIL, ":utf8";
- print MAIL join("\n", @text), "\n";
- close MAIL or warn $! ? "Cannot execute $mailer: $!" : "$mailer exited with status: $?";
+ print MAIL join("\n", @header), "\n\n", join("\n", @text), "\n";
+ close MAIL or warn $! ? "Cannot execute $sendmail: $!" : "$sendmail exited with status: $?";
}
}
($reftype eq "tag" ? "Tag:" : "Branch:") . $refname,
@notice,
($action ne "removed" and $gitweb_url)
- ? "URL: $gitweb_url/?a=shortlog;h=$ref" : undef),
+ ? "URL: ${gitweb_url}a=shortlog;h=$ref" : undef),
"",
"The $refname $reftype has been $action.");
close REVPARSE or die $! ? "Cannot execute rev-parse: $!" : "rev-parse exited with status: $?";
}
$obj_string = $obj if not defined $obj_string;
- $url = "$gitweb_url/?a=$info{type};h=$obj_string";
+ $url = "${gitweb_url}a=$info{type};h=$obj_string";
}
if ($info{"type"} eq "tag")
}
else
{
- push @notice, "Diff: $gitweb_url/?a=commitdiff;h=$obj_string" if $gitweb_url;
+ push @notice, "Diff: ${gitweb_url}a=commitdiff;h=$obj_string" if $gitweb_url;
}
$subject = $info{"author_name"} . ": " unless $omit_author;
}
push @cia_text,
" </files>",
- $gitweb_url ? " <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>" : "",
+ $gitweb_url ? " <url>" . xml_escape("${gitweb_url}a=commit;h=$commit") . "</url>" : "",
" </commit>",
" </body>",
" <timestamp>" . $info{"author_date"} . "</timestamp>",
foreach my $rev (@$notice)
{
- $rev =~ s/^commit /URL: $gitweb_url\/?a=commit;h=/ if $gitweb_url;
+ $rev =~ s/^commit /URL: ${gitweb_url}a=commit;h=/ if $gitweb_url;
}
mail_notification($commitlist_address, "New commits on branch $ref", "text/plain; charset=UTF-8", @$notice);
umask( $mode_mask );
# append repository path to URL
-$gitweb_url .= "/$repos_name.git" if $gitweb_url;
+if ($gitweb_url) {
+ $gitweb_url .= $sourceforge ? "/$repos_name;" : "/$repos_name.git/?";
+}
if (@ARGV)
{