Re: Verifymsg on branches?

[Mark D. Baushke]

On Tue, 14 Nov 2000 10:03:16 EST, Laird Nelson
<address@hidden> wrote:
>2. You can't add anything to the message at commitinfo or verifymsg
>time.  The message being verified is read only.

Actually, the FreeBSD version of cvs *does* allow the verifymsg script
to make modifications to the log message. This is a VERY useful
feature that I would very much like to see it added to the cvshome.org
version of cvs. [Patches attached at the end of this message.]

        Enjoy!
        -- Mark

PS: Here are the essential patches to provide this feature as it is
found in the FreeBSD top-of-tree sources. If you wish to see what
other features have been added to the FreeBSD sources, you may
checkout your own copy of the sources using the commands:

  cvs -d :pserver:address@hidden:/home/ncvs login
  CVS password: anoncvs
  cvs -d :pserver:address@hidden:/home/ncvs co contrib_cvs

or just browse through the web via

  http://www.FreeBSD.org/cgi/cvsweb.cgi/src/contrib/cvs/

to take a look at the sources.

Sun Nov 19 23:24:05 2000  Mark D Baushke  <address@hidden>

        * Apply changes from FreeBSD cvs sources to implement a read-write
        user-defined verification script.
        * commit.c (commit): do_verify saved_message is now read-write
        * import.c (import): do_verify saved_message is now read-write
        * cvs.h (do_verify): Update do_verify prototype to expect a
        pointer to the saved_message.
        * logmsg.c (do_verify): Update do_verify to expect a pointer
        to the saved message. The file should be re-read after the
        user-defined verification script has been run. The user-defined
        verification script is allowed to modify the message.

Index:src/commit.c
--- cvs-1.11/src/commit.c       Wed Jul 26 12:29:01 2000
+++ cvs-1.11.pch/src/commit.c   Sun Nov 19 23:23:55 2000
@@ -498,7 +498,7 @@
        /* Run the user-defined script to verify/check information in
         *the log message
         */
-       do_verify (saved_message, (char *)NULL);
+       do_verify (&saved_message, (char *)NULL);       
 
        /* We always send some sort of message, even if empty.  */
        /* FIXME: is that true?  There seems to be some code in do_editor
@@ -1240,7 +1240,7 @@
        if (use_editor)
            do_editor (finfo->update_dir, &saved_message,
                       finfo->repository, ulist);
-       do_verify (saved_message, finfo->repository);
+       do_verify (&saved_message, finfo->repository);  
     }
 
     p = findnode (cilist, finfo->file);
@@ -1556,7 +1556,7 @@
     got_message = 1;
     if (use_editor)
        do_editor (update_dir, &saved_message, real_repos, ulist);
-    do_verify (saved_message, real_repos);
+    do_verify (&saved_message, real_repos);
     free (real_repos);
     return (R_PROCESS);
 }
Index:src/cvs.h
--- cvs-1.11/src/cvs.h  Sat Jul  8 12:57:21 2000
+++ cvs-1.11.pch/src/cvs.h      Sun Nov 19 23:23:55 2000
@@ -577,7 +577,7 @@
 void do_editor PROTO((char *dir, char **messagep,
                      char *repository, List * changes));
 
-void do_verify PROTO((char *message, char *repository));
+void do_verify PROTO((char **messagep, char *repository));
 
 typedef        int (*CALLBACKPROC)     PROTO((int argc, char *argv[], char 
*where,
        char *mwhere, char *mfile, int shorten, int local_specified,
Index:src/import.c
--- cvs-1.11/src/import.c       Tue Jul 11 13:32:02 2000
+++ cvs-1.11.pch/src/import.c   Sun Nov 19 23:23:55 2000
@@ -220,7 +220,7 @@
        do_editor ((char *) NULL, &message, repository,
                   (List *) NULL);
     }
-    do_verify (message, repository);
+    do_verify (&message, repository);
     msglen = message == NULL ? 0 : strlen (message);
     if (msglen == 0 || message[msglen - 1] != '\n')
     {
Index:src/logmsg.c
--- cvs-1.11/src/logmsg.c       Wed Mar  1 08:33:39 2000
+++ cvs-1.11.pch/src/logmsg.c   Sun Nov 19 23:23:55 2000
@@ -387,14 +387,20 @@
    independant of the running of an editor for getting a message.
  */
 void
