cvs-cvs
[Top][All Lists]
Advanced

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

[Cvs-cvs] ccvs/src ChangeLog commit.c sanity.sh


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/src ChangeLog commit.c sanity.sh
Date: Tue, 12 Sep 2006 20:29:30 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/09/12 20:29:30

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

Log message:
        * commit.c (precommit_list_to_args_proc, precommit_proc): Output tag
        for commitinfo line when requested.
        * sanity.sh (info): Add tests for this.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3495&r2=1.3496
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.268&r2=1.269
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1169&r2=1.1170

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3495
retrieving revision 1.3496
diff -u -b -r1.3495 -r1.3496
--- ChangeLog   7 Sep 2006 19:45:06 -0000       1.3495
+++ ChangeLog   12 Sep 2006 20:29:29 -0000      1.3496
@@ -1,3 +1,9 @@
+2006-09-12  Derek Price  <address@hidden>
+
+       * commit.c (precommit_list_to_args_proc, precommit_proc): Output tag
+       for commitinfo line when requested.
+       * sanity.sh (info): Add tests for this.
+
 2006-09-07  Derek Price  <address@hidden>
 
        [bug #17560]

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -b -r1.268 -r1.269
--- commit.c    31 May 2006 16:03:02 -0000      1.268
+++ commit.c    12 Sep 2006 20:29:30 -0000      1.269
@@ -1222,6 +1222,10 @@
                    arg = p->key;
                }
                break;
+           case 'T':
+               li = p->data;
+               arg = li->tag ? li->tag : "";
+               break;
             case 'a':
                 li = p->data;
                 switch (li->type)
@@ -1322,7 +1326,7 @@
 #endif /* SERVER_SUPPORT */
                              "p", "s", srepos,
                              "r", "s", current_parsed_root->directory,
-                             "sa", ",", ulist, precommit_list_to_args_proc,
+                             "saT", ",", ulist, precommit_list_to_args_proc,
                              (void *) NULL,
                              (char *) NULL);
 

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1169
retrieving revision 1.1170
diff -u -b -r1.1169 -r1.1170
--- sanity.sh   29 Aug 2006 11:02:08 -0000      1.1169
+++ sanity.sh   12 Sep 2006 20:29:30 -0000      1.1170
@@ -19846,12 +19846,22 @@
           echo "ALL echo %s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
           echo "ALL echo %{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
           echo "second-dir echo %sux >>$TESTDIR/testlog2; cat >/dev/null" >> 
loginfo
+          echo "ALL $TESTDIR/commitlog %r %p %{sTa}" >> commitinfo
          dotest info-setup-newfmt-2 "$testcvs -q -s ZEE=garbage ci -m 
nuke-admin-for-info-newfmt" \
-"${CVSROOT_DIRNAME}/CVSROOT/loginfo,v  <--  loginfo
+"$CVSROOT_DIRNAME/CVSROOT/commitinfo,v  <--  commitinfo
+new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
+$CVSROOT_DIRNAME/CVSROOT/loginfo,v  <--  loginfo
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
-${SPROG} commit: Rebuilding administrative file database"
+$SPROG commit: Rebuilding administrative file database"
          cd ..
 
+         cat >$TESTDIR/commitlog <<EOF
+for arg in \${1+"\$@"}; do
+  echo \$arg >>$TESTDIR/testlog3
+done
+EOF
+         chmod a+x $TESTDIR/commitlog
+
          # delete the logs now so the results look more like the last tests
          # (they won't include the config file update)
          rm ${TESTDIR}/testlog ${TESTDIR}/testlog2
@@ -19892,6 +19902,10 @@
 "$TESTDIR/cvsroot/fourth-dir/file1,v  <--  file1
 new revision: 1.5; previous revision: 1\.4
 $SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}"
+          dotest info-newfmt-5e "$testcvs -q ci -fmtag -r2" \
+"$TESTDIR/cvsroot/fourth-dir/file1,v  <--  file1
+new revision: [0-9.]*; previous revision: [0-9.]*
+$SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}"
 
          cd ..
          dotest info-newfmt-6 "cat $TESTDIR/testlog" \
@@ -19926,7 +19940,44 @@
 
 1\.5
 file1
-1\.4AX'
+1\.4AX
+fourth-dir file1 modified 2 NONE 2\.1
+modified
+2
+2\.1
+file1
+NONEAX'
+         dotest info-newfmt-8 "cat $TESTDIR/testlog3" \
+"$CVSROOT_DIRNAME
+fourth-dir
+file1
+
+added
+$CVSROOT_DIRNAME
+fourth-dir
+file1
+
+modified
+$CVSROOT_DIRNAME
+fourth-dir
+file1
+
+modified
+$CVSROOT_DIRNAME
+fourth-dir
+file1
+
+removed
+$CVSROOT_DIRNAME
+fourth-dir
+file1
+
+added
+$CVSROOT_DIRNAME
+fourth-dir
+file1
+2
+modified"
 
          # clean up after newfmt tests
          cd CVSROOT




reply via email to

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