cvs diff: Diffing modules/cvslog/xcvs
Index: modules/cvslog/xcvs/xcvs-config.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/xcvs/xcvs-config.php,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 xcvs-config.php
--- modules/cvslog/xcvs/xcvs-config.php	18 Sep 2006 23:27:54 -0000	1.1.2.3
+++ modules/cvslog/xcvs/xcvs-config.php	26 Oct 2006 08:51:23 -0000
@@ -154,6 +154,20 @@
 
 EOF;
 
+$xcvs['invalid_tag_valid_branch_message'] = <<<EOF
+** ERROR: "%tag" is a valid name for a branch, but not a tag. You 
+** must either use the -b option for your cvs tag command if you
+** wish to create a branch, or choose a valid tag name.
+
+EOF;
+
+$xcvs['invalid_branch_valid_tag_message'] = <<<EOF
+** ERROR: "%tag" is a valid name for a tag, but not a branch. You 
+** must either remove the -b option from your cvs tag command if you
+** do not want to create a branch, or choose a valid branch name.
+
+EOF;
+
 $xcvs['tag_import_message'] = <<<EOF
 ** ERROR: CVS tag operations are currently disabled while 
 ** historical branch and tag informating is being imported.
@@ -162,8 +176,6 @@
 EOF;
 
 
-
-
 // ------------------------------------------------------------
 // Internal code
 // ------------------------------------------------------------
Index: modules/cvslog/xcvs/xcvs-taginfo.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/xcvs/xcvs-taginfo.php,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 xcvs-taginfo.php
--- modules/cvslog/xcvs/xcvs-taginfo.php	18 Sep 2006 23:27:54 -0000	1.1.2.2
+++ modules/cvslog/xcvs/xcvs-taginfo.php	26 Oct 2006 08:51:23 -0000
@@ -48,10 +48,14 @@
   if ($is_branch) {
     $regexp_list = $xcvs['valid_branches'];
     $err_msg = $xcvs['invalid_branch_message'];
+    $other_regexp_list = $xcvs['valid_tags'];
+    $other_err_msg = $xcvs['invalid_branch_valid_tag_message'];
   }
   else {
     $regexp_list = $xcvs['valid_tags'];
     $err_msg = $xcvs['invalid_tag_message'];
+    $other_regexp_list = $xcvs['valid_branches'];
+    $other_err_msg = $xcvs['invalid_tag_valid_branch_message'];
   }
 
   if (count($regexp_list)) {
@@ -60,7 +64,20 @@
         return 1;
       }
     }
-    print strtr($err_msg, array('%dir' => $dir));
+    // If we're about to fail, see if this would be a valid tag/branch:
+    $other = false;
+    foreach ($other_regexp_list as $regexp) {
+      if (preg_match($regexp, $tag)) {
+        $other = true;
+        break;
+      }
+    }
+    if ($other) {
+      print strtr($other_err_msg, array('%dir' => $dir, '%tag' => $tag));
+    }
+    else {
+      print strtr($err_msg, array('%dir' => $dir, '%tag' => $tag));
+    }
     return 0;
   }
   // Don't validate tags