git-send-email: Fully implement --quiet and document it.

Also reorganizes the man page to list options alphabetically.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index b9bec55e53ad191e4cb0b052551aa7e45049013e..00537d8907872aa25c39f07513ef661b1bef1f17 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -24,25 +24,23 @@ OPTIONS
 -------
 The options available are:
 
 -------
 The options available are:
 

---to::
-       Specify the primary recipient of the emails generated.
-       Generally, this will be the upstream maintainer of the
-       project involved.
+--chain-reply-to, --no-chain-reply-to::
+       If this is set, each email will be sent as a reply to the previous
+       email sent.  If disabled with "--no-chain-reply-to", all emails after
+       the first will be sent as replies to the first email sent.  When using
+       this, it is recommended that the first file given be an overview of the
+       entire patch series.
+       Default is --chain-reply-to
+
+--compose::
+       Use $EDITOR to edit an introductory message for the
+       patch series.

 
 --from::
        Specify the sender of the emails.  This will default to
        the value GIT_COMMITTER_IDENT, as returned by "git-var -l".
        The user will still be prompted to confirm this entry.
 
 
 --from::
        Specify the sender of the emails.  This will default to
        the value GIT_COMMITTER_IDENT, as returned by "git-var -l".
        The user will still be prompted to confirm this entry.
 

---compose::
-       Use \$EDITOR to edit an introductory message for the
-       patch series.
-
---subject::
-       Specify the initial subject of the email thread.
-       Only necessary if --compose is also set.  If --compose
-       is not set, this will be prompted for.
-

 --in-reply-to::
        Specify the contents of the first In-Reply-To header.
        Subsequent emails will refer to the previous email 
 --in-reply-to::
        Specify the contents of the first In-Reply-To header.
        Subsequent emails will refer to the previous email 


@@ -50,18 +48,24 @@ The options available are:
        Only necessary if --compose is also set.  If --compose
        is not set, this will be prompted for.
 
        Only necessary if --compose is also set.  If --compose
        is not set, this will be prompted for.
 

---chain-reply-to, --no-chain-reply-to::
-       If this is set, each email will be sent as a reply to the previous
-       email sent.  If disabled with "--no-chain-reply-to", all emails after
-       the first will be sent as replies to the first email sent.  When using
-       this, it is recommended that the first file given be an overview of the
-       entire patch series.
-       Default is --chain-reply-to
+--quiet::
+       Make git-send-email less verbose.  One line per email should be
+       all that is output.

 
 --smtp-server::
        If set, specifies the outgoing SMTP server to use.  Defaults to
        localhost.
 
 
 --smtp-server::
        If set, specifies the outgoing SMTP server to use.  Defaults to
        localhost.
 

+--subject::
+       Specify the initial subject of the email thread.
+       Only necessary if --compose is also set.  If --compose
+       is not set, this will be prompted for.
+
+--to::
+       Specify the primary recipient of the emails generated.
+       Generally, this will be the upstream maintainer of the
+       project involved.
+

 
 Author
 ------
 
 Author
 ------

diff --git a/git-send-email.perl b/git-send-email.perl
index 2977b9adebff3180f156327622a9a11067e01696..3f1b3ca78897ef1eb85dea266eea6afcc404a1db 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -186,7 +186,9 @@
 }
 
 if (@files) {
 }
 
 if (@files) {

-       print $_,"\n" for @files;
+       unless ($quiet) {
+               print $_,"\n" for (@files);
+       }

 } else {
        print <<EOT;
 git-send-email [options] <file | directory> [... file | directory ]
 } else {
        print <<EOT;
 git-send-email [options] <file | directory> [... file | directory ]


@@ -213,6 +215,10 @@
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.
 
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.
 

+   --quiet     Make git-send-email less verbose.  One line per email should be
+               all that is output.
+
+

 Error: Please specify a file or a directory on the command line.
 EOT
        exit(1);
 Error: Please specify a file or a directory on the command line.
 EOT
        exit(1);


@@ -268,7 +274,9 @@ sub send_message
 
        sendmail(%mail) or die $Mail::Sendmail::error;
 
 
        sendmail(%mail) or die $Mail::Sendmail::error;
 

-       unless ($quiet) {
+       if ($quiet) {
+               printf "Sent %s\n", $subject;
+       } else {

                print "OK. Log says:\n", $Mail::Sendmail::log;
                print "\n\n"
        }
                print "OK. Log says:\n", $Mail::Sendmail::log;
                print "\n\n"
        }


@@ -280,7 +288,6 @@ sub send_message
 $subject = $initial_subject;
 
 foreach my $t (@files) {
 $subject = $initial_subject;
 
 foreach my $t (@files) {

-       my $F = $t;

        open(F,"<",$t) or die "can't open file $t";
 
        @cc = ();
        open(F,"<",$t) or die "can't open file $t";
 
        @cc = ();


@@ -298,7 +305,7 @@ sub send_message
 
                                } elsif (/^(Cc|From):\s+(.*)$/) {
                                        printf("(mbox) Adding cc: %s from line '%s'\n",
 
                                } elsif (/^(Cc|From):\s+(.*)$/) {
                                        printf("(mbox) Adding cc: %s from line '%s'\n",

-                                               $2, $_);
+                                               $2, $_) unless $quiet;

                                        push @cc, $2;
                                }
 
                                        push @cc, $2;
                                }
 


@@ -310,7 +317,7 @@ sub send_message
                                # So let's support that, too.
                                if (@cc == 0) {
                                        printf("(non-mbox) Adding cc: %s from line '%s'\n",
                                # So let's support that, too.
                                if (@cc == 0) {
                                        printf("(non-mbox) Adding cc: %s from line '%s'\n",

-                                               $_, $_);
+                                               $_, $_) unless $quiet;

 
                                        push @cc, $_;
 
 
                                        push @cc, $_;
 


@@ -330,7 +337,7 @@ sub send_message
                                chomp $c;
                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",
                                chomp $c;
                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",

-                                       $c, $_);
+                                       $c, $_) unless $quiet;

                        }
                }
        }
                        }
                }
        }