bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch for making CommitID configurable


From: Peter Backes
Subject: Patch for making CommitID configurable
Date: Wed, 20 Apr 2005 23:41:22 +0200

>Submitter-Id:   net
>Originator:     Peter Backes
>Organization:
PLASMA
>Confidential:  no
>Synopsis:      CommitID should be configurable
>Severity:      non-critical
>Priority:      low
>Category:      cvs
>Class:         change-request
>Release:       1.12.12
>Environment:
        
System: Linux helen 2.2.26 #1 Thu Feb 26 17:44:40 CET 2004 i686 unknown
Architecture: i686

>Description:
The new feature CommitID produces rcs files which cause warnings with rcs,
so it should only be turned on at request, by an option in config.  This
allows using cvs as a helper application to projects managed with rcs again.
>How-To-Repeat:
rlog test,v
rlog: test,v: warning: Unknown phrases like `commitid ...;' are present.
>Fix:
--- cvs-1.12.12/src/mkmodules.c.old     2005-03-17 20:42:01.000000000 +0100
+++ cvs-1.12.12/src/mkmodules.c 2005-04-20 18:23:13.000000000 +0200
@@ -596,6 +596,11 @@
     "# For example:\n",
     "#\n",
     "#   UseArchiveCommentLeader=no\n",
+    "#\n",
+    "# Set `UseCommitID' to `yes' to write identifiers into the RCS\n",
+    "# file to uniquely have the revision associated with a certain\n",
+    "# commit.  Defaults to `no'.\n",
+    "UseCommitID=yes\n",
     NULL
 };
 
--- cvs-1.12.12/src/parseinfo.c.old     2005-03-17 20:42:01.000000000 +0100
+++ cvs-1.12.12/src/parseinfo.c 2005-04-19 22:31:29.000000000 +0200
@@ -302,6 +302,8 @@
     new->system_auth = true;
 #endif /* AUTH_SERVER_SUPPORT */
 
+    new->use_commit_id = false;
+
     return new;
 }
 
@@ -464,6 +466,8 @@
            readBool (infopath, "SystemAuth", p, &dummy);
        }
 #endif
+       else if (strcmp (line, "UseCommitID") == 0)
+           readBool (infopath, "UseCommitID", p, &retval->use_commit_id);
        else if (strcmp (line, "LocalKeyword") == 0)
            RCS_setlocalid (infopath, ln, &retval->keywords, p);
        else if (strcmp (line, "KeywordExpand") == 0)
--- cvs-1.12.12/src/parseinfo.h.old     2005-03-15 18:44:48.000000000 +0100
+++ cvs-1.12.12/src/parseinfo.h 2005-04-19 22:28:58.000000000 +0200
@@ -42,6 +42,8 @@
     bool system_auth;
 #endif /* AUTH_SERVER_SUPPORT */
 
+    bool use_commit_id;
+
 #ifdef SUPPORT_OLD_INFO_FMT_STRINGS
     bool UseNewInfoFmtStrings;
 #endif /* SUPPORT_OLD_INFO_FMT_STRINGS */
--- cvs-1.12.12/src/log.c.old   2005-04-14 16:14:34.000000000 +0200
+++ cvs-1.12.12/src/log.c       2005-04-20 02:19:17.000000000 +0200
@@ -1649,15 +1649,18 @@
        cvs_output_tagged ("text", padd->data);
        cvs_output_tagged ("text", " -");
        cvs_output_tagged ("text", pdel->data);
-        cvs_output_tagged ("text", ";");
     }
 
-    p = findnode(ver->other_delta,"commitid");
-    if(p && p->data)
+    if (config->use_commit_id)
     {
-        cvs_output_tagged ("text", "  commitid: ");
-       cvs_output_tagged ("text", p->data);
-       cvs_output_tagged ("text", ";");
+       p = findnode(ver->other_delta,"commitid");
+       if(p && p->data)
+       {
+           if (padd != NULL)
+               cvs_output_tagged ("text", ";");
+           cvs_output_tagged ("text", "  commitid: ");
+           cvs_output_tagged ("text", p->data);
+       }
     }
 
     cvs_output_tagged ("newline", NULL);
--- cvs-1.12.12/src/status.c.old        2005-03-17 20:42:04.000000000 +0100
+++ cvs-1.12.12/src/status.c    2005-04-19 22:44:08.000000000 +0200
@@ -124,7 +124,6 @@
     Ctype status;
     char *sstat;
     Vers_TS *vers;
-    Node *node;
 
     status = Classify_File (finfo, NULL, NULL, NULL, 1, 0, &vers, 0);
     sstat = "Classify Error";
