From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 18 Mar 2007 22:20:44 +0000 (+0000)
Subject: * Applied a patch from Michał to make the mercurial backend pass --quiet to
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/cb0c642aed71ec8af797e8c59c61f6ea882cf541

* 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 b7b15632a..e4cc6deb3 100644
--- 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 d76e05d77..0d92b5175 100644
--- 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 790a3ff1a..26f833e5f 100644
--- 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]]