X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tools%2Fgit-notify;h=851429658fd238d820a06e6d6e2db62bea3431b3;hb=4611e41bc50d15275b316c6f21b688997a9c78c4;hp=289a5f645a0f9f69b427edab8f6a063138d2c47f;hpb=40ef91694655a3abb425d994a1b862f956ac081c;p=nagiosplug.git diff --git a/tools/git-notify b/tools/git-notify index 289a5f6..8514296 100755 --- a/tools/git-notify +++ b/tools/git-notify @@ -15,12 +15,15 @@ # # Usage: git-notify [options] [--] old-sha1 new-sha1 refname # +# -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 # -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 # -U mask Set the umask for creating the state file # -u url Set the URL to the gitweb browser @@ -40,17 +43,23 @@ sub get_repos_name(); # 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 +# omit the author from the mail subject (can be set with the -A option) +my $omit_author = git_config( "notify.omitauthor" ); + +# prefix the mail subject with a [repository name] tag (can be set with the -T option) +my $emit_repo = git_config( "notify.emitrepository" ); + # show the committer if different from the author (can be set with the -C option) my $show_committer = git_config( "notify.showcommitter" ); @@ -60,6 +69,12 @@ my $gitweb_url = git_config( "notify.baseurl" ); # abbreviate the SHA1 name within gitweb URLs (can be set with the -z option) my $abbreviate_url = git_config( "notify.shorturls" ); +# don't report merge commits (can be set with the -X option) +my $ignore_merges = git_config( "notify.ignoremerges" ); + +# 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(); @@ -87,18 +102,18 @@ my $state_file = git_config( "notify.statefile" ); # umask for creating the state file (can be set with -U option) my $mode_mask = git_config( "notify.umask" ) || 002; -# Extra options to git rev-list -my @revlist_options; - sub usage() { print "Usage: $0 [options] [--] old-sha1 new-sha1 refname\n"; + 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 " -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"; print " -U mask Set the umask for creating the state file\n"; print " -u url Set the URL to the gitweb browser\n"; @@ -130,12 +145,15 @@ sub git_rev_list(@) 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", @args or die "Cannot execute rev-list: $!"; } while () { chomp; - die "Invalid commit: $_" if not /^[0-9a-f]{40}$/; + unless (grep {$_ eq "--pretty"} @args) + { + die "Invalid commit: $_" if not /^[0-9a-f]{40}$/; + } push @$revlist, $_; } close REVLIST or die $! ? "Cannot execute rev-list: $!" : "rev-list exited with status: $?"; @@ -163,6 +181,7 @@ sub get_new_commits($$) @args = ( "^$old_sha1" ) unless $old_sha1 eq '0' x 40; push @args, $new_sha1, @exclude_list; + unshift @args, "--no-merges" if $ignore_merges; my $revlist = git_rev_list(@args); @@ -275,18 +294,21 @@ sub parse_options() my $arg = shift @ARGV; if ($arg eq '--') { last; } + 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 '-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; } elsif ($arg eq '-U') { $mode_mask = shift @ARGV; } elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } elsif ($arg eq '-i') { push @include_list, shift @ARGV; } + elsif ($arg eq '-X') { $ignore_merges = 1; } elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } - elsif ($arg eq '-X') { push @revlist_options, "--no-merges"; } elsif ($arg eq '-z') { $abbreviate_url = 1; } elsif ($arg eq '-d') { $debug++; } else { usage(); } @@ -299,15 +321,17 @@ sub parse_options() sub mail_notification($$$@) { my ($name, $subject, $content_type, @text) = @_; + + $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 { @@ -315,11 +339,11 @@ sub mail_notification($$$@) return unless defined $pid; if (!$pid) { - exec $mailer, "-s", $subject, "-a", "Content-Type: $content_type", $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: $?"; } } @@ -334,6 +358,18 @@ sub get_repos_name() return $repos; } +# return the type of the given object +sub get_object_type($) +{ + my $obj = shift; + + open TYPE, "-|" or exec "git", "cat-file", "-t", $obj or die "cannot run git-cat-file"; + my $type = ; + chomp $type; + close TYPE or die $! ? "Cannot execute cat-file: $!" : "cat-file exited with status: $?"; + return $type; +} + # extract the information from a commit or tag object and return a hash containing the various fields sub get_object_info($) { @@ -344,10 +380,7 @@ sub get_object_info($) $info{"encoding"} = "utf-8"; - open TYPE, "-|" or exec "git", "cat-file", "-t", $obj or die "cannot run git-cat-file"; - my $type = ; - chomp $type; - close TYPE or die $! ? "Cannot execute cat-file: $!" : "cat-file exited with status: $?"; + my $type = get_object_type($obj); open OBJ, "-|" or exec "git", "cat-file", $type, $obj or die "cannot run git-cat-file"; while () @@ -396,7 +429,7 @@ sub send_ref_notice($$@) ($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."); @@ -422,22 +455,23 @@ sub send_commit_notice($$) 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") { push @notice, format_table( "Module: $repos_name", - "Branch: $ref", - "Tag: $obj", + "Tag: $ref", + "SHA1: $obj", "Tagger:" . $info{"tagger"}, "Date:" . format_date($info{"tagger_date"},$info{"tagger_tz"}), $url ? "URL: $url" : undef), "", join "\n", @{$info{"log"}}; - $subject = "Tag " . $info{"tag"} . ": " . $info{"tagger_name"}; + $subject = "Tag " . $info{"tag"} . ": "; + $subject .= $info{"tagger_name"} . ": " unless $omit_author; } else { @@ -469,12 +503,12 @@ sub send_commit_notice($$) } 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"}; + $subject = $info{"author_name"} . ": " unless $omit_author; } - $subject .= ": " . truncate_str(${$info{"log"}}[0],50); + $subject .= truncate_str(${$info{"log"}}[0],50); $_ = decode($info{"encoding"}, $_) for @notice; mail_notification($commitlist_address, $subject, "text/plain; charset=UTF-8", @notice); } @@ -526,7 +560,7 @@ sub send_cia_notice($$) push @cia_text, " ", - $gitweb_url ? " " . xml_escape("$gitweb_url/?a=commit;h=$commit") . "" : "", + $gitweb_url ? " " . xml_escape("${gitweb_url}a=commit;h=$commit") . "" : "", " ", " ", " " . $info{"author_date"} . "", @@ -543,7 +577,7 @@ sub send_global_notice($$$) 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); @@ -553,13 +587,18 @@ sub send_global_notice($$$) sub send_all_notices($$$) { my ($old_sha1, $new_sha1, $ref) = @_; - my ($reftype, $refname, $action, @notice); + my ($reftype, $refname, $tagtype, $action, @notice); return if ($ref =~ /^refs\/remotes\// or (@include_list && !grep {$_ eq $ref} @include_list)); die "The name \"$ref\" doesn't sound like a local branch or tag" if not (($reftype, $refname) = ($ref =~ /^refs\/(head|tag)s\/(.+)/)); + if ($reftype eq "tag") + { + $tagtype = get_object_type($ref) eq "tag" ? "annotated" : "lightweight"; + } + if ($new_sha1 eq '0' x 40) { $action = "removed"; @@ -567,6 +606,11 @@ sub send_all_notices($$$) } elsif ($old_sha1 eq '0' x 40) { + if ($reftype eq "tag" and $tagtype eq "annotated") + { + send_commit_notice( $refname, $new_sha1 ) if $commitlist_address; + return; + } $action = "created"; @notice = ( "SHA1: $new_sha1" ); } @@ -612,7 +656,9 @@ parse_options(); 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) {