Attic problem

Mathieu Arnold arn_mat@club-internet.fr
Thu, 21 Mar 2002 17:45:37 +0100


---------------------- multipart/mixed attachment
Hi

today, I ran into a problem, I have a CVS repository and a newer project
with branches. I use FreeBSD's CVSROOT scripts, and I enabled web links at
the end of the mails. My problem was that I had a link like this :
http://cvs/co.php/abso/web/gestion/tmpl/client/edit_client.php?r=1.2 (dead)

which is a dead file now. I clicked on the link, and, well, it was wrong,
because this file is dead and is in the attic (which is not in the link),
then, I got back to another mail whith :
http://cvs/diff.php/abso/web/gestion/compta.sql?r1=1.1.2.1&r2=1.1.2.2

which in the head branch is dead too, so this file is in the attic, but,
hum, it does not appear here, and the guy which is still working on this
branch does not know I deleted this file in HEAD. So I went into chora
again, and hacked it a bit, here is the patch...

-- 
Mathieu Arnold
---------------------- multipart/mixed attachment
Index: =
co.php=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS file: =
/home/cvs/cvs/dup/horde/chora/co.php,vretrieving revision 1.13diff -u =
-r1.13 co.php--- co.php	27 Jan 2002 05:07:53 -0000	1.13+++ co.php	21 Mar =
2002 16:26:00 -0000@@ -56,7 +55,7 @@  /* Retrieve the actual checkout */ =
-$checkOut =3D CVSLib_Checkout::get($CVS, $fullname, $r);+$checkOut =3D =
CVSLib_Checkout::get($CVS, $file->queryFullPath(), $r);  /* Calculate the =
file extension, to identify the MIME type */ @@ -73,7 +72,7 @@     =
$log_print =3D htmlify($log->queryLog());      if ($pretty->getType() =
=3D=3D 'text/html' || $pretty->getType() =3D=3D 'text/plain') {-        =
$title =3D sprintf(_("CVS Checkout of %s (revision %s)"), =
basename($fullname), $r);+        $title =3D sprintf(_("CVS Checkout of %s =
(revision %s)"), $file->name, $r);         include CHORA_TEMPLATES . =
'/common-header.inc';         include CHORA_TEMPLATES . =
'/checkout/header.inc';         if ($pretty->getType() =3D=3D 'text/plain') =
{@@ -91,7 +90,7 @@     /* Just dump the checked out copy to the user as-is =
*/     $mime_type =3D MIME_Magic::extToMIME($extension);     =
header("Content-Type: $mime_type");-    =
fpassthru(CVSLib_Checkout::get($CVS, $fullname, $r));+    =
fpassthru(CVSLib_Checkout::get($CVS, $file->queryFullPath, $r)); }  =
?>Index: =
lib/CVSLib/Checkout.php=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS =
file: /home/cvs/cvs/dup/horde/chora/lib/CVSLib/Checkout.php,vretrieving =
revision 1.16diff -u -r1.16 Checkout.php--- lib/CVSLib/Checkout.php	7 Nov =
2001 09:21:29 -0000	1.16+++ lib/CVSLib/Checkout.php	21 Mar 2002 16:26:00 =
-0000@@ -43,7 +43,7 @@          */          $co =3D fgets($RCS, 1024);-     =
   if (!preg_match('/^([\S ]+),v\s+-->\s+st(andar)?d ?out(put)?\s*$/', $co, =
$regs) || $regs[1] !=3D $fullname) {+        if (!preg_match('/^([\S =
]+,v)\s+-->\s+st(andar)?d ?out(put)?\s*$/', $co, $regs) || $regs[1] !=3D =
$fullname) {             return new CVSLib_Error(CVSLIB_INTERNAL_ERROR, =
"Unexpected output from CVS Checkout: $co");         } Index: =
lib/CVSLib/File.php=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS file: =
/home/cvs/cvs/dup/horde/chora/lib/CVSLib/File.php,vretrieving revision =
1.22diff -u -r1.22 File.php--- lib/CVSLib/File.php	27 Oct 2001 22:05:33 =
-0000	1.22+++ lib/CVSLib/File.php	21 Mar 2002 16:26:00 -0000@@ -142,7 =
+142,12 @@     function getBrowseInfo() {         /* Check that we are =
actually in the filesystem */         if (!is_file($this->queryFullPath())) =
{-            return new CVSLib_Error(CVSLIB_NOT_FOUND,'File Not Found');+  =
          $olddir =3D $this->dir;+            $this->dir =3D $this->dir . =
'/Attic';+            if (!is_file($this->queryFullPath())) {+              =
  $this->dir =3D $olddir;+                return new =
CVSLib_Error(CVSLIB_NOT_FOUND,'File Not Found');+            }         }    =
      /* Call the RCS rlog command to retrieve the file information */
---------------------- multipart/mixed attachment--