[Cvs-cvs] ccvs/src ChangeLog add.c admin.c classify.c com...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/15 16:38:13

Modified files:
        src            : ChangeLog add.c admin.c classify.c commit.c 
                         log.c remove.c sanity.sh tag.c 

Log message:
        * add.c, admin.c, classify.c, commit.c, log.c, remove.c, tag.c:
        Improve error messages for consitency.
        * sanity.sh: Update to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3579&r2=1.3580
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/add.c?cvsroot=cvs&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/admin.c?cvsroot=cvs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.282&r2=1.283
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/log.c?cvsroot=cvs&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/remove.c?cvsroot=cvs&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1201&r2=1.1202
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.156&r2=1.157

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3579
retrieving revision 1.3580
diff -u -b -r1.3579 -r1.3580
--- ChangeLog   12 Sep 2008 20:28:41 -0000      1.3579
+++ ChangeLog   15 Sep 2008 16:38:11 -0000      1.3580
@@ -1,3 +1,9 @@
+2008-09-15  Derek R. Price  <address@hidden>
+
+       * add.c, admin.c, classify.c, commit.c, log.c, remove.c, tag.c:
+       Improve error messages for consitency.
+       * sanity.sh: Update to compensate.
+
 2008-09-12  Derek R. Price  <address@hidden>
 
        * subr.c (format_cmdline): Note new file/line args in header block.

Index: add.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/add.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- add.c       15 Aug 2008 16:44:48 -0000      1.136
+++ add.c       15 Sep 2008 16:38:11 -0000      1.137
@@ -35,6 +35,7 @@
 #endif
 
 /* GNULIB headers.  */
+#include "quote.h"
 #include "save-cwd.h"
 
 /* CVS headers.  */
@@ -373,7 +374,8 @@
                if (vers->ts_user == NULL)
                {
                    /* There is no user file either */
-                   error (0, 0, "nothing known about `%s'", finfo.fullname);
+                   error (0, 0, "Nothing known about %s",
+                          quote (finfo.fullname));
                    err++;
                }
                else if (!isdir (finfo.file)

Index: admin.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/admin.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- admin.c     12 Sep 2008 19:55:15 -0000      1.122
+++ admin.c     15 Sep 2008 16:38:12 -0000      1.123
@@ -19,6 +19,9 @@
 # include <config.h>
 #endif
 
+/* GNULIB */
+#include "quote.h"
+
 /* CVS */
 #include "ignore.h"
 #include "lock.h"
@@ -825,10 +828,10 @@
                   finfo->repository);
 
     rcs = vers->srcfile;
-    if (rcs == NULL)
+    if (!rcs)
     {
        if (!really_quiet)
-           error (0, 0, "nothing known about %s", finfo->file);
+           error (0, 0, "Nothing known about %s", quote (finfo->file));
        status = 1;
        goto exitfunc;
     }
@@ -1239,6 +1242,6 @@
                const char *update_dir, List *entries)
 {
     if (!quiet)
-       error (0, 0, "Administrating %s", update_dir);
+       error (0, 0, "Administrating %s", NULL2DOT (update_dir));
     return R_PROCESS;
 }

Index: classify.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/classify.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- classify.c  12 Sep 2008 15:43:12 -0000      1.43
+++ classify.c  15 Sep 2008 16:38:12 -0000      1.44
@@ -19,7 +19,10 @@
 /* Verify interface.  */
 #include "classify.h"
 
-/* CVS Headers.  */
+/* GNULIB */
+#include "quote.h"
+
+/* CVS */
 #include "no_diff.h"
 
 #include "cvs.h"
@@ -118,8 +121,8 @@
                   is what I would expect.  */
                if (!force_tag_match || !(vers->tag || vers->date))
                    if (!really_quiet)
-                       error (0, 0, "nothing known about `%s'",
-                              finfo->fullname);
+                       error (0, 0, "Nothing known about %s",
+                              quote (finfo->fullname));
                ret = T_UNKNOWN;
            }
            else
@@ -132,8 +135,12 @@
                   is what I would expect.  */
                if (!force_tag_match || !(vers->tag || vers->date))
                    if (!really_quiet)