-do_verify (message, repository)
-    char *message;
+do_verify (messagep, repository)
+    char **messagep;
     char *repository;
 {
     FILE *fp;
     char *fname;
     int retcode = 0;
 
+    char *line;
+    int line_length;
+    size_t line_chars_allocated;
+    char *p;
+    struct stat stbuf;
+
 #ifdef CLIENT_SUPPORT
     if (client_active)
        /* The verification will happen on the server.  */
@@ -408,7 +414,7 @@
 
     /* If there's no message, then we have nothing to verify.  Can this
        case happen?  And if so why would we print a message?  */
-    if (message == NULL)
+    if (*messagep == NULL)
     {
        cvs_output ("No message to verify\n", 0);
        return;
@@ -424,9 +430,9 @@
        error (1, errno, "cannot create temporary file %s", fname);
     else
     {
-       fprintf (fp, "%s", message);
-       if ((message)[0] == '\0' ||
-           (message)[strlen (message) - 1] != '\n')
+       fprintf (fp, "%s", *messagep);
+       if ((*messagep)[0] == '\0' ||
+           (*messagep)[strlen (*messagep) - 1] != '\n')
            (void) fprintf (fp, "%s", "\n");
        if (fclose (fp) == EOF)
            error (1, errno, "%s", fname);
@@ -455,6 +461,55 @@
                       "Message verification failed");
            }
        }
+
+       /* put the entire message back into the *messagep variable */
+
+       fp = open_file (fname, "r");
+       if (fp == NULL)
+       {
+           error (1, errno, "cannot open temporary file %s", fname);
+           return;
+       }
+
+       if (*messagep)
+           free (*messagep);
+
+       if ( CVS_STAT (fname, &stbuf) != 0)
+               error (1, errno, "cannot find size of temp file %s", fname);
+
+       if (stbuf.st_size == 0)
+           *messagep = NULL;
+       else
+       {
+           /* On NT, we might read less than st_size bytes, but we won't
+              read more.  So this works.  */
+           *messagep = (char *) xmalloc (stbuf.st_size + 1);
+           *messagep[0] = '\0';
+       }
+
+       line = NULL;
+       line_chars_allocated = 0;
+
+       if (*messagep)
+       {
+           p = *messagep;
+           while (1)
+           {
+               line_length = getline (&line, &line_chars_allocated, fp);
+               if (line_length == -1)
+               {
+                   if (ferror (fp))
+                       error (0, errno, "warning: cannot read %s", fname);
+                   break;
+               }
+               if (strncmp (line, CVSEDITPREFIX, CVSEDITPREFIXLEN) == 0)
+                   continue;
+               (void) strcpy (p, line);
+               p += line_length;
+           }
+       }
+       if (fclose (fp) < 0)
+           error (0, errno, "warning: cannot close %s", fname);
 
        /* Delete the temp file  */
 

In case this e-mail gets mangled, a uuencoded copy of the patch
follows (without the src/CommitLog addition).

