From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 21 Jul 2006 19:04:17 +0000 (+0000)
Subject: reduce webserver logging of RCS operations
X-Git-Url: http://git.polytechnique.org/?p=diogenes.git;a=commitdiff_plain;h=9d2cbe83a35a1a77fc765ca6424da774dbcf0fba

reduce webserver logging of RCS operations
---

diff --git a/ChangeLog b/ChangeLog
index a3ae443..cd42306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Diogenes 0.9.20pre1
  * added - add RSS feeds describing changes to barrels
  * added - offer preset style sheets for barrels
  * fixed - fix a warning when a barrel's menu is empty
+ * fixed - reduce webserver logging of RCS operations
 
 Diogenes 0.9.19
  * fixed - fix handling of filter plugins without arguments
diff --git a/include/diogenes.rcs.inc.php b/include/diogenes.rcs.inc.php
index 070a887..090d6b5 100644
--- a/include/diogenes.rcs.inc.php
+++ b/include/diogenes.rcs.inc.php
@@ -118,7 +118,7 @@ class DiogenesRcs extends DiogenesSpool {
   {
     $this->info("RCS : checkout out $file ($rev)..");
     $rfile = $this->rcsFile($dir,$file);
-    if ($this->cmdExec("co -r".escapeshellarg($rev)." ".escapeshellarg($rfile)." ".escapeshellarg("$output/$file")))
+    if ($this->cmdExec("co -q -r".escapeshellarg($rev)." ".escapeshellarg($rfile)." ".escapeshellarg("$output/$file")))
     {
       $this->info("RCS : Error, checkout failed!");
       $this->info($this->cmdStatus());
@@ -154,7 +154,7 @@ class DiogenesRcs extends DiogenesSpool {
 
     // if the RCS file does not exist, create it
     if (!file_exists($rfile)) {
-      if ($this->cmdExec("rcs -i ".escapeshellarg($rfile)))
+      if ($this->cmdExec("echo '' | rcs -q -i ".escapeshellarg($rfile)))
       {
         // error
         $this->info("RCS : Error, could not initialise RCS file '$rfile'!");
@@ -164,7 +164,7 @@ class DiogenesRcs extends DiogenesSpool {
     }
 
     // lock the spool file
-    if ($this->cmdExec("co -l ".escapeshellarg($rfile)." ".escapeshellarg($sfile)))
+    if ($this->cmdExec("co -q -l ".escapeshellarg($rfile)." ".escapeshellarg($sfile)))
     {
         // error
         $this->info("RCS : Error, could not get RCS lock on file '$file'!");
@@ -175,7 +175,7 @@ class DiogenesRcs extends DiogenesSpool {
       fwrite($fp,$content);
       fclose($fp);
       
-      if ($this->cmdExec("ci -w".escapeshellarg($this->login). ($message ? " -m".escapeshellarg($message) : "").
+      if ($this->cmdExec("ci -q -w".escapeshellarg($this->login). ($message ? " -m".escapeshellarg($message) : "").
              " ". escapeshellarg($sfile). " ". escapeshellarg($rfile)))
       {
         // error
@@ -184,7 +184,7 @@ class DiogenesRcs extends DiogenesSpool {
         return false;
       }
       
-      if ($this->cmdExec("co ".escapeshellarg($rfile)." ".escapeshellarg($sfile)))
+      if ($this->cmdExec("co -q ".escapeshellarg($rfile)." ".escapeshellarg($sfile)))
       {
         // error
         $this->info("RCS : Error, checkout after checkin failed!");