[Cvs-cvs] ccvs/src ChangeLog recurse.c sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/12/11 20:30:29

Modified files:
        src            : ChangeLog recurse.c sanity.sh 

Log message:
        * recurse.c (start_recursion): Improve error message.
        * sanity.sh (basicc): Update to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3546&r2=1.3547
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1190&r2=1.1191

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3546
retrieving revision 1.3547
diff -u -b -r1.3546 -r1.3547
--- ChangeLog   28 Oct 2007 18:29:54 -0000      1.3546
+++ ChangeLog   11 Dec 2007 20:30:28 -0000      1.3547
@@ -1,3 +1,8 @@
+2007-12-11  Derek Price  <address@hidden>
+
+       * recurse.c (start_recursion): Improve error message.
+       * sanity.sh (basicc): Update to compensate.
+
 2007-10-28  Derek Price  <address@hidden>
 
        * hash.c, tag.c: Use TRACE_NULL as needed.  Some cleanup.

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- recurse.c   28 Oct 2007 17:44:17 -0000      1.125
+++ recurse.c   11 Dec 2007 20:30:29 -0000      1.126
@@ -318,15 +318,10 @@
               sub-directory, at least when we recurse into them we
               notice (hopefully) whether they are under CVS control.  */
            if (list_isempty (dirlist))
-           {
-               if (update_dir[0] == '\0')
-                   error (0, 0, "in directory .:");
-               else
-                   error (0, 0, "in directory %s:", update_dir);
                error (1, 0,
-                      "there is no version here; run '%s checkout' first",
+                      "%s is not a working directory; try `%s checkout'?",
+                      *update_dir ? quote (update_dir) : quote ("."),
                       program_name);
-           }
 #ifdef CLIENT_SUPPORT
            else if (current_parsed_root->isremote && server_started)
            {

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -u -b -r1.1190 -r1.1191
--- sanity.sh   12 Sep 2007 19:20:25 -0000      1.1190
+++ sanity.sh   11 Dec 2007 20:30:29 -0000      1.1191
@@ -3989,8 +3989,7 @@
          # More tests of basic/miscellaneous functionality.
          mkdir 1; cd 1
          dotest_fail basicc-1 "$testcvs diff" \
-"$CPROG diff: in directory \.:
-$CPROG \[diff aborted\]: there is no version here; run .$CPROG checkout. first"
+"$CPROG \[diff aborted\]: \`.' is not a working directory; try \`$CPROG 
checkout'$QUESTION"
          dotest basicc-2 "$testcvs -q co -l ."
          mkdir first-dir second-dir
          dotest basicc-3 "${testcvs} add first-dir second-dir" \