-                       error (0, 0, "use `%s add' to create an entry for `%s'",
-                              program_name, finfo->fullname);
+                   {
+                       char *cmd = Xasprintf ("%s add", program_name);
+                       error (0, 0, "Use %s to create an entry for %s",
+                              quote_n (0, cmd), quote_n (1, finfo->fullname));
+                       free (cmd);
+                   }
                ret = T_UNKNOWN;
            }
        }

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -b -r1.282 -r1.283
--- commit.c    12 Sep 2008 19:55:23 -0000      1.282
+++ commit.c    15 Sep 2008 16:38:12 -0000      1.283
@@ -255,10 +255,14 @@
     if (!vers->vn_user)
     {
        if (!vers->ts_user)
-           error (0, 0, "nothing known about %s", quote (finfo->fullname));
+           error (0, 0, "Nothing known about %s", quote (finfo->fullname));
        else
-           error (0, 0, "use `%s add' to create an entry for %s",
-                  program_name, quote (finfo->fullname));
+       {
+           char *cmd = Xasprintf ("%s add", program_name);
+           error (0, 0, "Use %s to create an entry for %s",
+                  quote_n (0, cmd), quote_n (1, finfo->fullname));
+           free (cmd);
+       }
        freevers_ts (&vers);
        return 1;
     }
@@ -842,7 +846,7 @@
 
     if (!finfo->repository)
     {
-       error (0, 0, "nothing known about `%s'", finfo->fullname);
+       error (0, 0, "Nothing known about %s", quote (finfo->fullname));
        return 1;
     }
 
@@ -1152,7 +1156,16 @@
         }
 
        case T_UNKNOWN:
-           error (0, 0, "nothing known about %s", quote (finfo->fullname));
+           if (!vers->ts_user)
+               error (0, 0, "Nothing known about %s",
+                      quote (finfo->fullname));
+           else
+           {
+               char *cmd = Xasprintf ("%s add", program_name);
+               error (0, 0, "Use %s to create an entry for %s",
+                      quote_n (0, cmd), quote_n (1, finfo->fullname));
+               free (cmd);
+           }
            goto out;
        case T_UPTODATE:
            break;

Index: log.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/log.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- log.c       28 Jan 2008 05:32:59 -0000      1.113
+++ log.c       15 Sep 2008 16:38:12 -0000      1.114
@@ -849,7 +849,7 @@
        }
        
        if (!really_quiet)
-           error (0, 0, "nothing known about %s", finfo->file);
+           error (0, 0, "Nothing known about %s", quote (finfo->file));
        
        return 1;
     }

Index: remove.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/remove.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- remove.c    24 Apr 2006 18:50:27 -0000      1.64
+++ remove.c    15 Sep 2008 16:38:12 -0000      1.65
@@ -24,7 +24,10 @@
 # include <config.h>
 #endif
 
-/* CVS headers.  */
+/* GNULIB */
+#include "quote.h"
+
+/* CVS */
 #include "ignore.h"
 #include "recurse.h"
 #include "wrapper.h"
@@ -191,10 +194,10 @@
            error (0, 0, "file `%s' still in working directory",
                   finfo->fullname);
     }