@@ -247,18 +246,22 @@
        cvs_output (vers->srcfile->print_path, 0);
        cvs_output ("\n", 0);
 
-       node = findnode(vers->srcfile->versions,vers->vn_rcs);
-       if (node)
+       if (config->use_commit_id)
        {
-           RCSVers *v;
-           v=(RCSVers*)node->data;
-           node = findnode(v->other_delta,"commitid");
-           cvs_output("   Commit Identifier:\t", 0);
-           if(node && node->data)
-               cvs_output(node->data, 0);
-           else
-               cvs_output("(none)",0);
-           cvs_output("\n",0);
+           Node *node;
+           node = findnode(vers->srcfile->versions,vers->vn_rcs);
+           if (node)
+           {
+               RCSVers *v;
+               v=(RCSVers*)node->data;
+               node = findnode(v->other_delta,"commitid");
+               cvs_output("   Commit Identifier:\t", 0);
+               if(node && node->data)
+                   cvs_output(node->data, 0);
+               else
+                   cvs_output("(none)",0);
+               cvs_output("\n",0);
+           }
        }
     }
 
--- cvs-1.12.12/src/sanity.sh.old       2005-04-14 16:14:36.000000000 +0200
+++ cvs-1.12.12/src/sanity.sh   2005-04-20 18:17:23.000000000 +0200
@@ -3074,15 +3074,15 @@
 description:
 ----------------------------
 revision 3\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 bump-it
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-it
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add-it
 ============================================================================="
          dotest basica-o8 "${testcvs} -q update -p -r 1.1 ./ssfile" "ssfile"
@@ -4085,7 +4085,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 =============================================================================
 
@@ -4102,7 +4102,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 =============================================================================
 ${SPROG} log: Logging first-dir/dir1
@@ -4121,7 +4121,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 =============================================================================
 
@@ -4138,7 +4138,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 =============================================================================
 ${SPROG} log: Logging first-dir/dir1/dir2
@@ -4157,7 +4157,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 =============================================================================
 
@@ -4174,7 +4174,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 second dive
 ============================================================================="
 
@@ -7305,29 +7305,29 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 trunk-change-after-branch
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 branches:  1\.2\.2;
 trunk-before-branch
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add-it
 ----------------------------
 revision 1\.2\.2\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 change-on-br1
 ----------------------------
 revision 1\.2\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 branches:  1\.2\.2\.1\.2;
 modify
 ----------------------------
 revision 1\.2\.2\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 modify
 ============================================================================="
          dotest_fail branches-14.4 \
@@ -7907,7 +7907,7 @@
 description:
 ----------------------------
 revision 1.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
 
@@ -8929,16 +8929,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;  1\.1\.4;
 add-it
 ----------------------------
 revision 1\.1\.4\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-br2
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 modify-on-br1
 ============================================================================="
 
@@ -9048,16 +9048,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid}
 local-changes
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 first-import
 ============================================================================="
 
@@ -9262,16 +9262,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.1;  1\.1\.3;
 Initial revision
 ----------------------------
 revision 1\.1\.3\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 add
 ============================================================================="
 
@@ -9362,17 +9362,17 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  commitid: 
${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
+date: ${ISO8601DATE2034};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid}
 branches:  1\.1\.1\.1\.2;
 import-it
 ----------------------------
 revision 1\.1\.1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify
 ============================================================================="
 
@@ -9392,12 +9392,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  commitid: 
${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid};
+date: ${ISO8601DATE1971};  author: ${username};  state: Exp;  lines: ${PLUS}0 
-0;  commitid: ${commitid}
 import-it
 ============================================================================="
          cd ..
@@ -9511,16 +9511,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 add
 ============================================================================="
 
@@ -9540,20 +9540,20 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid}
 Revision 1\.1 was added on the vendor branch\.
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 add
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 add
 ============================================================================="
 
@@ -9621,16 +9621,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid}
 Revision 1\.1 was added on the vendor branch\.
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.1;
 Initial revision
 ----------------------------
 revision 1\.1\.1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 add
 ============================================================================="
 
@@ -11275,16 +11275,16 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 save the merge
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 branches:  1.1.2;
 add-em
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
 rm
 ============================================================================="
 
@@ -13195,7 +13195,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add-it
 ============================================================================="
 
@@ -15697,7 +15697,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15709,7 +15709,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15735,7 +15735,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15747,7 +15747,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15767,7 +15767,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
@@ -15779,7 +15779,7 @@
 xCVS: ----------------------------------------------------------------------
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 xCVS: ----------------------------------------------------------------------
 xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 xCVS:
@@ -15935,7 +15935,7 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: +0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: +0 -0;  
commitid: ${commitid}
 \*\*\* empty log message \*\*\*
 ============================================================================="
 
@@ -17977,7 +17977,7 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 checkin
 ============================================================================="
 
@@ -20022,25 +20022,25 @@
          log_dash='----------------------------
 revision'
          log_date="date: ${ISO8601DATE};  author: ${username};  state: Exp;"
-         log_lines="  lines: ${PLUS}1 -1;"
-         log_commitid="  commitid: ${commitid};"
+         log_lines="  lines: ${PLUS}1 -1"
+         log_commitid="  commitid: ${commitid}"
          log_rev1="${log_dash} 1\.1
 ${log_date}${log_commitid}
 line 1
 
 line 2"
          log_rev2="${log_dash} 1\.2
-${log_date}${log_lines}${log_commitid}
+${log_date}${log_lines};${log_commitid}
 branches:  1\.2\.2;
 2"
          log_rev3="${log_dash} 1\.3
-${log_date}${log_lines}${log_commitid}
+${log_date}${log_lines};${log_commitid}
 3"
          log_rev1b="${log_dash} 1\.2\.2\.1
-${log_date}${log_lines}${log_commitid}
+${log_date}${log_lines};${log_commitid}
 1b"
          log_rev2b="${log_dash} 1\.2\.2\.2
-${log_date}${log_lines}${log_commitid}
+${log_date}${log_lines};${log_commitid}
 2b"
          
log_trailer='============================================================================='
 
@@ -20656,10 +20656,10 @@
        tag2: 1\.3
        tag1: 1\.2'
          log_rev4="${log_dash} 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: dead;  lines: ${PLUS}0 -0; 
 commitid: ${commitid}
 4"
          log_rev22="${log_dash} 1\.2
-${log_date}${log_lines}${log_commitid}
+${log_date}${log_lines};${log_commitid}
 2"
 
          dotest log-d3 "${testcvs} log -rbranch file1" \
@@ -21011,7 +21011,7 @@
 file1-is-for-testing
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 1
 ============================================================================="
 
@@ -21033,7 +21033,7 @@
 change-description
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 1
 ============================================================================="
 
@@ -21058,7 +21058,7 @@
 with two lines
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 1
 ============================================================================="
 
@@ -21081,7 +21081,7 @@
 change from stdin
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 1
 ============================================================================="
 
@@ -21674,11 +21674,11 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2;
+date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2
 delete second line; modify twelfth line
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 -0;
+date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 -0
 add more lines
 ----------------------------
 revision 1\.1
@@ -21708,7 +21708,7 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2;
+date: ${ISO8601DATE2000A};  author: kingdon;  state: Exp;  lines: ${PLUS}1 -2
 delete second line; modify twelfth line
 ============================================================================="
 
@@ -21728,7 +21728,7 @@
 file1 is for testing CVS
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 -0;
+date: ${ISO8601DATE1996A};  author: kingdon;  state: Exp;  lines: ${PLUS}12 -0
 add more lines
 ----------------------------
 revision 1\.1
@@ -21973,19 +21973,19 @@
 description:
 ----------------------------
 revision 1\.5
-date: 1971-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
+date: 1971-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.4
-date: 1971-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
+date: 1971-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.3
-date: 1970-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1;
+date: 1970-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: 
${PLUS}1 -1
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.2
-date: 1970-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: 
${PLUS}1 -1;
+date: 1970-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: 
${PLUS}1 -1
 branches:  1\.2\.6;
 \*\*\* empty log message \*\*\*
 ----------------------------
@@ -21994,11 +21994,11 @@
 \*\*\* empty log message \*\*\*
 ----------------------------
 revision 1\.2\.6\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 mod
 ----------------------------
 revision 1\.2\.6\.1
-date: 1971-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: 
${PLUS}1 -1;
+date: 1971-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: 
${PLUS}1 -1
 \*\*\* empty log message \*\*\*
 ============================================================================="
          # Now test each date format for "cvs log -d".
@@ -25298,16 +25298,16 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;  1\.1\.4;
 add
 ----------------------------
 revision 1\.1\.4\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 modify-on-B
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: ${PLUS}1 -1;  
commitid: ${commitid}
 modify-on-A
 ============================================================================="
 
@@ -25328,7 +25328,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;  1\.1\.4;
 add
 ============================================================================="
@@ -25577,12 +25577,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-branch
 ============================================================================="
          dotest admin-12 "${testcvs} -q admin -bbr file1" \
