* Applied a patch from Michał to make the mercurial backend pass --quiet to

  hg.

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index b7b15632a5977b511f78742574ad462d30c111b3..e4cc6deb376ead514c0f3f3b7be7ddb1057d6c5f 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -55,7 +55,7 @@ sub mercurial_log($) {
 }
 
 sub rcs_update () { #{{{
-       my @cmdline = ("hg", "-R", "$config{srcdir}", "update");
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
@@ -80,7 +80,7 @@ sub rcs_commit ($$$;$$) { #{{{
 
        $message = possibly_foolish_untaint($message);
 
-       my @cmdline = ("hg", "-R", "$config{srcdir}", "commit", 
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "commit", 
                       "-m", "$message", "-u", "$user");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
@@ -92,7 +92,7 @@ sub rcs_commit ($$$;$$) { #{{{
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 
-       my @cmdline = ("hg", "-R", "$config{srcdir}", "add", "$file");
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$file");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

diff --git a/debian/changelog b/debian/changelog
index d76e05d7753b11c3939b734d4b94f2867e68a503..0d92b51755f2afff780282ef192dd730d04d454a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (1.46) UNRELEASED; urgency=low
     output the verbose build log to stdout, rather than to the syslog.
   * Detect the case of two people independently creating the same page at the
     same time, and let the second person resolve the conflict.
+  * Applied a patch from Michał to make the mercurial backend pass --quiet to
+    hg.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 17 Mar 2007 19:56:04 -0400
 

diff --git a/doc/bugs/quieten_mercurial.mdwn b/doc/bugs/quieten_mercurial.mdwn
index 790a3ff1a69401c7ef0b4dd6bf5f6bcd39420793..26f833e5f4f3e8915dcd305c163c61dbe3d67a2a 100644 (file)
--- a/doc/bugs/quieten_mercurial.mdwn
+++ b/doc/bugs/quieten_mercurial.mdwn
@@ -30,3 +30,5 @@ messages which are then taken for CGI output, causing errors and general trouble
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
+
+Thanks much for the patch. [[bugs/done]] --[[Joey]]