[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ./ChangeLog ./NEWS doc/ChangeLog doc/cvs.t...
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs ./ChangeLog ./NEWS doc/ChangeLog doc/cvs.t... |
|
Date: |
Tue, 16 May 2006 16:30:31 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Mark D. Baushke <address@hidden> 06/05/16 16:30:31
Modified files:
. : ChangeLog NEWS
doc : ChangeLog cvs.texinfo
src : ChangeLog commit.c logmsg.c sanity.sh
Log message:
* NEWS: Note new %a format character and new behavior of %{vV}
when UseNewInfoFmtStrings is enabled.
(CVS patch #5099 from Michael K. Sanders <address@hidden>.)
* doc/cvs.texinfo (commitinfo, loginfo): Document new %a format
character.
(CVS patch #5099 from Michael K. Sanders <address@hidden>.)
* src/commit.c (check_fileproc): Set rev_old to "0" instead of NULL
when UseNewInfoFmtStrings.
(commit_fileproc): Set rev_new for removed files when
UseNewInfoFmtStrings.
(precommit_list_to_args_proc): Add %a format for file action
(status) to commitinfo.
* src/logmsg.c (logmsg_list_to_args_proc): Add %a format for file
action (status) to loginfo.
* src/sanity.sh (info): Update and expand tests for new %a format and
real version when UseNewInfoFmtStrings.
(CVS patch #5099 from Michael K. Sanders <address@hidden>.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1301&tr2=1.1302&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/NEWS.diff?tr1=1.353&tr2=1.354&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.956&tr2=1.957&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?tr1=1.682&tr2=1.683&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3408&tr2=1.3409&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/commit.c.diff?tr1=1.262&tr2=1.263&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/logmsg.c.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1137&tr2=1.1138&r1=text&r2=text
Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1301 ccvs/ChangeLog:1.1302
--- ccvs/ChangeLog:1.1301 Tue May 16 01:28:16 2006
+++ ccvs/ChangeLog Tue May 16 16:30:30 2006
@@ -1,3 +1,9 @@
+2006-05-16 Mark D. Baushke <address@hidden>
+
+ * NEWS: Note new %a format character and new behavior of %{vV}
+ when UseNewInfoFmtStrings is enabled.
+ (CVS patch #5099 from Michael K. Sanders <address@hidden>.)
+
2006-05-16 Derek Price <address@hidden>
* configure.in: Always set CVS_ADMIN_GROUP and set HAVE_CVS_ADMIN_GROUP
Index: ccvs/NEWS
diff -u ccvs/NEWS:1.353 ccvs/NEWS:1.354
--- ccvs/NEWS:1.353 Thu Apr 27 18:42:25 2006
+++ ccvs/NEWS Tue May 16 16:30:30 2006
@@ -15,6 +15,12 @@
* New admin options (--execute/--no-execute) have been added to modify
the execute bits of files in the repository. (CVS patch #4446.)
+* A new %a format character has been added to the commitinfo and loginfo
+ 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 added and removed files.
+
BUG FIXES
* The GSSAPI server should now build under HP-UX.
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.956 ccvs/doc/ChangeLog:1.957
--- ccvs/doc/ChangeLog:1.956 Tue May 16 01:30:00 2006
+++ ccvs/doc/ChangeLog Tue May 16 16:30:30 2006
@@ -1,3 +1,9 @@
+2006-05-16 Mark D. Baushke <address@hidden>
+
+ * cvs.texinfo (commitinfo, loginfo): Document new %a format
+ character.
+ (CVS patch #5099 from Michael K. Sanders <address@hidden>.)
+
2006-05-16 Derek Price <address@hidden>
* cvs.texinfo (Getting Notified): Note new watch remove -e/-u options.
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.682 ccvs/doc/cvs.texinfo:1.683
--- ccvs/doc/cvs.texinfo:1.682 Tue May 16 01:30:00 2006
+++ ccvs/doc/cvs.texinfo Tue May 16 16:30:30 2006
@@ -13740,8 +13740,14 @@
@file{commitinfo} supports:
@table @t
address@hidden address@hidden@}
-a list of the names of files to be committed
address@hidden address@hidden@}
+File attributes, where:
address@hidden @t
address@hidden %s
+file name
address@hidden %a
+file action (status)
address@hidden table
@end table
@cindex commitinfo (admin file), updating legacy repositories
@@ -14010,11 +14016,13 @@
@file{loginfo} supports:
@table @t
address@hidden address@hidden@}
address@hidden address@hidden@}
File attributes, where:
@table @t
@item %s
file name
address@hidden %a
+file action (status)
@item %T
tag name of destination, or the empty string when there is no associated
tag name (this usually means the trunk)
@@ -14026,7 +14034,7 @@
@end table
For example, some valid format strings are @samp{%%},
address@hidden, @address@hidden@}}, and @address@hidden@}}.
address@hidden, @address@hidden@}}, and @address@hidden@}}.
@cindex loginfo (admin file), updating legacy repositories
@cindex compatibility notes, loginfo admin file
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3408 ccvs/src/ChangeLog:1.3409
--- ccvs/src/ChangeLog:1.3408 Tue May 16 03:23:26 2006
+++ ccvs/src/ChangeLog Tue May 16 16:30:30 2006
@@ -1,3 +1,17 @@
+2006-05-16 Mark D. Baushke <address@hidden>
+
+ * commit.c (check_fileproc): Set rev_old to "0" instead of NULL
+ when UseNewInfoFmtStrings.
+ (commit_fileproc): Set rev_new for removed files when
+ UseNewInfoFmtStrings.
+ (precommit_list_to_args_proc): Add %a format for file action
+ (status) to commitinfo.
+ * logmsg.c (logmsg_list_to_args_proc): Add %a format for file
+ action (status) to loginfo.
+ * sanity.sh (info): Update and expand tests for new %a format and
+ real version when UseNewInfoFmtStrings.
+ (CVS patch #5099 from Michael K. Sanders <address@hidden>.)
+
2006-05-16 Derek Price <address@hidden>
* main.c: Update copyright for 2006.
Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.262 ccvs/src/commit.c:1.263
--- ccvs/src/commit.c:1.262 Fri May 12 17:12:46 2006
+++ ccvs/src/commit.c Tue May 16 16:30:30 2006
@@ -1092,6 +1092,8 @@
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);
@@ -1222,6 +1224,24 @@
arg = p->key;
}
break;
+ case 'a':
+ li = p->data;
+ switch (li->type)
+ {
+ case T_ADDED:
+ arg = "added";
+ break;
+ case T_MODIFIED:
+ arg = "modified";
+ break;
+ case T_REMOVED:
+ arg = "removed";
+ break;
+ case T_TITLE:
+ arg = "imported";
+ break;
+ }
+ break;
default:
error (1, 0,
"Unknown format character or not a list attribute: %c",
@@ -1300,7 +1320,7 @@
#endif /* SERVER_SUPPORT */
"p", "s", srepos,
"r", "s", current_parsed_root->directory,
- "s", ",", ulist, precommit_list_to_args_proc,
+ "sa", ",", ulist, precommit_list_to_args_proc,
(void *) NULL,
(char *) NULL);
@@ -1558,9 +1578,11 @@
will return the version number of a file even after it has
been removed from the archive, which is not the behavior we
want for our commitlog messages; we want the old version
- number and then "NONE." */
-
- if (ci->status != T_REMOVED)
+ number and then "NONE, unless UseNewInfoFmtStrings has
+ been specified in the config. Expose the real version in that
+ case and allow the trigger scripts to decide how to use it. */
+
+ if (ci->status != T_REMOVED || config->UseNewInfoFmtStrings)
{
p = findnode (ulist, finfo->file);
if (p)
Index: ccvs/src/logmsg.c
diff -u ccvs/src/logmsg.c:1.103 ccvs/src/logmsg.c:1.104
--- ccvs/src/logmsg.c:1.103 Fri May 12 17:12:46 2006
+++ ccvs/src/logmsg.c Tue May 16 16:30:30 2006
@@ -644,6 +644,24 @@
case 's':
arg = p->key;
break;
+ case 'a':
+ li = p->data;
+ switch (li->type)
+ {
+ case T_ADDED:
+ arg = "added";
+ break;
+ case T_MODIFIED:
+ arg = "modified";
+ break;
+ case T_REMOVED:
+ arg = "removed";
+ break;
+ case T_TITLE:
+ arg = "imported";
+ break;
+ }
+ break;
case 'T':
li = p->data;
arg = li->tag ? li->tag : "";
@@ -768,6 +786,7 @@
`}' as separators. The format characters are:
s = file name
+ a = file action (status)
V = old version number (pre-checkin)
v = new version number (post-checkin)
@@ -800,7 +819,8 @@
/* %c = cvs_cmd_name
* %p = shortrepos
* %r = repository
- * %{sVv} = file name, old revision (precommit), new revision (postcommit)
+ * %{saVv} = file name, file action (status)
+ old revision (precommit), new revision (postcommit)
*/
/*
* Cast any NULL arguments as appropriate pointers as this is an
@@ -818,7 +838,7 @@
#endif /* SERVER_SUPPORT */
"p", "s", srepos,
"r", "s", current_parsed_root->directory,
- "sTVv", ",", changes,
+ "saTVv", ",", changes,
logmsg_list_to_args_proc, (void *) NULL,
(char *) NULL);
if (!cmdline || !strlen (cmdline))
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1137 ccvs/src/sanity.sh:1.1138
--- ccvs/src/sanity.sh:1.1137 Tue May 16 01:30:34 2006
+++ ccvs/src/sanity.sh Tue May 16 16:30:30 2006
@@ -3091,7 +3091,7 @@
PrimaryServer=$PRIMARY_CVSROOT
EOF
cat >>loginfo <<EOF
-ALL $TESTDIR/sync-secondary loginfo %c %p %{sVv}
+ALL $TESTDIR/sync-secondary loginfo %c %p %{saVv}
EOF
cat >>postadmin <<EOF
ALL $TESTDIR/sync-secondary postadmin %c %p
@@ -19067,7 +19067,8 @@
echo "ALL echo %{} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %x >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo % >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
- echo "ALL echo %{sxVv} >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
+ echo "ALL echo %{saxVv} >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
+ echo "ALL echo %{a} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %s %s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
@@ -19151,6 +19152,33 @@
and set UseNewInfoFmtStrings=yes in CVSROOT/config\. After that, convert
individual command lines and scripts to handle the new format at your
leisure\."
+ rm file1
+ dotest info-8 "${testcvs} -q rm -f file1" \
+"${SPROG} remove: use .${SPROG} commit. to remove this file permanently"
+ dotest_sort info-8a "${testcvs} -q ci -m remove-it" \
+"$TESTDIR/cvsroot/first-dir/file1,v <-- file1
+all info files after each .%. which doesn.t represent a literal percent)
+and set UseNewInfoFmtStrings=yes in CVSROOT/config\. After that, convert
+compatibility with the new info file format strings (add a temporary .1. in
+$SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}
+$SPROG commit: warning: Set to use deprecated info format strings\. Establish
+individual command lines and scripts to handle the new format at your
+leisure\.
+new revision: delete; previous revision: 1\.3"
+ echo "resurrected file1" >file1
+ dotest info-8b "$testcvs add file1" \
+"$SPROG add: Re-adding file \`file1' after dead revision 1\.4\.
+$SPROG add: use \`$SPROG commit' to add this file permanently"
+ dotest_sort info-8c "${testcvs} -q ci -m add-it" \
+"$TESTDIR/cvsroot/first-dir/file1,v <-- file1
+all info files after each .%. which doesn.t represent a literal percent)
+and set UseNewInfoFmtStrings=yes in CVSROOT/config\. After that, convert
+compatibility with the new info file format strings (add a temporary .1. in
+$SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}
+$SPROG commit: warning: Set to use deprecated info format strings\. Establish
+individual command lines and scripts to handle the new format at your
+leisure\.
+new revision: 1.5; previous revision: 1\.4"
cd ..
dotest info-9 "cat $TESTDIR/testlog" \
@@ -19159,7 +19187,8 @@
'first-dir
first-dir
first-dir
-first-dir file1,,NONE,1.1
+first-dir file1,added,,NONE,1.1
+first-dir added
first-dir 1.1
first-dir file1 %s
first-dir NONEAX
@@ -19167,7 +19196,8 @@
first-dir
first-dir
first-dir
-first-dir file1,,1.1,1.2
+first-dir file1,modified,,1.1,1.2
+first-dir modified
first-dir 1.2
first-dir file1 %s
first-dir 1.1AX
@@ -19175,10 +19205,29 @@
first-dir
first-dir
first-dir
-first-dir file1,,1.2,1.3
+first-dir file1,modified,,1.2,1.3
+first-dir modified
first-dir 1.3
first-dir file1 %s
first-dir 1.2AX
+first-dir file1ux
+first-dir
+first-dir
+first-dir
+first-dir file1,removed,,1.3,NONE
+first-dir removed
+first-dir NONE
+first-dir file1 %s
+first-dir 1.3AX
+first-dir file1ux
+first-dir
+first-dir
+first-dir
+first-dir file1,added,,1.4,1.5
+first-dir added
+first-dir 1.5
+first-dir file1 %s
+first-dir 1.4AX
first-dir file1ux'
# and make sure adding a '1' in the format strings really does ensure
@@ -19196,7 +19245,8 @@
echo "ALL echo %1{} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %1x >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %1 >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
- echo "ALL echo %1{sxVv} >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
+ echo "ALL echo %1{saxVv} >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
+ echo "ALL echo %1{a} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %1{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %1s %%s >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
echo "ALL echo %1{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >>
loginfo
@@ -19248,6 +19298,8 @@
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\.
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\."
echo line0 >>file1
dotest info-intfmt-6c "${testcvs} -q -sOTHER=foo ci -m mod-it" \
@@ -19269,6 +19321,8 @@
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\.
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\."
echo line1 >>file1
dotest info-intfmt-7 "${testcvs} -q -s OTHER=value -s ZEE=z ci -m
mod-it" \
@@ -19289,6 +19343,59 @@
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\.
${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\."
+ rm file1
+ dotest info-intfmt-8 "${testcvs} -q rm -f file1" \
+"${SPROG} remove: use .${SPROG} commit. to remove this file permanently"
+ dotest info-intfmt-8a "${testcvs} -q ci -m remove-it" \
+"$TESTDIR/cvsroot/third-dir/file1,v <-- file1
+new revision: delete; previous revision: 1\.3
+${SPROG} commit: loginfo:[0-9]*: no such user variable \${=ZEE}
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\."
+ echo "resurrected file1" >file1
+ dotest info-8b "$testcvs add file1" \
+"$SPROG add: Re-adding file \`file1' after dead revision 1\.4\.
+$SPROG add: use \`$SPROG commit' to add this file permanently"
+ dotest info-8c "${testcvs} -q ci -m add-it" \
+"$TESTDIR/cvsroot/third-dir/file1,v <-- file1
+new revision: 1.5; previous revision: 1\.4
+${SPROG} commit: loginfo:[0-9]*: no such user variable \${=ZEE}
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
+the new argument format and remove '1's from your info file format strings\.
+${SPROG} commit: Using deprecated info format strings\. Convert your scripts
to use
the new argument format and remove '1's from your info file format strings\."
cd ..
@@ -19297,15 +19404,17 @@
'third-dir
third-dir
third-dir
-third-dir file1,,NONE,1.1
+third-dir file1,added,,0,1.1
+third-dir added
third-dir 1.1
third-dir file1 %s
-third-dir NONEAX
+third-dir 0AX
third-dir file1ux
third-dir
third-dir
third-dir
-third-dir file1,,1.1,1.2
+third-dir file1,modified,,1.1,1.2
+third-dir modified
third-dir 1.2
third-dir file1 %s
third-dir 1.1AX
@@ -19313,10 +19422,29 @@
third-dir
third-dir
third-dir
-third-dir file1,,1.2,1.3
+third-dir file1,modified,,1.2,1.3
+third-dir modified
third-dir 1.3
third-dir file1 %s
third-dir 1.2AX
+third-dir file1ux
+third-dir
+third-dir
+third-dir
+third-dir file1,removed,,1.3,1.4
+third-dir removed
+third-dir 1.4
+third-dir file1 %s
+third-dir 1.3AX
+third-dir file1ux
+third-dir
+third-dir
+third-dir
+third-dir file1,added,,1.4,1.5
+third-dir added
+third-dir 1.5
+third-dir file1 %s
+third-dir 1.4AX
third-dir file1ux'
rm ${TESTDIR}/testlog ${TESTDIR}/testlog2
@@ -19326,7 +19454,8 @@
dotest info-setup-newfmt-1 "$testcvs -q up -prinfo-start loginfo
>loginfo"
echo "ALL sh -c \"echo
x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$CVSROOT= >>$TESTDIR/testlog; cat
>/dev/null\" %{sVv}" >> loginfo
# The following cases test the format string substitution
- echo "ALL echo %p \"%{sTVv}\" >>$TESTDIR/testlog2; cat >/dev/null"
>> loginfo
+ echo "ALL echo %p \"%{saTVv}\" >>$TESTDIR/testlog2; cat >/dev/null"
>> loginfo
+ echo "ALL echo %a >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %T >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
echo "ALL echo %s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
@@ -19363,26 +19492,56 @@
dotest info-newfmt-5 "${testcvs} -q -s OTHER=value -s ZEE=z ci -m
mod-it" \
"${TESTDIR}/cvsroot/fourth-dir/file1,v <-- file1
new revision: 1\.3; previous revision: 1\.2"
+ rm file1
+ dotest info-newfmt-5a "${testcvs} -q rm -f file1" \
+"${SPROG} remove: use .${SPROG} commit. to remove this file permanently"
+ dotest info-newfmt-5b "${testcvs} -q ci -m remove-it" \
+"$TESTDIR/cvsroot/fourth-dir/file1,v <-- file1
+new revision: delete; previous revision: 1\.3
+$SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}"
+ echo "resurrected file1" >file1
+ dotest info-newfmt-5c "$testcvs add file1" \
+"$SPROG add: Re-adding file \`file1' after dead revision 1\.4\.
+$SPROG add: use \`$SPROG commit' to add this file permanently"
+ dotest info-newfmt-5d "${testcvs} -q ci -m add-it" \
+"$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}"
cd ..
dotest info-newfmt-6 "cat $TESTDIR/testlog" \
"xenv-valueyz=${username}=${TESTDIR}/cvsroot="
dotest info-newfmt-7 "cat $TESTDIR/testlog2" \
-'fourth-dir file1 NONE 1\.1
+'fourth-dir file1 added 0 1\.1
+added
1\.1
file1
-NONEAX
-fourth-dir file1 1\.1 1\.2
+0AX
+fourth-dir file1 modified 1\.1 1\.2
+modified
1\.2
file1
1\.1AX
-fourth-dir file1 1\.2 1\.3
+fourth-dir file1 modified 1\.2 1\.3
+modified
1\.3
file1
-1\.2AX'
+1\.2AX
+fourth-dir file1 removed 1\.3 1\.4
+removed
+
+1\.4
+file1
+1\.3AX
+fourth-dir file1 added 1\.4 1\.5
+added
+
+1\.5
+file1
+1\.4AX'
# clean up after newfmt tests
cd CVSROOT
@@ -19444,7 +19603,7 @@
cd ../first-dir
echo line2 >>file1
dotest_fail info-v2 "${testcvs} -q ci -m bogus" \
-"vscript $tempname file1 1\.3
+"vscript $tempname file1 1\.5
No BugId found\.
${SPROG} \[commit aborted\]: Message verification failed"
@@ -19453,9 +19612,9 @@
and many more lines after it
EOF
dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $tempname file1 1\.3
+"vscript $tempname file1 1\.5
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1
-new revision: 1\.4; previous revision: 1\.3"
+new revision: 1\.6; previous revision: 1\.5"
rm ${TESTDIR}/comment.tmp
cd ..
@@ -19539,10 +19698,10 @@
See what happens next.
EOF
dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $tempname file1 1\.4
+"vscript $tempname file1 1\.6
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1
-new revision: 1\.5; previous revision: 1\.4"
- dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" "
+new revision: 1\.7; previous revision: 1\.6"
+ dotest info-reread-3 "${testcvs} -q log -N -r1.7 file1" "
.*
BugId: new
See what happens next.
@@ -19565,10 +19724,10 @@
See what happens next with stat.
EOF
dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $tempname file1 1\.5
+"vscript $tempname file1 1\.7
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1
-new revision: 1\.6; previous revision: 1\.5"
- dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" "
+new revision: 1\.8; previous revision: 1\.7"
+ dotest info-reread-6 "${testcvs} -q log -N -r1.8 file1" "
.*
BugId: new
See what happens next with stat.
@@ -19591,10 +19750,10 @@
See what happens next.
EOF
dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $tempname file1 1\.6
+"vscript $tempname file1 1\.8
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1
-new revision: 1\.7; previous revision: 1\.6"
- dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" "
+new revision: 1\.9; previous revision: 1\.8"
+ dotest info-reread-6 "${testcvs} -q log -N -r1.9 file1" "
.*
BugId: new
See what happens next.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ./ChangeLog ./NEWS doc/ChangeLog doc/cvs.t...,
Mark D. Baushke <=