[Cvs-cvs] ccvs ChangeLog NEWS doc/ChangeLog doc/cvs.texin...

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   08/03/11 00:33:11

Modified files:
        .              : ChangeLog NEWS 
        doc            : ChangeLog cvs.texinfo 
        src            : ChangeLog mkmodules.c parseinfo.c sanity.sh 

Log message:
        Merge changes form 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1365&r2=1.1366
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.378&r2=1.379
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.985&r2=1.986
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.705&r2=1.706
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3560&r2=1.3561
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/mkmodules.c?cvsroot=cvs&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.c?cvsroot=cvs&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1194&r2=1.1195

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -b -r1.1365 -r1.1366
--- ChangeLog   1 Feb 2008 19:37:44 -0000       1.1365
+++ ChangeLog   11 Mar 2008 00:33:10 -0000      1.1366
@@ -1,3 +1,7 @@
+2008-03-10  Mark D. Baushke  <address@hidden>
+
+       * NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option.
+
 2008-01-30  Derek Price  <address@hidden>
 
        * NEWS: Note improved join of removals.

Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -b -r1.378 -r1.379
--- NEWS        1 Feb 2008 19:37:44 -0000       1.378
+++ NEWS        11 Mar 2008 00:33:10 -0000      1.379
@@ -42,6 +42,9 @@
   by default (but may be explicitly set using the --with-ssh flag to
   configure).
 
+* There is a new IgnoreUnknownConfigKeys option available for
+  CVSROOT/config to aid in the transition to newer versions of CVS.
+
 BUG FIXES
 
 * Merges of file removals using -j options are a little smarter.

Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -b -r1.985 -r1.986
--- doc/ChangeLog       28 Jan 2008 05:32:57 -0000      1.985
+++ doc/ChangeLog       11 Mar 2008 00:33:10 -0000      1.986
@@ -1,3 +1,8 @@
+2008-03-10  Mark D. Baushke  <address@hidden>
+
+       * cvs.texinfo (config): Document the IgnoreUnknownConfigKeys
+       option.
+
 2008-01-27  Mark D. Baushke  <address@hidden>
 
        * cvs.texinfo: Document use of --with-ssh flag to configure and

Index: doc/cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -b -r1.705 -r1.706
--- doc/cvs.texinfo     28 Jan 2008 05:32:57 -0000      1.705
+++ doc/cvs.texinfo     11 Mar 2008 00:33:10 -0000      1.706
@@ -15648,6 +15648,20 @@
 group to using @code{cvs admin} to change the default keyword
 substitution mode, lock revisions, unlock revisions, and
 replace the log message, use @samp{UserAdminOptions=klum}.
+
address@hidden IgnoreUnknownConfigKeys, in @file{CVSROOT/config}
address@hidden address@hidden
+If @var{value} is @samp{yes}, then @sc{cvs} should
+ignore any keywords in @file{CVSROOT/config} which it
+does not recognize. This option is intended primarily
+for transitions between versions of @sc{cvs} which
+support more configuration options in an environment
+where a read-only mirror of the current @sc{cvs} server
+may be maintained by someone else who is not yet ready
+to upgrade to the same version. It is recommended that
+this option be used only for a short time so that
+problems with the @file{CVSROOT/config} file will be
+found quickly. The default is @samp{no}.
 @end table
 
 

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3560
retrieving revision 1.3561
diff -u -b -r1.3560 -r1.3561
--- src/ChangeLog       1 Feb 2008 19:35:20 -0000       1.3560
+++ src/ChangeLog       11 Mar 2008 00:33:11 -0000      1.3561
@@ -1,3 +1,13 @@
+2008-03-10  Mark D. Baushke  <address@hidden>
+
+       * mkmodules.c, parseinfo.c: Update copyright.
+
+       * parseinfo.c (parse_config): Add support for new
+       "IgnoreUnknownConfigKeys" configuration key.
+       * mkmodules.c (config_contents): Add text about the
+       "IgnoreUnknownConfigKeys" option.
+       * sanity.sh (config): Test that IgnoreUnknownConfigKeys=yes works.
+
 2008-01-30  Derek R. Price  <address@hidden>
 
        * update.c (join_file): Use local copy to detect deletion conflicts,

Index: src/mkmodules.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/mkmodules.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- src/mkmodules.c     12 Sep 2007 17:27:23 -0000      1.107
+++ src/mkmodules.c     11 Mar 2008 00:33:11 -0000      1.108
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2007 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,
@@ -507,6 +507,13 @@
     "# Set `SystemAuth' to `no' if pserver shouldn't check system 
users/passwords.\n",
     "#SystemAuth=yes\n",
     "\n",
+    "# Set `IgnoreUnknownConfigKeys' to `yes' to ignore unknown config\n",
+    "# keys which are supported in a future version of CVS.\n",
+    "# This option is intended to be useful as a transition for read-only\n",
+    "# mirror sites when sites may need to be updated later than the\n",
+    "# primary CVS repository.\n",
+    "#IgnoreUnknownConfigKeys=no\n",
+    "\n",
     "# Set `LocalKeyword' to specify a local alias for a standard keyword.\n",
     "#LocalKeyword=MYCVS=CVSHeader\n",
     "\n",

