fixes for VC_NAME and REGEXP code

webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm

@@ -40,8 +40,8 @@
 # Contributor(s): 
 
 
-# $Revision: 1.24 $ 
-# $Date: 2002/05/03 00:09:56 $ 
+# $Revision: 1.25 $ 
+# $Date: 2002/05/03 00:27:48 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm,v $ 
 # $Name:  $ 
@@ -101,7 +101,7 @@ use TreeData;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.24 $ )[1];
+$VERSION = ( qw $Revision: 1.25 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -316,7 +316,7 @@ sub status_table_legend {
 
 
 sub status_table_header {
-  return ("\t<th>$VC_NAME checkins</th>\n");
+  return ("\t<th>$VC_NAME</th>\n");
 }
 
 

webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm

@@ -35,8 +35,8 @@
 #	 kestes@walrus.com Home.
 # Contributor(s): 
 
-# $Revision: 1.27 $ 
-# $Date: 2002/05/03 00:19:39 $ 
+# $Revision: 1.28 $ 
+# $Date: 2002/05/03 00:27:48 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_CVS.pm,v $ 
 # $Name:  $ 
@@ -139,7 +139,7 @@ use TreeData;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.27 $ )[1];
+$VERSION = ( qw $Revision: 1.28 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -148,8 +148,11 @@ $VERSION = ( qw $Revision: 1.27 $ )[1];
 $CURRENT_YEAR = 1900 + (gmtime(time()))[5];
 
 # name of the version control system
-$VC_NAME = $TinderDB::VC_NAME || "CVS";
+$VC_NAME = $TinderConfig::VC_NAME || "CVS";
 
+# how we recoginise bug number in the checkin comments.
+$VC_BUGNUM_REGEXP = $TinderConfig::VC_BUGNUM_REGEXP ||
+    "(\d\d\d+)";
 
 
 
@@ -505,7 +508,7 @@ sub status_table_legend {
 
 
 sub status_table_header {
-  return ("\t<th>$VC_NAME checkins</th>\n");
+  return ("\t<th>$VC_NAME</th>\n");
 }
 
 

webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm

@@ -71,8 +71,8 @@
 # Contributor(s): 
 
 
-# $Revision: 1.11 $ 
-# $Date: 2002/05/02 04:12:41 $ 
+# $Revision: 1.12 $ 
+# $Date: 2002/05/03 00:27:47 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm,v $ 
 # $Name:  $ 
@@ -148,11 +148,18 @@ use TreeData;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.11 $ )[1];
+$VERSION = ( qw $Revision: 1.12 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
 
+# name of the version control system
+$VC_NAME = $TinderConfig::VC_NAME || "Perforce";
+
+# how we recoginise bug number in the checkin comments.
+$VC_BUGNUM_REGEXP = $TinderConfig::VC_BUGNUM_REGEXP ||
+    "(\d\d\d+)";
+
 $ENV{'P4PORT'} = $TinderConfig::PERFORCE_PORT || 1666;
 
 
@@ -356,11 +363,25 @@ sub status_table_row {
 
   my $cell_options;
   my $text_browser_color_string;
+  my $empty_cell_contents = $HTMLPopUp::EMPTY_TABLE_CELL;
+
   if ( ($LAST_TREESTATE) && ($cell_color) ) {
        $cell_options = "bgcolor=$cell_color ";
 
        $text_browser_color_string = 
          HTMLPopUp::text_browser_color_string($cell_color, $char);
+
+       # for those who like empty cells to be truely empty, we need to
+       # be sure that they see the different cell colors when they
+       # change.
+
+       if (
+           ($cell_color !~ m/white/) &&
+           (!($text_browser_color_string)) &&
+           (!($empty_cell_contents) &&
+            ) {
+               $empty_cell_contents = " ";
+           }
   }
 
   my $query_links = '';
@@ -513,11 +534,8 @@ sub status_table_row {
         
   } else {
 
-      my $cell_contents = $text_browser_color_string ||
-          $HTMLPopUp::EMPTY_TABLE_CELL;
-
-    @outrow = ("\t<!-- skipping: VC_Perforce: tree: $tree -->".
-               "<td align=center $cell_options>$cell_contents</td>\n");
+    @outrow = ("\t<!-- skipping: VC_Bonsai: tree: $tree -->".
+               "<td align=center $cell_options>$empty_cell_contents</td>\n");
   }