Changeset 3967 for trunk/tools/database/www/cvs.php3

Timestamp:

Aug 7, 2000, 3:07:59 PM (25 years ago)

Author:

bird

Message:

Branches are working better now..
Although they're listed in reverse order.
Another feature is that CVS keywords are expanded on checkout - this is not
implemented yet.

File:

• trunk/tools/database/www/cvs.php3 (modified) (7 diffs)

trunk/tools/database/www/cvs.php3

@@ -539 +539 @@
             $sRev = $this->aasKeys["head"][0];
             $asText = $this->aasDeltas[$sRev];
-            $sBranch = substr($sRevision, 0, strrpos($sRevision, ".")+1);
-            //echo "<!-- \$sBranch=$sBranch -->";
             do
             {
@@ -547 +545 @@
                  * (hope this works ok...)
                  */
-                reset($this->aaasRevs[$sRev]["branches"]);
-                while (list($sIgnore, $sB) = each($this->aaasRevs[$sRev]["branches"]))
+                $sPrevRev = $sRev;
+                $asBranches = $this->aaasRevs[$sRev]["branches"];
+                for ($f = 0, $i = 0; $i < sizeof($asBranches); $i++)
                 {
-                    $sB = trim($sB);
-                    if ($f = (substr($sB, 0, strrpos($sB, ".")+1) == $sBranch))
+                    if (($sB = trim($asBranches[$i])) != "")
                     {
-                        $sRev = $sB;
-                        break;
+                        $sB2 = substr($sB, 0, strrpos($sB, ".") + 1);
+                        if ($f = ($sB2 == substr($sRevision, 0, strlen($sB2))))
+                        {
+                            $sRev = $sB;
+                            break;
+                        }
                     }
                 }
+
                 if (!$f)    $sRev = $this->aaasRevs[$sRev]["next"][0];
-                //echo "<!-- \$sRev=$sRev -->";
+                echo "<!-- \$sRev=$sRev -->";
 
 
@@ -582 +585 @@
                     //apply it
                     $c = (int)substr($this->aasDeltas[$sRev][$iDelta],
-                                     strpos($this->aasDeltas[$sRev][$iDelta], " ") + 1);
-                    $iDelta++;
+                                     (int)strpos($this->aasDeltas[$sRev][$iDelta], " ") + 1);
                     if ($this->aasDeltas[$sRev][$iDelta][0] == 'a')
                     {
+                        $iDelta++;
                         while ($iDelta < $cDelta && $c-- > 0)
                             $asText[$iText++] = $this->aasDeltas[$sRev][$iDelta++];
@@ -593 +596 @@
                     }
                     else
+                    {
+                        $iDelta++;
                         $iOrg += $c;
+                    }
                 }
 
@@ -725 +731 @@
     function getBranch($sRev)
     {
-        if (strpos(strpos($sRev, "."), ".") <= 0)
+        $aiDots = array();
+
+        for ($i = strlen($sRev) - 1; $i >= 0; $i--)
+            if ($sRev[$i] == ".")
+                $aiDots[] = $i;
+
+        if (sizeof($aiDots) == 1)
             return "MAIN";
-        return "<i>not implemented</i>"; //TODO FIXME
+
+        $sBranch = substr($sRev, 0, $aiDots[1]).".0";
+        $cchBranch = strlen($sBranch);
+        reset($this->aasKeys["symbols"]);
+        while (list($sTag, $sTagRev) = each($this->aasKeys["symbols"]))
+        {
+            $j = strrpos($sTagRev, ".");
+            //echo "<!-- $j  $cchBranch ($sBranch, ".substr($sTagRev, 0, $j).")-->";
+            if ($cchBranch == $j && $sBranch == substr($sTagRev, 0, $j))
+                return $sTag;
+        }
+
+        return "";
     }
 
@@ -811 +835 @@
         echo "<table>\n";
         //do we have to sort the array first? no...
-        while (list($sRevision, $aasRev) = each($this->aaasRevs))
+        $i = 0; //max is 256!!! (ChangeLog,v is _very_ big).
+        while ($i++ < 256 && list($sRevision, $aasRev) = each($this->aaasRevs))
         {
             echo "<tr><td bgcolor=#d0dce0>Rev. <a href=\"cvs.php?sFile=$this->sDir/$this->sName,v&sRevision=$sRevision\"",
@@ -858 +883 @@
 
         echo "</table>\n";
+        return 1;
     }
 }