begin 644 cvs-1.11.patch.gz
M'XL(",_1&#H``V1I9F9S`(57>W/:1A#_&WV*K3N-P0);PL:.26GL.F3&+;$]
MAK2=23*,+)U`$R%I3A*4)O[NW;V')$`FC,="M\_;QV\7+_!]Z/`<W&7:L8]M
M^R3E[HD;+Q9!=NP6I\>).]^@&)U.IUZF\3?SX(\\A.XYV-U^][)OV="U+,LP
M3?-EA8UQ'L%=O`3[$KJG??SK]:38U15TSBY?MR_`E(^K*P,:)T?PB!+9G$&>
M,M[QF!]$:#EU>9!DD,6P9#SPUR?NG+E?(8C\F"^<+(@C_([R<$2B83R#!4M3
M9\;$V8G1:7CQ5(I",W66S)LJAC8TW;G#X:AU]W$T:KTQS"KKJ[V\``T#I-=_
M,W#"E;-.(641^ALO&/[C&<0^%-)LR=!/'address@hidden;'0(X)X?>W_WP8]B%(\>(.
MWI+G["W`9,XX*F%LD=+%GYC4ZL8>P\L">LF\((NY"*7=/;,address@hidden
MQ=:B4."GD(.F3_'K_)8GGI.QJ1?P-FQ=&&6$$'X4,V=)G)address@hidden&*09AFQ?
M='?$?A3B&@'`(-/address@hidden)IN0'X4DGX0,C0BHM+KG8NHR"=%A3ZS
M.-/V4)']1I[NAJL2JCTQ`LZ<<"K\K81$A?J%J)0B%(XMWI?UMY2K/F=X[]US
MSK*<1]!\G#X\WM\,QV,B/!M>/1PLT^-Y3>O2<0T0T'%CC.5)*`"O"05Z%_WN
M7A20,address@hidden'=Q00F2#\K/,@Z\2HWB/2;W3=5V(OKRZY&*3E(I44FI%N@(DP%'
M1(AF+&U1-(R.MJ#"O6&AB/FV+I(U]TF6#M7*8N%FZX0AGC6"*(/FT<WU:/3[
M]<V?E*A60ZDBDL-GKM:!WY>?ONBW%0$"W5?Y*M\5<4%EWP;2D,X1>address@hidden
MQ2I)$^8&?L"address@hidden"P2%*J;#9JR6Q*:TICD3%2%;8-]VC_M]JWNGJHHQ/86
M1K<K\$P^!)Q5NE'#,!`.8T-66J5(OJJ+IJP!R:K[Y'FG/VLTU'5F/9O0N4AG
M(<+[``ID&0B;\!8LZ$.:<2)K0ZT*Z&C)`3)^_Z[E/ZGC#MA?X*<!''Z.#EM2
MZ-L+2<2YAT)U2=24W21JBACP'S"J8(/UNG^*>;S<D\1";&\23U]?M.TS,.G9
MM33^(G"S!*>D$XGQ2!.;YU$41#-Z=2)0:<;9#C.6941P=%B.#3DWJ1>address@hidden
M*-.\T=J8U%VA9%/*+*6*ME;YVNYM//XF*>]O1T,X\C<9_<A9,)UJO"X"M)C?
MF&K"A(JA$/<<57"B;?%UBNF?97-UF@;_L:address@hidden)J[HQY;ZJ*$LV/:X2+
M8)`Y].\I]_'<@)\#'S$(;D:WP[O)=/SQX>'^<5*6HAL&+,JFCIL%2]:2VPGN
M(7+K"ERY::V",(2YDV`.(9;+&NYJR")7&K'967*SL\]4]TH3J.U6))RSPQ2B
MN%R-\`P5,U2[9$C(YI3T8MU#Q3<address@hidden>((UA-5_#
M*LY#C]0E7$"address@hidden&F^S4U7BB5*DO:2ISD/T7:;3.,^2'&'\X*ZX0^GM
address@hidden>$,.9+F,G'7/VI<8DU,+'P+1&.>$9C9NAIQ'<1L.7"?"RX.+HSU#
address@hidden('"'7U+4*RI*HP<+4Z8=ZS1\<5OTWL=Z/A#<)=ITQ#I8P,\GZPM=
M[?"address@hidden<PZ6T7,Q(8GK)5'6_9,::]"UQ;+HVWDDR+4]RVH
M,7^`81<Q)\N^&\98'DAND=GA_7NM8#?F&V$5B>KUVN>8J'.[C6`F,J67X(,/
M*MD;#>$[F!Y/6E=[:N,9N\VD]J$ZH1;address@hidden(WR]8-$0LZVWI\,!Y
address@hidden,1;Y5-1`4SB*7O.#(LQ^I4K-QC<5W!>+BY3M+2TIKTO75%?9
M:(N68I*+Z$;F%2O<_#6>CB?7D\+E5P*%6I11B^1?+G]:[07>B?&`GM8YJ>P(
MI<=I-A7\`Z6;address@hidden,\]CJ])F[!B$<SFA-".!R%*TF^Q"+3B
MIW7&<+U_PF0BZRJ.#C.E0X0*918Q9XA3XUC`%++PKZD$Q%UWBOWEWX4`\>UK
MF&`7>2CD1`N)#BJ30M.@<KVZX2!G36T&=1C(I<address@hidden>KN:@W6X>3F!N5L80R
M.)R%`\U7],`,U]G'E$E$$/8W%`SP%YJH!*%;address@hidden'7B576R<KAM"[T
M016,2,!6#0M]3TCY*MZ>M0<(-)&+)=64/F.9#M_=3AX>address@hidden
M]+DQ=G&4,Z%281$J=!/<)1")2*4TGH`YV!KB"AI$ZG9`ZM>R;G]\72FW.0[D
8K'['0D:#8\XJ?2/V)</X'address@hidden@``
`
end