-    else if (vers->vn_user == NULL)
+    else if (!vers->vn_user)
     {
        if (!quiet)
-           error (0, 0, "nothing known about `%s'", finfo->fullname);
+           error (0, 0, "Nothing known about %s", quote (finfo->fullname));
     }
     else if (vers->vn_user[0] == '0' && vers->vn_user[1] == '\0')
     {

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -b -r1.1201 -r1.1202
--- sanity.sh   12 Sep 2008 19:55:29 -0000      1.1201
+++ sanity.sh   15 Sep 2008 16:38:12 -0000      1.1202
@@ -3515,21 +3515,21 @@
          echo ssfile >ssfile
 
          # Trying to commit it without a "cvs add" should be an error.
-         # The "use `cvs add' to create an entry" message is the one
+         # The "Use `cvs add' to create an entry" message is the one
          # that I consider to be more correct, but local cvs prints the
-         # "nothing known" message and noone has gotten around to fixing it.
-         dotest_fail basica-notadded "${testcvs} -q ci ssfile" \
-"${CPROG} commit: use .${CPROG} add. to create an entry for \`ssfile'
-${CPROG}"' \[commit aborted\]: correct above errors first!' \
-"${CPROG}"' commit: nothing known about `ssfile'\''
-'"${CPROG}"' \[commit aborted\]: correct above errors first!'
+         # "Nothing known" message and noone has gotten around to fixing it.
+         dotest_fail basica-notadded "$testcvs -q ci ssfile" \
+"$CPROG commit: Use \`$CPROG add' to create an entry for \`ssfile'
+$CPROG \[commit aborted\]: correct above errors first!" \
+"$CPROG commit: Nothing known about \`ssfile'
+$CPROG \[commit aborted\]: correct above errors first!"
 
          dotest basica-4 "${testcvs} add ssfile" \
 "${SPROG}"' add: scheduling file `ssfile'\'' for addition
 '"${SPROG}"' add: use .'"${SPROG}"' commit. to add this file permanently'
-         dotest_fail basica-4a "${testcvs} tag tag0 ssfile" \
-"${SPROG} tag: nothing known about ssfile
-${SPROG} "'\[tag aborted\]: correct the above errors first!'
+         dotest_fail basica-4a "$testcvs tag tag0 ssfile" \
+"$SPROG tag: Nothing known about \`ssfile'
+$SPROG \[tag aborted\]: correct the above errors first!"
          cd ../..
 
          dotest basica-5 "${testcvs} -q ci -m add-it" \
@@ -3568,9 +3568,9 @@
          dotest basica-7 "${testcvs} -q ci -m modify-it" \
 "$CVSROOT_DIRNAME/first-dir/sdir/ssdir/ssfile,v  <--  sdir/ssdir/ssfile
 new revision: 1\.2; previous revision: 1\.1"
-         dotest_fail basica-nonexist "${testcvs} -q ci nonexist" \
-"${CPROG}"' commit: nothing known about `nonexist'\''
-'"${CPROG}"' \[commit aborted\]: correct above errors first!'
+         dotest_fail basica-nonexist "$testcvs -q ci nonexist" \
+"$CPROG commit: Nothing known about \`nonexist'
+$CPROG \[commit aborted\]: correct above errors first!"
          dotest basica-8 "${testcvs} -q update ." ''
 
          # Test the -f option to ci
@@ -3817,8 +3817,8 @@
          dotest basicb-2a10 "${testcvs} -n add sfile1" \
 "${SPROG} add: scheduling file .sfile1. for addition
 ${SPROG} add: use .${SPROG} commit. to add this file permanently"
-         dotest basicb-2a11 "${testcvs} status sfile1" \
-"${SPROG} status: use \`${SPROG} add' to create an entry for \`sfile1'
+         dotest basicb-2a11 "$testcvs status sfile1" \
+"$SPROG status: Use \`$SPROG add' to create an entry for \`sfile1'
 ===================================================================
 File: sfile1                   Status: Unknown
 
@@ -13776,7 +13776,7 @@
          # (Dec 95).  Probably the exit status should be nonzero,
          # however.
          dotest modules-150g1 "$testcvs co dirmodule/nonexist" \
-"$SPROG checkout: nothing known about \`dirmodule/nonexist'"
+"$SPROG checkout: Nothing known about \`dirmodule/nonexist'"
          # We tolerate the creation of the dirmodule directory, since that
          # is what CVS does, not because we view that as preferable to not
          # creating it.
@@ -14599,13 +14599,13 @@
          # however.
          if $remote; then
            dotest modules5-22r "$testcvs co dirmodule/nonexist" \
-"$SPROG checkout: nothing known about \`dirmodule/nonexist'
+"$SPROG checkout: Nothing known about \`dirmodule/nonexist'
 $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .dirmodule..
 checkout script invoked in $TMPDIR/cvs-serv[0-9a-z]*
 args: dirmodule"
          else
            dotest modules5-22 "$testcvs co dirmodule/nonexist" \
-"$SPROG checkout: nothing known about \`dirmodule/nonexist'
+"$SPROG checkout: Nothing known about \`dirmodule/nonexist'
 $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .dirmodule..
 checkout script invoked in $TESTDIR/1
 args: dirmodule"
@@ -14751,13 +14751,13 @@
          # however.
          if $remote; then
            dotest modules5-42r "$testcvs co -d mydir dirmodule/nonexist" \
-"$SPROG checkout: nothing known about \`mydir/nonexist'
+"$SPROG checkout: Nothing known about \`mydir/nonexist'
 $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .mydir..
 checkout script invoked in $TMPDIR/cvs-serv[0-9a-z]*
 args: mydir"
          else
            dotest modules5-42 "$testcvs co -d mydir dirmodule/nonexist" \
-"$SPROG checkout: nothing known about \`mydir/nonexist'
+"$SPROG checkout: Nothing known about \`mydir/nonexist'
 $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .mydir..
 checkout script invoked in $TESTDIR/1
 args: mydir"
@@ -17373,11 +17373,11 @@
          dotest errmsg2-8 "${testcvs} add first-dir/sdir" \
 "Directory ${CVSROOT_DIRNAME}/first-dir/sdir added to the repository"
          # while we're here... check commit with no CVS directory
-         dotest_fail errmsg2-8a "${testcvs} -q ci first-dir nonexistant" \
-"${CPROG} commit: nothing known about .nonexistant'
-${CPROG} \[commit aborted\]: correct above errors first!"
+         dotest_fail errmsg2-8a "$testcvs -q ci first-dir nonexistant" \
+"$CPROG commit: Nothing known about \`nonexistant'
+$CPROG \[commit aborted\]: correct above errors first!"
          dotest_fail errmsg2-8b "$testcvs -q ci nonexistant first-dir" \
-"$CPROG commit: nothing known about .nonexistant'
+"$CPROG commit: Nothing known about \`nonexistant'
 $CPROG \[commit aborted\]: correct above errors first!"
          dotest errmsg2-8c "$testcvs -q ci first-dir"
 
@@ -22190,15 +22190,15 @@
          # The user might not realize that "-r" must not take a space.
          # In the error message, HEAD is a file name, not a tag name (which
          # might be confusing itself).
-         dotest_fail log-14b "${testcvs} log -r HEAD file1" \
-"${SPROG} log: nothing known about HEAD
-${log_header1}
-${log_tags1}
-${log_keyword}
+         dotest_fail log-14b "$testcvs log -r HEAD file1" \
+"$SPROG log: Nothing known about \`HEAD'
+$log_header1
+$log_tags1
+$log_keyword
 total revisions: 5;    selected revisions: 1
 description:
-${log_rev3}
-${log_trailer}"
+$log_rev3
+$log_trailer"
 
 #        Check that unusual syntax works correctly.
 
@@ -28000,10 +28000,10 @@
 "${CPROG} admin: the -i option to admin is not supported
 ${CPROG} admin: run add or import to create an RCS file
 ${CPROG} \[admin aborted\]: specify ${CPROG} -H admin for usage information"
-         dotest_fail admin-4 "${testcvs} -q log file1" \
-"${SPROG} log: nothing known about file1"
+         dotest_fail admin-4 "$testcvs -q log file1" \
+"$SPROG log: Nothing known about \`file1'"
          dotest_fail admin-4a "${testcvs} -q admin file1" \
-"${SPROG} admin: nothing known about file1"
+"$SPROG admin: Nothing known about \`file1'"
 
          # Set up some files, file2 a plain one and file1 with a revision
          # on a branch.
@@ -30400,7 +30400,7 @@
          # client Entries match.
          if $client_sensitive && $server_sensitive; then
            dotest recase-8sscs "$testcvs status fIlE" \
-"$SPROG status: nothing known about \`fIlE'
+"$SPROG status: Nothing known about \`fIlE'
 ===================================================================
 File: no file fIlE             Status: Unknown
 
@@ -30622,7 +30622,7 @@
 
          if $client_sensitive && $server_sensitive; then
            dotest recase-19sscs "$testcvs status fIlE" \
-"$SPROG status: nothing known about \`fIlE'
+"$SPROG status: Nothing known about \`fIlE'
 ===================================================================
 File: no file fIlE             Status: Unknown
 

Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- tag.c       12 Sep 2008 19:55:31 -0000      1.156
+++ tag.c       15 Sep 2008 16:38:13 -0000      1.157
@@ -628,10 +628,10 @@
     p->key = xstrdup (finfo->file);
     p->type = UPDATE;
     p->delproc = tag_delproc;
-    if (vers->srcfile == NULL)
+    if (!vers->srcfile)
     {
         if (!really_quiet)
-           error (0, 0, "nothing known about %s", finfo->file);
+           error (0, 0, "Nothing known about %s", quote (finfo->file));
        freevers_ts (&vers);
        freenode (p);
        return 1;