[Cvs-cvs] ccvs ./ChangeLog ./NEWS src/ChangeLog src/commi...

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/05/18 00:25:47

Modified files:
        .              : ChangeLog NEWS 
        src            : ChangeLog commit.c logmsg.c sanity.sh 

Log message:
        * NEWS: Remove wording about backed out change for added files.
        Use "NONE" instead of "0" again.
        
        * logmsg.c (logmsg_list_to_args_proc): Deal with T_CONFLICT
        action which seems only to happen in the proxycheck files-12r
        test.
        * commit.c (precommit_list_to_args_proc): Duplicate logmsg.c code.
        
        * commit.c (check_fileproc): Backout change for "NONE"->"0" in
        added files.
        * sanity.sh (info-intfmt-10,info-newfmt-7): Update tests for above
        change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1303&tr2=1.1304&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/NEWS.diff?tr1=1.355&tr2=1.356&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3414&tr2=1.3415&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?tr1=1.265&tr2=1.266&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/logmsg.c.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1138&tr2=1.1139&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1303 ccvs/ChangeLog:1.1304
--- ccvs/ChangeLog:1.1303       Tue May 16 20:14:58 2006
+++ ccvs/ChangeLog      Thu May 18 00:25:46 2006
@@ -1,3 +1,8 @@
+2006-05-17  Mark D. Baushke  <address@hidden>
+
+       * NEWS: Remove wording about backed out change for added files.
+       Use "NONE" instead of "0" again.
+       
 2006-05-16  Derek Price  <address@hidden>
 
        * NEWS: Correct wording of previous entry since commits of added files
Index: ccvs/NEWS
diff -u ccvs/NEWS:1.355 ccvs/NEWS:1.356
--- ccvs/NEWS:1.355     Tue May 16 20:14:58 2006
+++ ccvs/NEWS   Thu May 18 00:25:46 2006
@@ -19,8 +19,7 @@
   triggers which provides the file action (status). (CVS patch #5099.)
 
 * When UseNewInfoFmtStrings is enabled, the %{vV} formats will now
-  expose the real version instead of NONE for removed files.  For added
-  files, 0 is now passed in place of "NONE" on the initial add of a file.
+  expose the real version instead of NONE for removed files.
 
 BUG FIXES
 
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3414 ccvs/src/ChangeLog:1.3415
--- ccvs/src/ChangeLog:1.3414   Wed May 17 20:53:45 2006
+++ ccvs/src/ChangeLog  Thu May 18 00:25:46 2006
@@ -1,3 +1,15 @@
+2006-05-17  Mark D. Baushke  <address@hidden>
+
+       * logmsg.c (logmsg_list_to_args_proc): Deal with T_CONFLICT
+       action which seems only to happen in the proxycheck files-12r
+       test.
+       * commit.c (precommit_list_to_args_proc): Duplicate logmsg.c code.
+
+       * commit.c (check_fileproc): Backout change for "NONE"->"0" in
+       added files.
+       * sanity.sh (info-intfmt-10,info-newfmt-7): Update tests for above
+       change.
+
 2006-05-17  Derek Price  <address@hidden>
 
        * update.c (join_rev1, join_date1, join_rev2, join_date2): Make const.
Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.265 ccvs/src/commit.c:1.266
--- ccvs/src/commit.c:1.265     Wed May 17 15:22:56 2006
+++ ccvs/src/commit.c   Thu May 18 00:25:46 2006
@@ -1092,8 +1092,6 @@
 
            li->tag = xstrdup (vers->tag);
            li->rev_old = xstrdup (vers->vn_rcs);
-            if (li->rev_old == NULL && config->UseNewInfoFmtStrings)
-                li->rev_old = xstrdup ("0");
            li->rev_new = NULL;
            p->data = li;
            (void) addnode (ulist, p);
@@ -1232,6 +1230,7 @@
                         arg = "added";
                         break;
                     case T_MODIFIED:
+                    case T_CONFLICT:
                         arg = "modified";
                         break;
                     case T_REMOVED:
@@ -1241,7 +1240,7 @@
                         arg = "imported";
                         break;
                    default:
-                       error (1, 0, "Unexpected action type.");
+                       error (1, 0, "Unexpected action type %d.", li->type);
                         break;
                 }
                 break;
Index: ccvs/src/logmsg.c
diff -u ccvs/src/logmsg.c:1.105 ccvs/src/logmsg.c:1.106
--- ccvs/src/logmsg.c:1.105     Tue May 16 19:49:23 2006
+++ ccvs/src/logmsg.c   Thu May 18 00:25:47 2006
@@ -652,6 +652,7 @@
                         arg = "added";
                         break;
                     case T_MODIFIED:
+                    case T_CONFLICT:
                         arg = "modified";
                         break;
                     case T_REMOVED:
@@ -661,7 +662,7 @@
                         arg = "imported";
                         break;
                    default:
-                       error (1, 0, "Unexpected action type.");
+                       error (1, 0, "Unexpected action type %d.", li->type);
                         break;
                 }
                 break;
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1138 ccvs/src/sanity.sh:1.1139
--- ccvs/src/sanity.sh:1.1138   Tue May 16 16:30:30 2006
+++ ccvs/src/sanity.sh  Thu May 18 00:25:47 2006
@@ -19404,11 +19404,11 @@
 'third-dir
 third-dir
 third-dir
-third-dir file1,added,,0,1.1
+third-dir file1,added,,NONE,1.1
 third-dir added
 third-dir 1.1
 third-dir file1 %s
-third-dir 0AX
+third-dir NONEAX
 third-dir file1ux
 third-dir
 third-dir
@@ -19512,12 +19512,12 @@
          dotest info-newfmt-6 "cat $TESTDIR/testlog" \
 "xenv-valueyz=${username}=${TESTDIR}/cvsroot="
           dotest info-newfmt-7 "cat $TESTDIR/testlog2" \
-'fourth-dir file1 added  0 1\.1
+'fourth-dir file1 added  NONE 1\.1
 added
 
 1\.1
 file1
-0AX
+NONEAX
 fourth-dir file1 modified  1\.1 1\.2
 modified