@@ -25603,12 +25603,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-branch
 ============================================================================="
 
@@ -25689,7 +25689,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
 
@@ -25715,7 +25715,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: oneone;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: oneone;  commitid: 
${commitid}
 changed-log-message
 ============================================================================="
 
@@ -25742,12 +25742,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-branch
 ============================================================================="
 
@@ -25773,12 +25773,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1.1.2.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-branch
 ============================================================================="
 
@@ -25893,7 +25893,7 @@
 description:
 ----------------------------
 revision 1\.6  locked by: ${username};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 sixth
 ============================================================================="
          dotest_fail admin-22-o10 "${testcvs} admin -o1.5: aaa" \
@@ -25922,19 +25922,19 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 first
 ============================================================================="
 
@@ -25991,24 +25991,24 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 branches:  1\.3\.2;
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 first
 ----------------------------
 revision 1\.3\.2\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid}
 branch-four
 ============================================================================="
 
@@ -26043,7 +26043,7 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 modify
 ============================================================================="
 
@@ -26310,24 +26310,24 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 fourth
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 branches:  1\.3\.2;
 third
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 second
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 first
 ----------------------------
 revision 1\.3\.2\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}4 -0;  
commitid: ${commitid}
 branch-four
 =============================================================================
 
@@ -26347,12 +26347,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 branches:  1\.1\.2;
 add
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: foo;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 modify-on-branch
 =============================================================================
 
@@ -26379,15 +26379,15 @@
 description:
 ----------------------------
 revision 1\.4
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 yet_another
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 nuthr_line
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 modify
 =============================================================================
 
@@ -26404,12 +26404,12 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: dead;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: dead;  commitid: 
${commitid}
 branches:  1\.1\.2;
 file file3 was initially added on branch br\.
 ----------------------------
 revision 1\.1\.2\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 another-log-message
 ============================================================================="
 
@@ -26473,7 +26473,7 @@
 description:
 ----------------------------
 revision 1\.1  locked by: ${username};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
 
@@ -26496,7 +26496,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
 
@@ -27735,11 +27735,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid}
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
              dotest recase-6sscs "$testcvs status FiLe" \
@@ -27766,7 +27766,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
            else # server sensitive && client insensitive
@@ -27795,7 +27795,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
              dotest recase-6ss "$testcvs status FiLe" \
@@ -27822,7 +27822,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
            fi
@@ -27854,15 +27854,15 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid}
 recase
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid}
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
            dotest recase-6si "$testcvs status FiLe" \
@@ -27890,15 +27890,15 @@
 description:
 ----------------------------
 revision 1\.3
-date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  lines: +1 -1;  
commitid: ${commitid}
 recase
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid}
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
          fi
@@ -28003,11 +28003,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: dead;  lines: +0 -0;  
commitid: ${commitid}
 rm
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 add
 ============================================================================="
            dotest recase-15sscs "$testcvs status FiLe" \
@@ -28034,7 +28034,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
              dotest recase-17sscs "$testcvs status FILE" \
@@ -28061,7 +28061,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
            else # $server_sensitive && !$client_sensitive
@@ -28090,7 +28090,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
              dotest recase-17ssci "$testcvs status FILE" \
@@ -28117,7 +28117,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid};
+date: ${ISO8601DATE};  author: $username;  state: Exp;  commitid: ${commitid}
 recase
 ============================================================================="
            fi
@@ -28828,7 +28828,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -28845,11 +28845,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -28866,7 +28866,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -28883,11 +28883,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod2-2/mod1-2
@@ -28904,7 +28904,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -28921,11 +28921,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2/mod2-2
@@ -28942,7 +28942,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -28959,11 +28959,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-1
@@ -28980,7 +28980,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -28997,11 +28997,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -29018,7 +29018,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29035,11 +29035,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 =============================================================================" 
\
 "${SPROG} log: Logging \.
@@ -29057,7 +29057,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29074,11 +29074,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -29095,7 +29095,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29112,11 +29112,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -29134,7 +29134,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29151,11 +29151,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 is
 =============================================================================
 ${SPROG} log: Logging mod1-2
@@ -29173,7 +29173,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29190,11 +29190,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-1
@@ -29211,7 +29211,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29228,11 +29228,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 =============================================================================
 ${SPROG} log: Logging mod2-2
@@ -29249,7 +29249,7 @@
 description:
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 reading
 =============================================================================
 
@@ -29266,11 +29266,11 @@
 description:
 ----------------------------
 revision 1\.2
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}1 -0;  
commitid: ${commitid}
 actually
 ----------------------------
 revision 1\.1
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 anyone
 ============================================================================="
 
