464 |
|
|
465 |
# Regexp to match the name of a temporary file (from cvs_temp_name). |
# Regexp to match the name of a temporary file (from cvs_temp_name). |
466 |
# This appears in certain diff output. |
# This appears in certain diff output. |
467 |
tempname="[-a-zA-Z0-9/.%_]*" |
tempfile="[-a-zA-Z0-9.%_]*" |
468 |
|
# $tempname set after $TMPDIR, below. |
469 |
|
|
470 |
# Regexp to match a date in RFC822 format (as amended by RFC1123). |
# Regexp to match a date in RFC822 format (as amended by RFC1123). |
471 |
RFCDATE="[a-zA-Z0-9 ][a-zA-Z0-9 ]* [0-9:][0-9:]* -0000" |
RFCDATE="[a-zA-Z0-9 ][a-zA-Z0-9 ]* [0-9:][0-9:]* -0000" |
719 |
mkdir $TMPDIR |
mkdir $TMPDIR |
720 |
fi |
fi |
721 |
|
|
722 |
|
|
723 |
|
# Regexp to match the the full path to a temporary file (from cvs_temp_name). |
724 |
|
# This appears in certain diff output. |
725 |
|
tempname=$TMPDIR/$tempfile |
726 |
|
|
727 |
# Make sure various tools work the way we expect, or try to find |
# Make sure various tools work the way we expect, or try to find |
728 |
# versions that do. |
# versions that do. |
729 |
: ${AWK=awk} |
: ${AWK=awk} |
19209 |
cd ../first-dir |
cd ../first-dir |
19210 |
echo line2 >>file1 |
echo line2 >>file1 |
19211 |
dotest_fail info-v2 "${testcvs} -q ci -m bogus" \ |
dotest_fail info-v2 "${testcvs} -q ci -m bogus" \ |
19212 |
"vscript $TMPDIR/$tempname file1 1\.3 |
"vscript $tempname file1 1\.3 |
19213 |
No BugId found\. |
No BugId found\. |
19214 |
${SPROG} \[commit aborted\]: Message verification failed" |
${SPROG} \[commit aborted\]: Message verification failed" |
19215 |
|
|
19218 |
and many more lines after it |
and many more lines after it |
19219 |
EOF |
EOF |
19220 |
dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
19221 |
"vscript $TMPDIR/$tempname file1 1\.3 |
"vscript $tempname file1 1\.3 |
19222 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
19223 |
new revision: 1\.4; previous revision: 1\.3" |
new revision: 1\.4; previous revision: 1\.3" |
19224 |
rm ${TESTDIR}/comment.tmp |
rm ${TESTDIR}/comment.tmp |
19229 |
touch file2 |
touch file2 |
19230 |
dotest_fail info-v4 \ |
dotest_fail info-v4 \ |
19231 |
"${testcvs} import -m bogus first-dir/another x y" \ |
"${testcvs} import -m bogus first-dir/another x y" \ |
19232 |
"vscript $TMPDIR/$tempname - Imported sources NONE |
"vscript $tempname - Imported sources NONE |
19233 |
No BugId found\. |
No BugId found\. |
19234 |
${SPROG} \[import aborted\]: Message verification failed" |
${SPROG} \[import aborted\]: Message verification failed" |
19235 |
|
|
19236 |
# now verify that directory dependent verifymsgs work |
# now verify that directory dependent verifymsgs work |
19237 |
dotest info-v5 \ |
dotest info-v5 \ |
19238 |
"${testcvs} import -m bogus first-dir/yet-another x y" \ |
"${testcvs} import -m bogus first-dir/yet-another x y" \ |
19239 |
"vscript2 $TMPDIR/$tempname - Imported sources NONE |
"vscript2 $tempname - Imported sources NONE |
19240 |
$TESTDIR/wnt/another-dir |
$TESTDIR/wnt/another-dir |
19241 |
N first-dir/yet-another/file2 |
N first-dir/yet-another/file2 |
19242 |
|
|
19243 |
No conflicts created by this import" \ |
No conflicts created by this import" \ |
19244 |
"vscript2 $TMPDIR/$tempname - Imported sources NONE |
"vscript2 $tempname - Imported sources NONE |
19245 |
$CVSROOT_DIRNAME/first-dir/yet-another |
$CVSROOT_DIRNAME/first-dir/yet-another |
19246 |
N first-dir/yet-another/file2 |
N first-dir/yet-another/file2 |
19247 |
|
|
19260 |
if $remote; then |
if $remote; then |
19261 |
dotest_fail info-v6r \ |
dotest_fail info-v6r \ |
19262 |
"${testcvs} import -m bogus first-dir/yet-another/and-another x y" \ |
"${testcvs} import -m bogus first-dir/yet-another/and-another x y" \ |
19263 |
"vscript2 $TMPDIR/$tempname - Imported sources NONE |
"vscript2 $tempname - Imported sources NONE |
19264 |
$CVSROOT_DIRNAME/first-dir/yet-another/and-another |
$CVSROOT_DIRNAME/first-dir/yet-another/and-another |
19265 |
$SPROG \[import aborted\]: Message verification failed" |
$SPROG \[import aborted\]: Message verification failed" |
19266 |
else |
else |
19267 |
dotest info-v6 \ |
dotest info-v6 \ |
19268 |
"${testcvs} import -m bogus first-dir/yet-another/and-another x y" \ |
"${testcvs} import -m bogus first-dir/yet-another/and-another x y" \ |
19269 |
"vscript2 $TMPDIR/$tempname - Imported sources NONE |
"vscript2 $tempname - Imported sources NONE |
19270 |
$TESTDIR/wnt/another-dir |
$TESTDIR/wnt/another-dir |
19271 |
N first-dir/yet-another/and-another/file2 |
N first-dir/yet-another/and-another/file2 |
19272 |
|
|
19304 |
See what happens next. |
See what happens next. |
19305 |
EOF |
EOF |
19306 |
dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
19307 |
"vscript $TMPDIR/$tempname file1 1\.4 |
"vscript $tempname file1 1\.4 |
19308 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
19309 |
new revision: 1\.5; previous revision: 1\.4" |
new revision: 1\.5; previous revision: 1\.4" |
19310 |
dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" " |
dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" " |
19330 |
See what happens next with stat. |
See what happens next with stat. |
19331 |
EOF |
EOF |
19332 |
dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
19333 |
"vscript $TMPDIR/$tempname file1 1\.5 |
"vscript $tempname file1 1\.5 |
19334 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
19335 |
new revision: 1\.6; previous revision: 1\.5" |
new revision: 1\.6; previous revision: 1\.5" |
19336 |
dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" " |
dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" " |
19356 |
See what happens next. |
See what happens next. |
19357 |
EOF |
EOF |
19358 |
dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \ |
19359 |
"vscript $TMPDIR/$tempname file1 1\.6 |
"vscript $tempname file1 1\.6 |
19360 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
19361 |
new revision: 1\.7; previous revision: 1\.6" |
new revision: 1\.7; previous revision: 1\.6" |
19362 |
dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" " |
dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" " |
20323 |
chmod a+x $TESTDIR/config4/verify |
chmod a+x $TESTDIR/config4/verify |
20324 |
dotest config4-1 \ |
dotest config4-1 \ |
20325 |
"$testcvs -q ci -fmtest-tmpdir config" \ |
"$testcvs -q ci -fmtest-tmpdir config" \ |
20326 |
"$TESTDIR/config4/tmp/$tempname |
"$TESTDIR/config4/tmp/$tempfile |
20327 |
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config |
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config |
20328 |
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* |
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* |
20329 |
$SPROG commit: Rebuilding administrative file database" |
$SPROG commit: Rebuilding administrative file database" |