Index: src/parseinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- src/parseinfo.c     12 Sep 2007 18:27:07 -0000      1.93
+++ src/parseinfo.c     11 Mar 2008 00:33:11 -0000      1.94
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2007 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,
@@ -432,6 +432,7 @@
      */
     bool processing = true;
     bool processed = true;
+    bool ignore_unknown_config_keys = false;
 
     TRACE (TRACE_FUNCTION, "parse_config (%s)", cvsroot);
 
@@ -796,6 +797,11 @@
            if (!retval->VerifyArgs) retval->VerifyArgs = getlist ();
            push_string (retval->VerifyArgs, xstrdup (p));
        }
+       else if (STREQ (line, "IgnoreUnknownConfigKeys"))
+           readBool (infopath, "IgnoreUnknownConfigKeys", p,
+                     &ignore_unknown_config_keys);
+       else if (ignore_unknown_config_keys)
+           ;
        else
            /* We may be dealing with a keyword which was added in a
               subsequent version of CVS.  In that case it is a good idea

Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1194
retrieving revision 1.1195
diff -u -b -r1.1194 -r1.1195
--- src/sanity.sh       1 Feb 2008 19:35:20 -0000       1.1194
+++ src/sanity.sh       11 Mar 2008 00:33:11 -0000      1.1195
@@ -2,7 +2,7 @@
 :
 #      sanity.sh -- a growing testsuite for cvs.
 #
-# Copyright (C) 2007 The Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 The Free Software Foundation, Inc.
 # Copyright (C) 1992, 1993 Cygnus Support
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21472,8 +21472,8 @@
          echo 'BogusOption=yes' >>config
          if $proxy; then
            dotest config-4p "$testcvs -q ci -m change-to-bogus-opt" \
-"$SPROG [a-z]*: $SECONDARY_CVSROOT_DIRNAME/CVSROOT/config \[99\]: syntax 
error: missing \`=' between keyword and value
-$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[99\]: syntax error: missing 
\`=' between keyword and value
+"$SPROG [a-z]*: $SECONDARY_CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: 
syntax error: missing \`=' between keyword and value
+$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: syntax error: 
missing \`=' between keyword and value
 $CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
@@ -21485,6 +21485,25 @@
 $SPROG commit: Rebuilding administrative file database"
          fi
 
+         echo 'IgnoreUnknownConfigKeys=yes' > config
+         echo 'BogusOption=yes' >>config
+         if $proxy; then
+           dotest config-5p "$testcvs -q ci -m change-to-bogus-opt" \
+"$SPROG [a-z]*: $SECONDARY_CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: 
unrecognized keyword \`BogusOption'
+$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: unrecognized 
keyword \`BogusOption'
+$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+$SPROG commit: Rebuilding administrative file database"
+         else
+           dotest config-5 "$testcvs -q ci -m change-to-bogus-opt" \
+"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: unrecognized 
keyword \`BogusOption'
+$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+$SPROG commit: Rebuilding administrative file database"
+         fi
+         dotest config-6 "$testcvs -q up"
+
+
          if $proxy; then
            : # FIXME: don't try in proxy mode
          else
@@ -21495,27 +21514,26 @@
            echo 'HistorySearchPath=$CVSROOT/../historylogs/*' >>config
 
            # The warning is left over from the previous test.
-           dotest config-5 "$testcvs -q ci -m set-HistoryLogPath" \
-"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: unrecognized 
keyword \`BogusOption'
-$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
+           dotest config-7 "$testcvs -q ci -m set-HistoryLogPath" \
+"$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
 
            echo '# noop' >> config
-           dotest config-6 "$testcvs -q ci -mlog-commit" \
+           dotest config-8 "$testcvs -q ci -mlog-commit" \
 "$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
 
            sleep 1
            echo '# noop' >> config
-           dotest config-7 "$testcvs -q ci -mlog-commit" \
+           dotest config-9 "$testcvs -q ci -mlog-commit" \
 "$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
 
            # The log entry was intentionally split across multiple files.
-           dotest config-8 "ls -l $TESTDIR/historylogs/*" \
+           dotest config-10 "ls -l $TESTDIR/historylogs/*" \
 
"-rw-rw-r--.*$TESTDIR/historylogs/2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]-[0-2][0-9]-[0-5][0-9]-[0-5][0-9]
 
-rw-rw-r--.*$TESTDIR/historylogs/2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]-[0-2][0-9]-[0-5][0-9]-[0-5][0-9]"
 
@@ -21524,13 +21542,13 @@
 
            # Should still see both commits and the error message.
            if $remote; then
-             dotest config-9r "$testcvs history -ea" \
+             dotest config-11r "$testcvs history -ea" \
 "$SPROG history: warning: line 1 from history file 
\`$CVSROOT_DIRNAME/\.\./historylogs/garbage' invalid
 $SPROG history: warning: line 2 from history file 
\`$CVSROOT_DIRNAME/\.\./historylogs/garbage' invalid
 M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == <remote>
 M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == <remote>"
            else
-             dotest config-9 "$testcvs history -ea" \
+             dotest config-11 "$testcvs history -ea" \
 "$SPROG history: warning: line 1 from history file 
\`$CVSROOT_DIRNAME/\.\./historylogs/garbage' invalid
 $SPROG history: warning: line 2 from history file 
\`$CVSROOT_DIRNAME/\.\./historylogs/garbage' invalid
 M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == 
$TESTDIR/wnt/CVSROOT