[Cvs-cvs] ccvs ChangeLog NEWS doc/ChangeLog doc/cvs.texin... [cvs1-11-x-branch]

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Mark D. Baushke <mdb>   08/03/10 18:35:48

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

Log message:
        * NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option.
        
        * doc/cvs.texinfo (config): Document the IgnoreUnknownConfigKeys option.
        
        * src/parseinfo.c (parse_config): Add support for new
        "IgnoreUnknownConfigKeys" configuration key.
        * src/mkmodules.c (config_contents): Add text about the
        "IgnoreUnknownConfigKeys" option.
        * src/sanity.sh (config): Test that IgnoreUnknownConfigKeys=yes works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.692.2.263&r2=1.692.2.264
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.116.2.169&r2=1.116.2.170
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.721.2.132&r2=1.721.2.133
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.545.2.73&r2=1.545.2.74
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.502&r2=1.2336.2.503
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/mkmodules.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.66.6.13&r2=1.66.6.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.37.4.8&r2=1.37.4.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.217&r2=1.752.2.218

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.692.2.263
retrieving revision 1.692.2.264
diff -u -b -r1.692.2.263 -r1.692.2.264
--- ChangeLog   30 Jan 2008 22:25:53 -0000      1.692.2.263
+++ ChangeLog   10 Mar 2008 18:35:44 -0000      1.692.2.264
@@ -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.116.2.169
retrieving revision 1.116.2.170
diff -u -b -r1.116.2.169 -r1.116.2.170
--- NEWS        30 Jan 2008 22:25:54 -0000      1.116.2.169
+++ NEWS        10 Mar 2008 18:35:45 -0000      1.116.2.170
@@ -12,6 +12,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.721.2.132
retrieving revision 1.721.2.133
diff -u -b -r1.721.2.132 -r1.721.2.133
--- doc/ChangeLog       28 Jan 2008 01:22:49 -0000      1.721.2.132
+++ doc/ChangeLog       10 Mar 2008 18:35:45 -0000      1.721.2.133
@@ -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.545.2.73
retrieving revision 1.545.2.74
diff -u -b -r1.545.2.73 -r1.545.2.74
--- doc/cvs.texinfo     28 Jan 2008 01:22:50 -0000      1.545.2.73
+++ doc/cvs.texinfo     10 Mar 2008 18:35:45 -0000      1.545.2.74
@@ -13829,6 +13829,20 @@
 
 @xref{verifymsg}, for more information on how verifymsg
 may be used.
+
address@hidden IgnoreUnknownConfigKeys, in 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
 
 @c ---------------------------------------------------------------------

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.502
retrieving revision 1.2336.2.503
diff -u -b -r1.2336.2.502 -r1.2336.2.503
--- src/ChangeLog       30 Jan 2008 22:23:31 -0000      1.2336.2.502
+++ src/ChangeLog       10 Mar 2008 18:35:46 -0000      1.2336.2.503
@@ -1,3 +1,11 @@
+2008-03-10  Mark D. Baushke  <address@hidden>
+
+       * 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.66.6.13
retrieving revision 1.66.6.14
diff -u -b -r1.66.6.13 -r1.66.6.14
--- src/mkmodules.c     19 Dec 2007 20:44:16 -0000      1.66.6.13
+++ src/mkmodules.c     10 Mar 2008 18:35:46 -0000      1.66.6.14
@@ -288,6 +288,13 @@
     "# Set this 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",
     "# Put CVS lock files in this directory rather than directly in the 
repository.\n",
     "#LockDir=/var/lock/cvs\n",
     "\n",

Index: src/parseinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.c,v
retrieving revision 1.37.4.8
retrieving revision 1.37.4.9
diff -u -b -r1.37.4.8 -r1.37.4.9
--- src/parseinfo.c     16 Mar 2005 22:00:44 -0000      1.37.4.8
+++ src/parseinfo.c     10 Mar 2008 18:35:46 -0000      1.37.4.9
@@ -245,6 +245,7 @@
     /* FIXME-reentrancy: If we do a multi-threaded server, this would need
        to go to the per-connection data structures.  */
     static int parsed = 0;
+    int ignore_unknown_config_keys = 0;
 
     /* Authentication code and serve_root might both want to call us.
        Let this happen smoothly.  */
@@ -415,6 +416,23 @@
            else if (strcmp (p, "stat") == 0)
              RereadLogAfterVerify = LOGMSG_REREAD_STAT;
        }
+       else if (strcmp (line, "IgnoreUnknownConfigKeys") == 0)
+       {
+           if (strcmp (p, "no") == 0 || strcmp (p, "false") == 0
+               || strcmp (p, "off") == 0 || strcmp (p, "0") == 0)
+               ignore_unknown_config_keys = 0;
+           else if (strcmp (p, "yes") == 0 || strcmp (p, "true") == 0
+                    || strcmp (p, "on") == 0 || strcmp (p, "1") == 0)
+               ignore_unknown_config_keys = 1;
+           else
+           {
+               error (0, 0, "%s: unrecognized value '%s' for '%s'",
+                      infopath, p, line);
+               goto error_return;
+           }
+       }
+       else if (ignore_unknown_config_keys)
+           ;
        else
        {
            /* We may be dealing with a keyword which was added in a

Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.217
retrieving revision 1.752.2.218
diff -u -b -r1.752.2.217 -r1.752.2.218
--- src/sanity.sh       30 Jan 2008 22:23:32 -0000      1.752.2.217
+++ src/sanity.sh       10 Mar 2008 18:35:47 -0000      1.752.2.218
@@ -18680,6 +18680,23 @@
 done
 ${PROG} commit: Rebuilding administrative file database"
          dotest config-6 "${testcvs} -q update" ''
+         echo 'IgnoreUnknownConfigKeys=yes' > config
+         echo 'BogusOption=yes' >> config
+         dotest config-7 "${testcvs} -q ci -m change-to-comment" \
+"Checking in config;
+${CVSROOT_DIRNAME}/CVSROOT/config,v  <--  config
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+done
+${PROG} commit: Rebuilding administrative file database"
+         dotest config-8 "${testcvs} -q update" ''
+         echo '# No config is a good config' > config
+         dotest config-9 "${testcvs} -q ci -m change-to-comment" \
+"Checking in config;
+${CVSROOT_DIRNAME}/CVSROOT/config,v  <--  config
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+done
+${PROG} commit: Rebuilding administrative file database"
+         dotest config-10 "${testcvs} -q update" ''
 
          cd ..
          rm -r CVSROOT