@@ -33190,9 +33190,9 @@
 branches:  1\.1\.1;
 ${SPROG} log: Logging \.
 ${SPROG} log: Logging subdir
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 description:
 description:
 head: 1\.1
@@ -33327,9 +33327,9 @@
 branches:  1\.1\.1;
 ${SPROG} log: Logging \.
 ${SPROG} log: Logging subdir
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid};
-date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: 
${commitid};
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  lines: ${PLUS}0 -0;  
commitid: ${commitid}
+date: ${ISO8601DATE};  author: ${username};  state: Exp;  commitid: ${commitid}
 description:
 description:
 head: 1\.1
--- cvs-1.12.12/src/rcs.c.old   2005-04-15 23:38:00.000000000 +0200
+++ cvs-1.12.12/src/rcs.c       2005-04-19 22:42:05.000000000 +0200
@@ -5004,7 +5004,6 @@
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
     struct stat sb;
 #endif
-    Node *np;
 
     commitpt = NULL;
 
@@ -5074,15 +5073,18 @@
     else
        delta->state = xstrdup ("Exp");
 
-    delta->other_delta = getlist();
-
-    /* save the commit ID */
-    np = getnode();
-    np->type = RCSFIELD;
-    np->key = xstrdup ("commitid");
-    np->data = xstrdup(global_session_id);
-    addnode (delta->other_delta, np);
+    if (config->use_commit_id)
+    {
+       Node *np;
+       delta->other_delta = getlist();
 
+       /* save the commit ID */
+       np = getnode();
+       np->type = RCSFIELD;
+       np->key = xstrdup ("commitid");
+       np->data = xstrdup(global_session_id);
+       addnode (delta->other_delta, np);
+    }
 
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
     /* If permissions should be preserved on this project, then
--- cvs-1.12.12/src/ChangeLog.old       2005-04-15 23:38:00.000000000 +0200
+++ cvs-1.12.12/src/ChangeLog   2005-04-20 23:01:32.000000000 +0200
@@ -1,3 +1,9 @@
+2005-04-20  Peter Backes  <address@hidden>
+
+       * import.c, log.c, main.c, mkmodules.c, parseinfo.c, parseinfo.h,
+       sanity.sh, status.c: Undid semicolon appending to log output and
+       made commit id feature a runtime option.
+
 2005-04-08  Derek Price  <address@hidden>
 
        * edit.c (edit_fileproc, unedit_fileproc): s/GMT/-0000/.
--- cvs-1.12.12/src/import.c.old        2005-04-14 16:14:33.000000000 +0200
+++ cvs-1.12.12/src/import.c    2005-04-20 22:52:29.000000000 +0200
@@ -1275,8 +1275,12 @@
        if (fprintf (fprcs, "next    %s;\012", add_vhead) < 0)
            goto write_error;
 
-       if (fprintf (fprcs, "commitid        %s;\012", global_session_id) < 0)
-           goto write_error;
+       if (config->use_commit_id)
+       {
+           if (fprintf (fprcs, "commitid        %s;\012", 
+                        global_session_id) < 0)
+               goto write_error;
+       }
 
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
        /* Store initial permissions if necessary. */
@@ -1309,8 +1313,13 @@
        if (fprintf (fprcs, "next     ;\012") < 0)
            goto write_error;
 
-       if (fprintf (fprcs, "commitid        %s;\012", global_session_id) < 0)
-           goto write_error;
+       /* XXX config == NULL in remotecheck init-1.  bug?  used below too.*/
+       if (config != NULL && config->use_commit_id)
+       {
+           if (fprintf (fprcs, "commitid        %s;\012", 
+                        global_session_id) < 0)
+               goto write_error;
+       }
 
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
        /* Store initial permissions if necessary. */
@@ -1328,10 +1337,16 @@
                fprintf (fprcs, "date     %s;  author %s;  state Exp;\012",
                         altdate1, author) < 0 ||
                fprintf (fprcs, "branches ;\012") < 0 ||
-               fprintf (fprcs, "next     ;\012") < 0 ||
-               fprintf (fprcs, "commitid        %s;\012", global_session_id) < 
0)
+               fprintf (fprcs, "next     ;\012") < 0)
                goto write_error;
 
+           if (config->use_commit_id)
+           {
+               if (fprintf (fprcs, "commitid        %s;\012", 
+                            global_session_id) < 0)
+                   goto write_error;
+           }
+
 #ifdef PRESERVE_PERMISSIONS_SUPPORT
            /* Store initial permissions if necessary. */
            if (config->preserve_perms)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]