diff options
Diffstat (limited to 'contrib/cvs/src/sanity.sh')
| -rwxr-xr-x | contrib/cvs/src/sanity.sh | 1768 |
1 files changed, 1616 insertions, 152 deletions
diff --git a/contrib/cvs/src/sanity.sh b/contrib/cvs/src/sanity.sh index 1d877fe..f97e036 100755 --- a/contrib/cvs/src/sanity.sh +++ b/contrib/cvs/src/sanity.sh @@ -512,8 +512,12 @@ dotest_sort () dotest_internal "$@" } -# clean any old remnants -rm -rf ${TESTDIR} +# clean any old remnants (we need the chmod because some tests make +# directories read-only) +if test -d ${TESTDIR}; then + chmod -R a+wx ${TESTDIR} + rm -rf ${TESTDIR} +fi mkdir ${TESTDIR} cd ${TESTDIR} # This will show up in cvs history output where it prints the working @@ -549,24 +553,30 @@ RCSINIT=; export RCSINIT if test x"$*" = x; then # Basic/miscellaneous functionality - tests="basica basicb basicc basic1 deep basic2" + tests="basica basicb basicc basic1 deep basic2 commit-readonly" # Branching, tagging, removing, adding, multiple directories tests="${tests} rdiff death death2 branches branches2" - tests="${tests} rcslib multibranch import importb join join2 join3" + tests="${tests} rcslib multibranch import importb importc" + tests="${tests} join join2 join3" tests="${tests} new newb conflicts conflicts2 conflicts3" # Checking out various places (modules, checkout -d, &c) tests="${tests} modules modules2 modules3 modules4" - tests="${tests} cvsadm abspath toplevel" + tests="${tests} cvsadm emptydir abspath toplevel toplevel2" # Log messages, error messages. tests="${tests} mflag editor errmsg1 errmsg2" # Watches, binary files, history browsing, &c. tests="${tests} devcom devcom2 devcom3 watch4" + tests="${tests} unedit-without-baserev" tests="${tests} ignore binfiles binfiles2 mcopy binwrap binwrap2" - tests="${tests} binwrap3 mwrap info config" - tests="${tests} serverpatch log log2 ann crerepos rcs big modes stamps" + tests="${tests} binwrap3 mwrap info taginfo config" + tests="${tests} serverpatch log log2 ann ann-id crerepos rcs rcs2" + tests="${tests} history" + tests="${tests} big modes modes2 stamps" + # PreservePermissions stuff: permissions, symlinks et al. + tests="${tests} perms symlinks hardlinks" # More tag and branch tests, keywords. tests="${tests} sticky keyword keywordlog" - tests="${tests} head tagdate multibranch2" + tests="${tests} head tagdate multibranch2 tag8k" # "cvs admin", reserved checkouts. tests="${tests} admin reserved" # Nuts and bolts of diffing/merging (diff library, &c) @@ -888,15 +898,19 @@ done" cd .. rm -r 2 -: mkdir ${CVSROOT_DIRNAME}/first-dir dotest basicb-1 "${testcvs} -q co first-dir" '' - dotest basicb-1a "test -d CVS" '' + + # The top-level CVS directory is not created by default. + # I'm leaving basicb-1a and basicb-1b untouched, mostly, in + # case we decide that the default should be reversed... + + dotest_fail basicb-1a "test -d CVS" '' # In 1b and 1c, the first string matches if we're using absolute # paths, while the second matches if RELATIVE_REPOS is defined # (we're using relative paths). - dotest basicb-1b "cat CVS/Repository" \ +: dotest basicb-1b "cat CVS/Repository" \ "${TESTDIR}/cvsroot/\." \ "\." dotest basicb-1c "cat first-dir/CVS/Repository" \ @@ -1001,13 +1015,16 @@ U first-dir1/sdir2/sfile2' "${testcvs} -q co -d newdir -r release-1 first-dir/Emptydir first-dir/sdir2" \ 'U newdir/first-dir/Emptydir/sfile1 U newdir/first-dir/sdir2/sfile2' - dotest basicb-9a "test -d CVS" '' + + # basicb-9a and basicb-9b: see note about basicb-1a + + dotest_fail basicb-9a "test -d CVS" '' # In 9b through 9f, the first string matches if we're using # absolute paths, while the second matches if RELATIVE_REPOS # is defined (we're using relative paths). - dotest basicb-9b "cat CVS/Repository" \ +: dotest basicb-9b "cat CVS/Repository" \ "${TESTDIR}/cvsroot/\." \ "\." dotest basicb-9c "cat newdir/CVS/Repository" \ @@ -1063,33 +1080,24 @@ Checking in aa; ${TESTDIR}/cvsroot/second-dir/aa,v <-- aa initial revision: 1\.1 done" - cd ../.. - rm -r 1 + cd .. - # Let's see if we can add something to Emptydir. - dotest basicb-18 "${testcvs} -q co -d t2/t3 first-dir second-dir" \ -"U t2/t3/first-dir/Emptydir/sfile1 -U t2/t3/first-dir/sdir2/sfile2 -U t2/t3/second-dir/aa" - cd t2 - touch emptyfile - # The fact that CVS lets us add a file here is a CVS bug, right? - # I can just make this an error message (on the add and/or the - # commit) without getting flamed, right? - # Right? - # Right? - dotest basicb-19 "${testcvs} add emptyfile" \ -"${PROG} [a-z]*: scheduling file .emptyfile. for addition -${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" - dotest basicb-20 "${testcvs} -q ci -m add" \ -"RCS file: ${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v -done -Checking in emptyfile; -${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v <-- emptyfile -initial revision: 1\.1 -done" + # Try to remove all revisions in a file. + dotest_fail basicb-o1 "${testcvs} admin -o1.1 topfile" \ +"RCS file: ${TESTDIR}/cvsroot/topfile,v +deleting revision 1\.1 +${PROG} \[[a-z]* aborted\]: attempt to delete all revisions" + dotest basicb-o2 "${testcvs} -q update -d first-dir" \ +"U first-dir/Emptydir/sfile1 +U first-dir/sdir2/sfile2" + dotest_fail basicb-o3 \ +"${testcvs} admin -o1.1:1.2 first-dir/sdir2/sfile2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/sdir2/sfile2,v +deleting revision 1\.2 +deleting revision 1\.1 +${PROG} \[[a-z]* aborted\]: attempt to delete all revisions" cd .. - rm -r t2 + rm -r 1 mkdir 1; cd 1 # Note that -H is an illegal option. @@ -1105,18 +1113,6 @@ ${PROG} \[admin aborted\]: specify ${PROG} -H admin for usage information" cd .. rmdir 1 - # OK, while we have an Emptydir around, test a few obscure - # things about it. - mkdir edir; cd edir - dotest basicb-edir-1 "${testcvs} -q co -l CVSROOT" \ -"U CVSROOT${DOTSTAR}" - cd CVSROOT - dotest_fail basicb-edir-2 "test -d Emptydir" '' - # This tests the code in find_dirs which skips Emptydir. - dotest basicb-edir-3 "${testcvs} -q -n update -d -P" '' - cd ../.. - rm -r edir - if test "$keep" = yes; then echo Keeping ${TESTDIR} and exiting due to --keep exit 0 @@ -1124,7 +1120,6 @@ ${PROG} \[admin aborted\]: specify ${PROG} -H admin for usage information" rm -rf ${CVSROOT_DIRNAME}/first-dir rm -rf ${CVSROOT_DIRNAME}/second-dir - rm -rf ${CVSROOT_DIRNAME}/CVSROOT/Emptydir rm -f ${CVSROOT_DIRNAME}/topfile,v ;; @@ -1141,10 +1136,11 @@ ${PROG} \[[a-z]* aborted\]: there is no version here; run .${PROG} checkout. fir Directory ${TESTDIR}/cvsroot/second-dir added to the repository" # Old versions of CVS often didn't create this top-level CVS # directory in the first place. I think that maybe the only - # way to get avoid it currently is to let CVS create it, and - # then blow it away. But that is perfectly legal; people who - # are used to the old behavior especially may be interested. - rm -r CVS + # way to get it to work currently is to let CVS create it, + # and then blow it away (don't complain if it does not + # exist). But that is perfectly legal; people who are used + # to the old behavior especially may be interested. + rm -rf CVS dotest basicc-4 "echo *" "first-dir second-dir" dotest basicc-5 "${testcvs} update" \ "${PROG} [a-z]*: Updating first-dir @@ -2051,6 +2047,47 @@ O [0-9/]* [0-9:]* ${PLUS}0000 ${username} \[1\.1\] first-dir =first-di rm -rf ${CVSROOT_DIRNAME}/second-dir ;; + commit-readonly) + mkdir 1; cd 1 + module=x + + : > junk + dotest commit-readonly-1 "$testcvs -Q import -m . $module X Y" '' + dotest commit-readonly-2 "$testcvs -Q co $module" '' + cd $module + + file=m + + # Include an rcs keyword to be expanded. + echo '$Id''$' > $file + + dotest commit-readonly-3 "$testcvs add $file" \ +"${PROG} [a-z]*: scheduling file .$file. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest commit-readonly-4 "$testcvs -Q ci -m . $file" \ +"RCS file: ${TESTDIR}/cvsroot/$module/$file,v +done +Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +initial revision: 1\.1 +done" + + echo line2 >> $file + # Make the file read-only. + chmod a-w $file + + dotest commit-readonly-5 "$testcvs -Q ci -m . $file" \ +"Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +new revision: 1\.2; previous revision: 1\.1 +done" + + cd ../.. + rm -rf 1 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + + rdiff) # Test rdiff # XXX for now this is just the most essential test... @@ -3557,6 +3594,17 @@ two 3 [>]>>>>>> 1\.2" + # Test behavior of symlinks in the repository. + dotest rcslib-symlink-1 "ln -s file1,v ${CVSROOT_DIRNAME}/first-dir/file2,v" + dotest rcslib-symlink-2 "${testcvs} update file2" "U file2" + echo "This is a change" >> file2 + dotest rcslib-symlink-3 "${testcvs} ci -m because file2" \ +"Checking in file2; +${TESTDIR}/cvsroot/first-dir/file1,v <-- file2 +new revision: 1\.1\.2\.2; previous revision: 1\.1\.2\.1 +done" + dotest rcslib-symlink-4 "test -L ${CVSROOT_DIRNAME}/first-dir/file2,v" + cd .. if test "$keep" = yes; then @@ -3657,6 +3705,7 @@ modify-on-br1 # rdiff -- imports with keywords # import -- more tests of imports with keywords # importb -- -b option. + # importc -- bunch o' files in bunch o' directories # modules3 # mflag -- various -m messages # ignore -- import and cvsignore @@ -3787,6 +3836,7 @@ modify-on-br1 fail 106.5 fi cd .. + rm imported-f2-orig.tmp # co if ${CVS} co first-dir ; then @@ -3972,6 +4022,83 @@ add rm -rf ${CVSROOT_DIRNAME}/first-dir ${CVSROOT_DIRNAME}/second-dir ;; + importc) + # Test importing a bunch o' files in a bunch o' directories. + mkdir 1; cd 1 + mkdir adir bdir cdir + mkdir adir/sub1 adir/sub2 + mkdir adir/sub1/ssdir + mkdir bdir/subdir + touch adir/sub1/file1 adir/sub2/file2 adir/sub1/ssdir/ssfile + touch bdir/subdir/file1 + touch cdir/cfile + dotest_sort importc-1 \ +"${testcvs} import -m import-it first-dir vendor release" \ +" + +N first-dir/adir/sub1/file1 +N first-dir/adir/sub1/ssdir/ssfile +N first-dir/adir/sub2/file2 +N first-dir/bdir/subdir/file1 +N first-dir/cdir/cfile +No conflicts created by this import +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub1 +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub1/ssdir +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/adir/sub2 +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/bdir +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/bdir/subdir +${PROG} [a-z]*: Importing ${TESTDIR}/cvsroot/first-dir/cdir" + cd .. + mkdir 2; cd 2 + dotest importc-2 "${testcvs} -q co first-dir" \ +"U first-dir/adir/sub1/file1 +U first-dir/adir/sub1/ssdir/ssfile +U first-dir/adir/sub2/file2 +U first-dir/bdir/subdir/file1 +U first-dir/cdir/cfile" + cd first-dir + dotest importc-3 "${testcvs} update adir/sub1" \ +"${PROG} [a-z]*: Updating adir/sub1 +${PROG} [a-z]*: Updating adir/sub1/ssdir" + dotest importc-4 "${testcvs} update adir/sub1 bdir/subdir" \ +"${PROG} [a-z]*: Updating adir/sub1 +${PROG} [a-z]*: Updating adir/sub1/ssdir +${PROG} [a-z]*: Updating bdir/subdir" + + echo modify >>cdir/cfile + dotest importc-5 \ +"${testcvs} -q rtag -b -r release wip_test first-dir" "" + dotest importc-6 "${testcvs} -q update -r wip_test" "M cdir/cfile" + + if test "$remote" = no; then + # This checkin should just succeed. That it doesn't is a + # bug (CVS 1.9.16 through the present seem to have it; CVS + # 1.9 did not). + dotest_fail importc-7 "${testcvs} -q ci -m modify -r wip_test" \ +"${PROG} [a-z]*: in directory adir/sub1/ssdir: +${PROG} \[[a-z]* aborted\]: there is no version here; do .cvs checkout. first" + # The workaround is to leave off the "-r wip_test". + dotest importc-8 "${testcvs} -q ci -m modify" \ +"Checking in cdir/cfile; +${TESTDIR}/cvsroot/first-dir/cdir/cfile,v <-- cfile +new revision: 1\.1\.1\.1\.2\.1; previous revision: 1\.1\.1\.1 +done" + else + # Remote doesn't have the bug in the first place. + dotest importc-7 "${testcvs} -q ci -m modify -r wip_test" \ +"Checking in cdir/cfile; +${TESTDIR}/cvsroot/first-dir/cdir/cfile,v <-- cfile +new revision: 1\.1\.1\.1\.2\.1; previous revision: 1\.1\.1\.1 +done" + fi + cd .. + + cd .. + rm -r 1 2 + rm -rf ${CVSROOT_DIRNAME}/first-dir + ;; + join) # Test doing joins which involve adding and removing files. # Variety of scenarios (see list below), in the context of: @@ -5779,6 +5906,10 @@ ${PROG} [a-z]*: Rebuilding administrative file database" dotest modules2-5 "test -d ampermodule/second-dir" '' # Test ability of cvs release to handle multiple arguments + # Other CVS release tests: + # info-cleanup-0 for "cvs -n release". + # ignore-193 for the text of the question that cvs release asks. + # Also for interactions with cvsignore. cd ampermodule if ${testcvs} release -d first-dir second-dir <<EOF >>${LOGFILE} yes @@ -5803,9 +5934,11 @@ EOF "${PROG} [a-z]*: Updating first-dir ${PROG} [a-z]*: Updating second-dir" touch ampermodule/first-dir/amper1 - dotest modules2-10 "${testcvs} add ampermodule/first-dir/amper1" \ -"${PROG} [a-z]*: scheduling file .ampermodule/first-dir/amper1. for addition + cd ampermodule + dotest modules2-10 "${testcvs} add first-dir/amper1" \ +"${PROG} [a-z]*: scheduling file .first-dir/amper1. for addition ${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + cd .. # As with the "Updating xxx" message, the "U first-dir/amper1" # message (instead of "U ampermodule/first-dir/amper1") is @@ -6131,6 +6264,7 @@ done" cat >modules <<EOF all -a first-dir some -a !first-dir/subdir first-dir +somewhat -a first-dir !first-dir/subdir EOF dotest modules4-8 "${testcvs} -q ci -m add-modules" \ "Checking in modules; @@ -6152,6 +6286,21 @@ U first-dir/subdir/file2" dotest_fail modules4-11 "test -d first-dir/subdir" '' rm -r first-dir + if test "$remote" = no; then + # This is strange behavior, in that the order of the + # "!first-dir/subdir" and "first-dir" matter, and it isn't + # clear that they should. I suspect it is long-standing + # strange behavior but I haven't verified that. + dotest modules4-11a "${testcvs} -q co somewhat" \ +"U first-dir/file1 +U first-dir/subdir/file2" + else + # But remote seems to do it the other way. + dotest modules4-11a "${testcvs} -q co somewhat" "U first-dir/file1" + dotest_fail modules4-11b "test -d first-dir/subdir" '' + fi + rm -r first-dir + cd .. rm -r 2 @@ -6222,7 +6371,23 @@ add-it # convenience variables REP=${CVSROOT} - # First, check out the modules file and edit it. + # First, set TopLevelAdmin=yes so we're sure to get + # top-level CVS directories. + mkdir 1; cd 1 + dotest cvsadm-setup-1 "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "TopLevelAdmin=yes" >config + dotest cvsadm-setup-2 "${testcvs} -q ci -m yes-top-level" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd ../.. + rm -r 1 + + # Second, check out the modules file and edit it. mkdir 1; cd 1 dotest cvsadm-1 "${testcvs} co CVSROOT/modules" \ "U CVSROOT/modules" @@ -6278,26 +6443,27 @@ ${PROG} [a-z]*: Rebuilding administrative file database" rm -rf CVS CVSROOT; # Create the various modules - mkdir ${CVSROOT_DIRNAME}/mod1 - mkdir ${CVSROOT_DIRNAME}/mod1-2 - mkdir ${CVSROOT_DIRNAME}/mod2 - mkdir ${CVSROOT_DIRNAME}/mod2/sub2 - mkdir ${CVSROOT_DIRNAME}/mod2-2 - mkdir ${CVSROOT_DIRNAME}/mod2-2/sub2-2 - dotest cvsadm-2 "${testcvs} co mod1 mod1-2 mod2 mod2-2" \ -"${PROG} [a-z]*: Updating mod1 -${PROG} [a-z]*: Updating mod1-2 -${PROG} [a-z]*: Updating mod2 -${PROG} [a-z]*: Updating mod2/sub2 -${PROG} [a-z]*: Updating mod2-2 -${PROG} [a-z]*: Updating mod2-2/sub2-2" + dotest cvsadm-2 "${testcvs} -q co -l ." '' + mkdir mod1 + mkdir mod1-2 + mkdir mod2 + mkdir mod2/sub2 + mkdir mod2-2 + mkdir mod2-2/sub2-2 + dotest cvsadm-2a "${testcvs} add mod1 mod1-2 mod2 mod2/sub2 mod2-2 mod2-2/sub2-2" \ +"Directory ${TESTDIR}/cvsroot/mod1 added to the repository +Directory ${TESTDIR}/cvsroot/mod1-2 added to the repository +Directory ${TESTDIR}/cvsroot/mod2 added to the repository +Directory ${TESTDIR}/cvsroot/mod2/sub2 added to the repository +Directory ${TESTDIR}/cvsroot/mod2-2 added to the repository +Directory ${TESTDIR}/cvsroot/mod2-2/sub2-2 added to the repository" # Populate the directories for the halibut echo "file1" > mod1/file1 echo "file1-2" > mod1-2/file1-2 echo "file2" > mod2/sub2/file2 echo "file2-2" > mod2-2/sub2-2/file2-2 - dotest cvsadm-2a "${testcvs} add mod1/file1 mod1-2/file1-2 mod2/sub2/file2 mod2-2/sub2-2/file2-2" \ + dotest cvsadm-2aa "${testcvs} add mod1/file1 mod1-2/file1-2 mod2/sub2/file2 mod2-2/sub2-2/file2-2" \ "${PROG} [a-z]*: scheduling file .mod1/file1. for addition ${PROG} [a-z]*: scheduling file .mod1-2/file1-2. for addition ${PROG} [a-z]*: scheduling file .mod2/sub2/file2. for addition @@ -7287,68 +7453,71 @@ U dir/dir2d2-2/sub2d2-2/file2-2" ## on the command line, but use a longer path. ################################################## + dotest_fail cvsadm-2d3-1 "${testcvs} co -d dir/dir2 1mod" \ +"${PROG} [a-z]*: cannot chdir to dir: No such file or directory +${PROG} [a-z]*: ignoring module 1mod" + + if test "$remote" = no; then + # Remote can't handle this, even with the "mkdir dir". + # This was also true of CVS 1.9. + + mkdir dir dotest cvsadm-2d3 "${testcvs} co -d dir/dir2 1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" dotest cvsadm-2d3b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d3d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" + dotest_fail cvsadm-2d3d "test -f dir/CVS/Repository" "" dotest cvsadm-2d3f "cat dir/dir2/CVS/Repository" \ "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-2d4 "${testcvs} co -d dir/dir2 2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" dotest cvsadm-2d4b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d4d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-2d4f "cat dir/dir2/CVS/Repository" \ "${AREP}mod2/sub2" rm -rf CVS dir + mkdir dir dotest cvsadm-2d5 "${testcvs} co -d dir/dir2 1d1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" dotest cvsadm-2d5b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d5d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-2d5f "cat dir/dir2/CVS/Repository" \ "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-2d6 "${testcvs} co -d dir/dir2 1d2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" dotest cvsadm-2d6b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d6d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-2d6f "cat dir/dir2/CVS/Repository" \ "${AREP}mod2/sub2" rm -rf CVS dir + mkdir dir dotest cvsadm-2d7 "${testcvs} co -d dir/dir2 2d1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" dotest cvsadm-2d7b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d7d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-2d7f "cat dir/dir2/CVS/Repository" \ "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-2d8 "${testcvs} co -d dir/dir2 2d2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" dotest cvsadm-2d8b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-2d8d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-2d8f "cat dir/dir2/CVS/Repository" \ "${AREP}mod2/sub2" rm -rf CVS dir @@ -7490,65 +7659,60 @@ U dir/dir2d2/sub2d2/file2" ## the ones in two-deep directories + mkdir dir dotest cvsadm-N2d3 "${testcvs} co -N -d dir/dir2 1mod" \ "${PROG} [a-z]*: Updating dir/dir2/1mod U dir/dir2/1mod/file1" dotest cvsadm-N2d3b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d3d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d3f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d3h "cat dir/dir2/1mod/CVS/Repository" \ "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-N2d4 "${testcvs} co -N -d dir/dir2 2mod" \ "${PROG} [a-z]*: Updating dir/dir2/2mod U dir/dir2/2mod/file2" dotest cvsadm-N2d4b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d4d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d4f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d4h "cat dir/dir2/2mod/CVS/Repository" \ "${AREP}mod2/sub2" rm -rf CVS dir + mkdir dir dotest cvsadm-N2d5 "${testcvs} co -N -d dir/dir2 1d1mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir1d1 U dir/dir2/dir1d1/file1" dotest cvsadm-N2d5b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d5d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d5f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d5h "cat dir/dir2/dir1d1/CVS/Repository" \ "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-N2d6 "${testcvs} co -N -d dir/dir2 1d2mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir1d2 U dir/dir2/dir1d2/file2" dotest cvsadm-N2d6b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d6d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d6f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d6h "cat dir/dir2/dir1d2/CVS/Repository" \ "${AREP}mod2/sub2" rm -rf CVS dir + mkdir dir dotest cvsadm-N2d7 "${testcvs} co -N -d dir/dir2 2d1mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir2d1/sub2d1 U dir/dir2/dir2d1/sub2d1/file1" dotest cvsadm-N2d7b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d7d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d7f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d7f "cat dir/dir2/dir2d1/CVS/Repository" \ @@ -7557,13 +7721,12 @@ U dir/dir2/dir2d1/sub2d1/file1" "${AREP}mod1" rm -rf CVS dir + mkdir dir dotest cvsadm-N2d8 "${testcvs} co -N -d dir/dir2 2d2mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir2d2/sub2d2 U dir/dir2/dir2d2/sub2d2/file2" dotest cvsadm-N2d8b "cat CVS/Repository" \ "${AREP}\." - dotest cvsadm-N2d8d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" dotest cvsadm-N2d8f "cat dir/dir2/CVS/Repository" \ "${AREP}\." dotest cvsadm-N2d8h "cat dir/dir2/dir2d2/CVS/Repository" \ @@ -7572,10 +7735,25 @@ U dir/dir2/dir2d2/sub2d2/file2" "${AREP}mod2/sub2" rm -rf CVS dir + fi # end of tests to be skipped for remote + ################################################## ## That's enough of that, thank you very much. ################################################## + dotest cvsadm-cleanup-1 "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "# empty file" >config + dotest cvsadm-cleanup-2 "${testcvs} -q ci -m cvsadm-cleanup" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd .. + rm -rf CVSROOT CVS + # remove our junk cd .. rm -rf 1 @@ -7589,6 +7767,90 @@ U dir/dir2/dir2d2/sub2d2/file2" rm -rf ${CVSROOT_DIRNAME}/mod2-2 ;; + emptydir) + # Various tests of the Emptydir (CVSNULLREPOS) code. See also: + # cvsadm: tests of Emptydir in various module definitions + # basicb: Test that "Emptydir" is non-special in ordinary contexts + + mkdir 1; cd 1 + dotest emptydir-1 "${testcvs} co CVSROOT/modules" \ +"U CVSROOT/modules" + echo "# Module defs for emptydir tests" > CVSROOT/modules + echo "2d1mod -d dir2d1/sub2d1 mod1" >> CVSROOT/modules + + dotest emptydir-2 "${testcvs} ci -m add-modules" \ +"${PROG} [a-z]*: Examining CVSROOT +Checking in CVSROOT/modules; +${CVSROOT_DIRNAME}/CVSROOT/modules,v <-- modules +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + rm -rf CVS CVSROOT + + mkdir ${CVSROOT_DIRNAME}/mod1 + # Populate. Not sure we really need to do this. + dotest emptydir-3 "${testcvs} co mod1" \ +"${PROG} [a-z]*: Updating mod1" + echo "file1" > mod1/file1 + cd mod1 + dotest emptydir-4 "${testcvs} add file1" \ +"${PROG} [a-z]*: scheduling file .file1. for addition +${PROG} [a-z]*: use '${PROG} commit' to add this file permanently" + cd .. + dotest emptydir-5 "${testcvs} -q ci -m yup mod1" \ +"RCS file: ${CVSROOT_DIRNAME}/mod1/file1,v +done +Checking in mod1/file1; +${CVSROOT_DIRNAME}/mod1/file1,v <-- file1 +initial revision: 1\.1 +done" + rm -rf mod1 CVS + # End Populate. + + dotest emptydir-6 "${testcvs} co 2d1mod" \ +"${PROG} [a-z]*: Updating dir2d1/sub2d1 +U dir2d1/sub2d1/file1" + cd dir2d1 + touch emptyfile + # The fact that CVS lets us add a file here is a CVS bug, right? + # I can just make this an error message (on the add and/or the + # commit) without getting flamed, right? + # Right? + # Right? + dotest emptydir-7 "${testcvs} add emptyfile" \ +"${PROG} [a-z]*: scheduling file .emptyfile. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest emptydir-8 "${testcvs} -q ci -m add" \ +"RCS file: ${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v +done +Checking in emptyfile; +${TESTDIR}/cvsroot/CVSROOT/Emptydir/emptyfile,v <-- emptyfile +initial revision: 1\.1 +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd .. + rm -rf CVS dir2d1 + + # OK, while we have an Emptydir around, test a few obscure + # things about it. + mkdir edir; cd edir + dotest emptydir-9 "${testcvs} -q co -l CVSROOT" \ +"U CVSROOT${DOTSTAR}" + cd CVSROOT + dotest_fail emptydir-10 "test -d Emptydir" '' + # This tests the code in find_dirs which skips Emptydir. + dotest emptydir-11 "${testcvs} -q -n update -d -P" '' + cd ../.. + rm -r edir + + cd .. + + rm -r 1 + rm -rf ${CVSROOT_DIRNAME}/mod1 + # I guess for the moment the convention is going to be + # that we don't need to remove ${CVSROOT_DIRNAME}/CVSROOT/Emptydir + ;; + abspath) # These tests test the thituations thin thwitch thoo theck @@ -7607,10 +7869,16 @@ ${PROG} [a-z]*: Updating mod2" # Populate the module echo "file1" > mod1/file1 echo "file2" > mod2/file2 - dotest abspath-1b "${testcvs} add mod1/file1 mod2/file2" \ -"${PROG} [a-z]*: scheduling file .mod1/file1. for addition -${PROG} [a-z]*: scheduling file .mod2/file2. for addition -${PROG} [a-z]*: use '${PROG} commit' to add these files permanently" + cd mod1 + dotest abspath-1ba "${testcvs} add file1" \ +"${PROG} [a-z]*: scheduling file .file1. for addition +${PROG} [a-z]*: use '${PROG} commit' to add this file permanently" + cd .. + cd mod2 + dotest abspath-1bb "${testcvs} add file2" \ +"${PROG} [a-z]*: scheduling file .file2. for addition +${PROG} [a-z]*: use '${PROG} commit' to add this file permanently" + cd .. dotest abspath-1c "${testcvs} ci -m yup mod1 mod2" \ "${PROG} [a-z]*: Examining mod1 @@ -7632,9 +7900,17 @@ done" # Done. # Try checking out the module in a local directory + if test "$remote" = yes; then + dotest_fail abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \ +"${PROG} \[server aborted\]: absolute pathname .${TESTDIR}/1. illegal for server" + dotest abspath-2a-try2 "${testcvs} co -d 1 mod1" \ +"${PROG} [a-z]*: Updating 1 +U 1/file1" + else dotest abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \ "${PROG} [a-z]*: Updating ${TESTDIR}/1 U ${TESTDIR}/1/file1" + fi # remote workaround # Are we relative or absolute in our Repository file? echo "${CVSROOT_DIRNAME}/mod1" > ${TESTDIR}/dotest.abs @@ -7658,11 +7934,47 @@ U ${TESTDIR}/1/file1" # Now try in a subdirectory. We're not covering any more # code here, but we might catch a future error if someone # changes the checkout code. + + # Note that for the same reason that the shell command + # "touch 1/2/3" requires directories 1 and 1/2 to already + # exist, we expect ${TESTDIR}/1 to already exist. I believe + # this is the behavior of CVS 1.9 and earlier. + if test "$remote" = no; then + dotest_fail abspath-3.1 "${testcvs} co -d ${TESTDIR}/1/2 mod1" \ +"${PROG} [a-z]*: cannot chdir to 1: No such file or directory +${PROG} [a-z]*: ignoring module mod1" + fi + dotest_fail abspath-3.2 "${testcvs} co -d 1/2 mod1" \ +"${PROG} [a-z]*: cannot chdir to 1: No such file or directory +${PROG} [a-z]*: ignoring module mod1" + mkdir 1 + + if test "$remote" = yes; then + # The server wants the directory to exist, but that is + # a bug, it should only need to exist on the client side. + # See also cvsadm-2d3. + dotest_fail abspath-3a "${testcvs} co -d 1/2 mod1" \ +"${PROG} [a-z]*: cannot chdir to 1: No such file or directory +${PROG} [a-z]*: ignoring module mod1" + cd 1 + dotest abspath-3a-try2 "${testcvs} co -d 2 mod1" \ +"${PROG} [a-z]*: Updating 2 +U 2/file1" + cd .. + rm -rf 1/CVS + else dotest abspath-3a "${testcvs} co -d ${TESTDIR}/1/2 mod1" \ "${PROG} [a-z]*: Updating ${TESTDIR}/1/2 U ${TESTDIR}/1/2/file1" + fi # remote workaround dotest abspath-3b "cat ${TESTDIR}/1/2/CVS/Repository" \ "${AREP}mod1" + + # For all the same reasons that we want "1" to already + # exist, we don't to mess with it to traverse it, for + # example by creating a CVS directory. + + dotest_fail abspath-3c "test -d ${TESTDIR}/1/CVS" '' # Done. Clean up. rm -rf ${TESTDIR}/1 @@ -7670,19 +7982,32 @@ U ${TESTDIR}/1/2/file1" # Now try someplace where we don't have permission. mkdir ${TESTDIR}/barf chmod -w ${TESTDIR}/barf - dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \ + if test "$remote" = yes; then + dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \ +"${PROG} \[server aborted\]: absolute pathname .${TESTDIR}/barf/sub. illegal for server" + else + dotest_fail abspath-4 "${testcvs} co -d ${TESTDIR}/barf/sub mod1" \ "${PROG} \[[a-z]* aborted\]: cannot make directory sub: No such file or directory" + fi chmod +w ${TESTDIR}/barf rmdir ${TESTDIR}/barf # Done. Nothing to clean up. # Try checking out two modules into the same directory. - dotest abspath-5a "${testcvs} co -d ${TESTDIR}/1 mod1 mod2" \ + if test "$remote" = yes; then + dotest abspath-5a "${testcvs} co -d 1 mod1 mod2" \ +"${PROG} [a-z]*: Updating 1/mod1 +U 1/mod1/file1 +${PROG} [a-z]*: Updating 1/mod2 +U 1/mod2/file2" + else + dotest abspath-5a "${testcvs} co -d ${TESTDIR}/1 mod1 mod2" \ "${PROG} [a-z]*: Updating ${TESTDIR}/1/mod1 U ${TESTDIR}/1/mod1/file1 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2 U ${TESTDIR}/1/mod2/file2" + fi # end remote workaround dotest abspath-5b "cat ${TESTDIR}/1/CVS/Repository" \ "${AREP}." dotest abspath-5c "cat ${TESTDIR}/1/mod1/CVS/Repository" \ @@ -7694,7 +8019,17 @@ U ${TESTDIR}/1/mod2/file2" # Try checking out the top-level module. - dotest abspath-6a "${testcvs} co -d ${TESTDIR}/1 ." \ + if test "$remote" = yes; then + dotest abspath-6a "${testcvs} co -d 1 ." \ +"${PROG} [a-z]*: Updating 1 +${PROG} [a-z]*: Updating 1/CVSROOT +${DOTSTAR} +${PROG} [a-z]*: Updating 1/mod1 +U 1/mod1/file1 +${PROG} [a-z]*: Updating 1/mod2 +U 1/mod2/file2" + else + dotest abspath-6a "${testcvs} co -d ${TESTDIR}/1 ." \ "${PROG} [a-z]*: Updating ${TESTDIR}/1 ${PROG} [a-z]*: Updating ${TESTDIR}/1/CVSROOT ${DOTSTAR} @@ -7702,6 +8037,7 @@ ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod1 U ${TESTDIR}/1/mod1/file1 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2 U ${TESTDIR}/1/mod2/file2" + fi # end of remote workaround dotest abspath-6b "cat ${TESTDIR}/1/CVS/Repository" \ "${AREP}." dotest abspath-6c "cat ${TESTDIR}/1/CVSROOT/CVS/Repository" \ @@ -7713,17 +8049,45 @@ U ${TESTDIR}/1/mod2/file2" # Done. Clean up. rm -rf ${TESTDIR}/1 + # Test that an absolute pathname to some other directory + # doesn't mess with the current working directory. + mkdir 1 + cd 1 + if test "$remote" = yes; then + dotest_fail abspath-7a "${testcvs} -q co -d ../2 mod2" \ +"${PROG} server: protocol error: .\.\./2. contains more leading \.\. +${PROG} \[server aborted\]: than the 0 which Max-dotdot specified" + cd .. + dotest abspath-7a-try2 "${testcvs} -q co -d 2 mod2" \ +"U 2/file2" + cd 1 + else + dotest abspath-7a "${testcvs} -q co -d ${TESTDIR}/2 mod2" \ +"U ${TESTDIR}/2/file2" + fi # remote workaround + dotest abspath-7b "ls" "" + dotest abspath-7c "${testcvs} -q co mod1" \ +"U mod1/file1" + cd mod1 + if test "$remote" = yes; then + cd ../.. + dotest abspath-7d "${testcvs} -q co -d 3 mod2" \ +"U 3/file2" + cd 1/mod1 + else + dotest abspath-7d "${testcvs} -q co -d ${TESTDIR}/3 mod2" \ +"U ${TESTDIR}/3/file2" + fi # remote workaround + dotest abspath-7e "${testcvs} -q update -d" "" + cd ../.. + rm -r 1 2 3 + # # FIXME: do other functions here (e.g. update /tmp/foo) # # Finished with all tests. Remove the module. - rm -rf ${CVSROOT_DIRNAME}/mod1 ${CVSROOT_DIRNAME}/mod1 - - # FIXME: the absolute pathname fixes create CVS directories - # wherever they can. That means for the standard TESTDIR, a - # /tmp/CVS directory will be created as well. It's not safe - # to remove it, however. + rm -rf ${CVSROOT_DIRNAME}/mod1 ${CVSROOT_DIRNAME}/mod2 ;; @@ -7733,9 +8097,26 @@ U ${TESTDIR}/1/mod2/file2" # Some test, somewhere, is creating Emptydir. That test # should, perhaps, clean up for itself, but I don't know which - # one it is. + # one it is (cvsadm, emptydir, &c). + # (On the other hand, should CVS care whether there is an + # Emptydir? That would seem a bit odd). rm -rf ${CVSROOT_DIRNAME}/CVSROOT/Emptydir + # First set the TopLevelAdmin setting. + mkdir 1; cd 1 + dotest toplevel-1a "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "TopLevelAdmin=yes" >config + dotest toplevel-1b "${testcvs} -q ci -m yes-top-level" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd ../.. + rm -r 1 + mkdir 1; cd 1 dotest toplevel-1 "${testcvs} -q co -l ." '' mkdir top-dir second-dir @@ -7806,6 +8187,7 @@ ${PROG} [a-z]*: Updating top-dir" dotest toplevel-10 "${testcvs} co top-dir" \ "${PROG} [a-z]*: Updating top-dir U top-dir/file1" + # This tests more or less the same thing, in a particularly # "real life" example. dotest toplevel-11 "${testcvs} -q update -d second-dir" \ @@ -7819,12 +8201,124 @@ U top-dir/file1" # Now set the permissions so we can't recreate it. chmod -w ../1 # Now see whether CVS has trouble because it can't create CVS. + # First string is for local, second is for remote. dotest toplevel-12 "${testcvs} co top-dir" \ "${PROG} [a-z]*: warning: cannot make directory CVS in \.: Permission denied +${PROG} [a-z]*: Updating top-dir" \ +"${PROG} [a-z]*: warning: cannot make directory CVS in \.: Permission denied +${PROG} [a-z]*: in directory \.: +${PROG} [a-z]*: cannot open CVS/Entries for reading: No such file or directory ${PROG} [a-z]*: Updating top-dir" + chmod +w ../1 + dotest toplevel-cleanup-1 "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "# empty file" >config + dotest toplevel-cleanup-2 "${testcvs} -q ci -m toplevel-cleanup" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + + cd ../.. + rm -r 1 + rm -rf ${CVSROOT_DIRNAME}/top-dir ${CVSROOT_DIRNAME}/second-dir + ;; + + toplevel2) + # Similar to toplevel, but test the case where TopLevelAdmin=no. + + # First set the TopLevelAdmin setting. + mkdir 1; cd 1 + dotest toplevel2-1a "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "TopLevelAdmin=no" >config + dotest toplevel2-1b "${testcvs} -q ci -m no-top-level" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd ../.. + rm -r 1 + + # Now set up some directories and subdirectories + mkdir 1; cd 1 + dotest toplevel2-1 "${testcvs} -q co -l ." '' + mkdir top-dir second-dir + dotest toplevel2-2 "${testcvs} add top-dir second-dir" \ +"Directory ${TESTDIR}/cvsroot/top-dir added to the repository +Directory ${TESTDIR}/cvsroot/second-dir added to the repository" + cd top-dir + + touch file1 + dotest toplevel2-3 "${testcvs} add file1" \ +"${PROG} [a-z]*: scheduling file .file1. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest toplevel2-4 "${testcvs} -q ci -m add" \ +"RCS file: ${TESTDIR}/cvsroot/top-dir/file1,v +done +Checking in file1; +${TESTDIR}/cvsroot/top-dir/file1,v <-- file1 +initial revision: 1\.1 +done" + cd .. + + cd second-dir + touch file2 + dotest toplevel2-3s "${testcvs} add file2" \ +"${PROG} [a-z]*: scheduling file .file2. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest toplevel2-4s "${testcvs} -q ci -m add" \ +"RCS file: ${TESTDIR}/cvsroot/second-dir/file2,v +done +Checking in file2; +${TESTDIR}/cvsroot/second-dir/file2,v <-- file2 +initial revision: 1\.1 +done" + + cd ../.. + rm -r 1; mkdir 1; cd 1 + dotest toplevel2-5 "${testcvs} co top-dir" \ +"${PROG} [a-z]*: Updating top-dir +U top-dir/file1" + + dotest toplevel2-6 "${testcvs} update top-dir" \ +"${PROG} [a-z]*: Updating top-dir" + dotest toplevel2-7 "${testcvs} update" \ +"${PROG} [a-z]*: Updating top-dir" + + dotest toplevel2-8 "${testcvs} update -d top-dir" \ +"${PROG} [a-z]*: Updating top-dir" + # Contrast this with toplevel-9, which has TopLevelAdmin=yes. + dotest toplevel2-9 "${testcvs} update -d" \ +"${PROG} [a-z]*: Updating top-dir" + cd .. + rm -r 1; mkdir 1; cd 1 + dotest toplevel2-10 "${testcvs} co top-dir" \ +"${PROG} [a-z]*: Updating top-dir +U top-dir/file1" + # This tests more or less the same thing, in a particularly + # "real life" example. With TopLevelAdmin=yes, this command + # would give us second-dir and CVSROOT directories too. + dotest toplevel2-11 "${testcvs} -q update -d" "" + + dotest toplevel2-cleanup-1 "${testcvs} -q co CVSROOT/config" \ +"U CVSROOT/config" + cd CVSROOT + echo "# empty file" >config + dotest toplevel2-cleanup-2 "${testcvs} -q ci -m toplevel2-cleanup" \ +"Checking in config; +${TESTDIR}/cvsroot/CVSROOT/config,v <-- config +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd ../.. rm -r 1 rm -rf ${CVSROOT_DIRNAME}/top-dir ${CVSROOT_DIRNAME}/second-dir ;; @@ -7894,7 +8388,7 @@ ${PROG} [a-z]*: Updating top-dir" cat >${TESTDIR}/editme <<EOF #!${TESTSHELL} sleep 1 -sed <\$1 -e 's/^/x&/g' >${TESTDIR}/edit.new +sed <\$1 -e 's/^/x/' >${TESTDIR}/edit.new mv ${TESTDIR}/edit.new \$1 exit 0 EOF @@ -8619,9 +9113,20 @@ Enew line here G@#..!@#=&" cd ../.. + # OK, now change the tab to a space, and see that CVS gives + # a reasonable error (this is database corruption but CVS should + # not lose its mind). + sed -e 's/Fw2 /Fw2 /' <${CVSROOT_DIRNAME}/first-dir/CVS/fileattr \ + >${CVSROOT_DIRNAME}/first-dir/CVS/fileattr.new + mv ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr.new \ + ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr + mkdir 2; cd 2 + dotest_fail devcom3-10 "${testcvs} -Q co ." \ +"${PROG} \[[a-z]* aborted\]: file attribute database corruption: tab missing in ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" + cd .. # Use -f because of the readonly files. - rm -rf 1 + rm -rf 1 2 rm -rf ${CVSROOT_DIRNAME}/first-dir ;; @@ -8716,6 +9221,106 @@ C file1" rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + unedit-without-baserev) + mkdir 1; cd 1 + module=x + + file=m + echo foo > $file + dotest unedit-without-baserev-1 \ + "$testcvs -Q import -m . $module X Y" '' + dotest unedit-without-baserev-2 "$testcvs -Q co $module" '' + cd $module + + dotest unedit-without-baserev-3 "$testcvs -Q edit $file" '' + + echo add a line >> $file + rm -f CVS/Baserev + + # This will fail on most systems. + if echo "yes" | ${testcvs} -Q unedit $file \ + >${TESTDIR}/test.tmp 2>&1 ; then + dotest unedit-without-baserev-4 "cat ${TESTDIR}/test.tmp" \ +"m has been modified; revert changes${QUESTION} ${PROG} unedit: m not mentioned in CVS/Baserev +${PROG} unedit: run update to complete the unedit" + else + fail unedit-without-baserev-4 + fi + + # SunOS4.1.4 systems make it this far, but with a corrupted + # CVS/Entries file. Demonstrate the corruption! + dotest unedit-without-baserev-5 "cat CVS/Entries" \ + "/$file/1\.1\.1\.1/.*" + + if test "$remote" = yes; then + dotest unedit-without-baserev-6 "${testcvs} -q update" "U m" + else + dotest unedit-without-baserev-6 "${testcvs} -q update" \ +"${PROG} update: warning: m was lost +U m" + fi + + # OK, those were the easy cases. Now tackle the hard one + # (the reason that CVS/Baserev was invented rather than just + # getting the revision from CVS/Entries). This is very + # similar to watch4-10 through watch4-18 but with Baserev + # missing. + cd ../.. + mkdir 2; cd 2 + dotest unedit-without-baserev-7 "${testcvs} -Q co x" '' + cd x + + dotest unedit-without-baserev-10 "${testcvs} edit m" '' + echo 'edited in 2' >m + cd ../.. + + cd 1/x + dotest unedit-without-baserev-11 "${testcvs} edit m" '' + echo 'edited in 1' >m + dotest unedit-without-baserev-12 "${testcvs} -q ci -m edit-in-1" \ +"Checking in m; +${TESTDIR}/cvsroot/x/m,v <-- m +new revision: 1\.2; previous revision: 1\.1 +done" + cd ../.. + cd 2/x + dotest unedit-without-baserev-13 "${testcvs} -q update" \ +"RCS file: ${TESTDIR}/cvsroot/x/m,v +retrieving revision 1\.1\.1\.1 +retrieving revision 1\.2 +Merging differences between 1\.1\.1\.1 and 1\.2 into m +rcsmerge: warning: conflicts during merge +${PROG} [a-z]*: conflicts found in m +C m" + rm CVS/Baserev + if (echo yes | ${testcvs} unedit m) >${TESTDIR}/test.tmp 2>&1; then + dotest unedit-without-baserev-14 "cat ${TESTDIR}/test.tmp" \ +"m has been modified; revert changes${QUESTION} ${PROG} unedit: m not mentioned in CVS/Baserev +${PROG} unedit: run update to complete the unedit" + else + fail unedit-without-baserev-14 + fi + if test "$remote" = yes; then + dotest unedit-without-baserev-15 "${testcvs} -q update" "U m" + else + dotest unedit-without-baserev-15 "${testcvs} -q update" \ +"${PROG} update: warning: m was lost +U m" + fi + # The following tests are kind of degenerate compared with + # watch4-16 through watch4-18 but might as well make sure that + # nothing seriously wrong has happened to the working directory. + dotest unedit-without-baserev-16 "cat m" 'edited in 1' + # Make sure CVS really thinks we are at 1.2. + dotest unedit-without-baserev-17 "${testcvs} -q update" "" + dotest unedit-without-baserev-18 "cat m" "edited in 1" + + cd ../.. + rm -rf 1 + rm -r 2 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + ignore) # On Windows, we can't check out CVSROOT, because the case # insensitivity means that this conflicts with cvsroot. @@ -9876,6 +10481,7 @@ ${PROG} [a-z]*: Rebuilding administrative file database" # cvsignore: ignore # verifymsg: info # cvswrappers: mwrap + # taginfo: taginfo # config: config # On Windows, we can't check out CVSROOT, because the case @@ -10009,6 +10615,9 @@ done ${PROG} [a-z]*: Rebuilding administrative file database" cd .. + dotest_fail info-cleanup-0 "${testcvs} -n release -d CVSROOT" \ +"${PROG} \[release aborted\]: cannot run command ${DOTSTAR}" + if echo "yes" | ${testcvs} release -d CVSROOT >>${LOGFILE} ; then pass info-cleanup else @@ -10024,6 +10633,112 @@ ${PROG} [a-z]*: Rebuilding administrative file database" rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + taginfo) + # Tests of the CVSROOT/taginfo file. See the comment at the + # "info" tests for a full list of administrative file tests. + + # Tests to add: + # -F to move + # -d + # rtag + + mkdir 1; cd 1 + dotest taginfo-1 "${testcvs} -q co CVSROOT" "U CVSROOT/${DOTSTAR}" + cd CVSROOT + cat >${TESTDIR}/1/loggit <<EOF +#!${TESTSHELL} +if test "\$1" = rejectme; then + exit 1 +else + echo "\$@" >>${TESTDIR}/1/taglog + exit 0 +fi +EOF + chmod +x ${TESTDIR}/1/loggit + echo "ALL ${TESTDIR}/1/loggit" >taginfo + dotest taginfo-2 "${testcvs} -q ci -m check-in-taginfo" \ +"Checking in taginfo; +${TESTDIR}/cvsroot/CVSROOT/taginfo,v <-- taginfo +new revision: 1\.2; previous revision: 1\.1 +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd .. + + # taginfo-3 used to rely on the top-level CVS directory + # being created to add "first-dir" to the repository. Since + # that won't happen anymore, we create the directory in the + # repository. + mkdir ${CVSROOT_DIRNAME}/first-dir + dotest taginfo-3 "${testcvs} -q co first-dir" '' + + cd first-dir + echo first >file1 + dotest taginfo-4 "${testcvs} add file1" \ +"${PROG} [a-z]*: scheduling file .file1. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest taginfo-5 "${testcvs} -q ci -m add-it" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file1,v +done +Checking in file1; +${TESTDIR}/cvsroot/first-dir/file1,v <-- file1 +initial revision: 1\.1 +done" + dotest taginfo-6 "${testcvs} -q tag tag1" "T file1" + dotest taginfo-7 "${testcvs} -q tag -b br" "T file1" + dotest taginfo-8 "${testcvs} -q update -r br" "" + echo add text on branch >>file1 + dotest taginfo-9 "${testcvs} -q ci -m modify-on-br" \ +"Checking in file1; +${TESTDIR}/cvsroot/first-dir/file1,v <-- file1 +new revision: 1\.1\.2\.1; previous revision: 1\.1 +done" + dotest taginfo-10 "${testcvs} -q tag -F -c brtag" "T file1" + + dotest_fail taginfo-11 "${testcvs} -q tag rejectme" \ +"${PROG} [a-z]*: Pre-tag check failed +${PROG} \[[a-z]* aborted\]: correct the above errors first!" + + # When we are using taginfo to allow/disallow, it would be + # convenient to be able to use "cvs -n tag" to test whether + # the allow/disallow functionality is working as expected. + dotest taginfo-12 "${testcvs} -nq tag rejectme" "T file1" + + # But when taginfo is used for logging, it is a pain for -n + # to call taginfo, since taginfo doesn't know whether -n was + # specified or not. + dotest taginfo-13 "${testcvs} -nq tag would-be-tag" "T file1" + + # The "br" example should be passing 1.1.2 or 1.1.0.2. + # But it turns out that is very hard to implement, since + # check_fileproc doesn't know what branch number it will + # get. Probably the whole thing should be re-architected + # so that taginfo only allows/denies tagging, and a new + # hook, which is done from tag_fileproc, does logging. + # That would solve this, some more subtle races, and also + # the fact that it is nice for users to run "-n tag foo" to + # see whether a tag would be allowed. Failing that, + # I suppose passing "1.1.branch" or "branch" for "br" + # would be an improvement. + dotest taginfo-examine "cat ${TESTDIR}/1/taglog" \ +"tag1 add ${TESTDIR}/cvsroot/first-dir file1 1.1 +br add ${TESTDIR}/cvsroot/first-dir file1 1.1 +brtag mov ${TESTDIR}/cvsroot/first-dir file1 1.1.2.1" + + cd .. + cd CVSROOT + echo '# Keep life simple' > taginfo + dotest taginfo-cleanup-1 "${testcvs} -q ci -m check-in-taginfo" \ +"Checking in taginfo; +${TESTDIR}/cvsroot/CVSROOT/taginfo,v <-- taginfo +new revision: 1\.3; previous revision: 1\.2 +done +${PROG} [a-z]*: Rebuilding administrative file database" + cd .. + cd .. + rm -r 1 + rm -rf ${CVSROOT_DIRNAME}/first-dir + ;; + config) # Tests of the CVSROOT/config file. See the comment at the # "info" tests for a full list of administrative file tests. @@ -10036,10 +10751,12 @@ ${PROG} [a-z]*: Rebuilding administrative file database" dotest config-1 "${testcvs} -q co CVSROOT" "U CVSROOT/${DOTSTAR}" cd CVSROOT echo 'bogus line' >config + # We can't rely on specific revisions, since other tests + # might need to modify CVSROOT/config dotest config-3 "${testcvs} -q ci -m change-to-bogus-line" \ "Checking in config; ${TESTDIR}/cvsroot/CVSROOT/config,v <-- config -new revision: 1\.2; previous revision: 1\.1 +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* done ${PROG} [a-z]*: Rebuilding administrative file database" echo 'BogusOption=yes' >config @@ -10047,7 +10764,7 @@ ${PROG} [a-z]*: Rebuilding administrative file database" "${PROG} [a-z]*: syntax error in ${TESTDIR}/cvsroot/CVSROOT/config: line 'bogus line' is missing '=' Checking in config; ${TESTDIR}/cvsroot/CVSROOT/config,v <-- config -new revision: 1\.3; previous revision: 1\.2 +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* done ${PROG} [a-z]*: Rebuilding administrative file database" echo '# No config is a good config' > config @@ -10055,7 +10772,7 @@ ${PROG} [a-z]*: Rebuilding administrative file database" "${PROG} [a-z]*: ${TESTDIR}/cvsroot/CVSROOT/config: unrecognized keyword 'BogusOption' Checking in config; ${TESTDIR}/cvsroot/CVSROOT/config,v <-- config -new revision: 1\.4; previous revision: 1\.3 +new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* done ${PROG} [a-z]*: Rebuilding administrative file database" dotest config-6 "${testcvs} -q update" '' @@ -10105,7 +10822,7 @@ done" # Remove the tag. This will leave the tag string in the # expansion of the Name keyword. - dotest serverpatch-6 "${testcvs} -q update -A" '' + dotest serverpatch-6 "${testcvs} -q update -A first-dir" '' # Modify and check in the first copy. cd ../1/first-dir @@ -10520,7 +11237,9 @@ date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; ;; ann) - # Tests of "cvs annotate". See also basica-10. + # Tests of "cvs annotate". See also: + # basica-10 A simple annotate test + # rcs Annotate and the year 2000 mkdir 1; cd 1 dotest ann-1 "${testcvs} -q co -l ." '' mkdir first-dir @@ -10626,12 +11345,77 @@ done" 1\.2 (${username} *[0-9a-zA-Z-]*): line 1\.2\.2\.1 (${username} *[0-9a-zA-Z-]*): and some 1\.2\.2\.1 (${username} *[0-9a-zA-Z-]*): branched content" + # FIXCVS: shouldn't "-r 1.2.0.2" be the same as "-r br"? + dotest ann-12 "${testcvs} ann -r 1.2.0.2 file1" "" + dotest ann-13 "${testcvs} ann -r 1.2.2 file1" \ +"Annotations for file1 +\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* +1\.1 (${username} *[0-9a-zA-Z-]*): this +1\.1 (${username} *[0-9a-zA-Z-]*): is +1\.2 (${username} *[0-9a-zA-Z-]*): a +1\.1 (${username} *[0-9a-zA-Z-]*): file +1\.2 (${username} *[0-9a-zA-Z-]*): +1\.2 (${username} *[0-9a-zA-Z-]*): with +1\.2 (${username} *[0-9a-zA-Z-]*): a +1\.2 (${username} *[0-9a-zA-Z-]*): blank +1\.2 (${username} *[0-9a-zA-Z-]*): line +1\.2\.2\.1 (${username} *[0-9a-zA-Z-]*): and some +1\.2\.2\.1 (${username} *[0-9a-zA-Z-]*): branched content" + dotest_fail ann-14 "${testcvs} ann -r bill-clintons-chastity file1" \ +"${PROG} \[[a-z]* aborted\]: no such tag bill-clintons-chastity" cd ../.. rm -r 1 rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + ann-id) + # Demonstrate that cvs-1.9.28.1 improperly expands rcs keywords in + # the output of `cvs annotate' -- it uses values from the previous + # delta. In this case, `1.1' instead of `1.2', even though it puts + # the proper version number on the prefix to each line of output. + mkdir 1; cd 1 + dotest ann-id-1 "${testcvs} -q co -l ." '' + module=x + mkdir $module + dotest ann-id-2 "${testcvs} add $module" \ +"Directory ${TESTDIR}/cvsroot/$module added to the repository" + cd $module + + file=m + echo '$Id''$' > $file + + dotest ann-id-3 "$testcvs add $file" \ +"${PROG} [a-z]*: scheduling file .$file. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest ann-id-4 "$testcvs -Q ci -m . $file" \ +"RCS file: ${TESTDIR}/cvsroot/$module/$file,v +done +Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +initial revision: 1\.1 +done" + + echo line2 >> $file + dotest ann-id-5 "$testcvs -Q ci -m . $file" \ +"Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +new revision: 1\.2; previous revision: 1\.1 +done" + + # The version number after $file,v should be `1.2'. + # 1.9.28.1 puts `1.1' there. + dotest ann-id-6 "$testcvs -Q ann $file" \ +"Annotations for $file +\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* +1.2 ($username *[0-9a-zA-Z-]*): "'\$'"Id: $file,v 1.1 [0-9/]* [0-9:]* $username Exp "'\$'" +1.2 ($username *[0-9a-zA-Z-]*): line2" + + cd ../.. + rm -rf 1 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + crerepos) # Various tests relating to creating repositories, operating # on repositories created with old versions of CVS, etc. @@ -10673,7 +11457,7 @@ ${testcvs} -d ${TESTDIR}/crerepos release -d CVSROOT >>${LOGFILE}; then else fail crerepos-5 fi - rm -r CVS + rm -rf CVS cd .. # The directory tmp should be empty dotest crerepos-6 "rmdir tmp" '' @@ -10777,7 +11561,7 @@ U first-dir/file1" "${PROG} [a-z]*: Updating crerepos-dir U crerepos-dir/cfile" - if test x`cat CVS/Repository` = x.; then + if test x`cat crerepos-dir/CVS/Repository` = xcrerepos-dir; then # RELATIVE_REPOS # Fatal error so that we don't go traipsing through the # directories which happen to have the same names from the @@ -10984,8 +11768,33 @@ add file1 fail rcs-4 fi + # Intended behavior for "cvs annotate" is that it displays the + # last two digits of the year. Make sure it does that rather + # than some bogosity like "100". + dotest rcs-4a "${testcvs} annotate file1" \ +"Annotations for file1 +\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* +1\.1 (kingdon 24-Nov-96): This is the first line +1\.2 (kingdon 24-Nov-96): This is the third line +1\.2 (kingdon 24-Nov-96): This is the fourth line +1\.2 (kingdon 24-Nov-96): This is the fifth line +1\.2 (kingdon 24-Nov-96): This is the sixth line +1\.2 (kingdon 24-Nov-96): This is the seventh line +1\.2 (kingdon 24-Nov-96): This is the eighth line +1\.2 (kingdon 24-Nov-96): This is the ninth line +1\.2 (kingdon 24-Nov-96): This is the tenth line +1\.2 (kingdon 24-Nov-96): This is the eleventh line +1\.3 (kingdon 24-Nov-00): This is the twelfth line (and what a line it is) +1\.2 (kingdon 24-Nov-96): This is the thirteenth line" + + # Probably should split this test into two at this point (file1 + # above this line and file2 below), as the two share little + # data/setup. + # OK, here is another one. This one was written by hand based on - # doc/RCSFILES and friends. + # doc/RCSFILES and friends. One subtle point is that none of + # the lines end with newlines; that is a feature which we + # should be testing. cat <<EOF >${CVSROOT_DIRNAME}/first-dir/file2,v head 1.5 ; branch 1.2.6; @@ -11018,6 +11827,8 @@ start revision@ a1 1 branch revision@ EOF + # ' Match the single quote in above here doc -- for font-lock mode. + # First test the default branch. dotest rcs-5 "${testcvs} -q update file2" "U file2" dotest rcs-6 "cat file2" "branch revision" @@ -11160,10 +11971,6 @@ a1 1 next branch revision @" - # For remote, the "update -p -D" usage seems not to work. - # I'm not sure what is going on. - if test "x$remote" = "xno"; then - if ${testcvs} -q update -p -D '1970-12-31 11:30 UT' file2 \ >${TESTDIR}/rcs4.tmp then @@ -11206,8 +12013,6 @@ next branch revision fail rcs-13 fi - fi # end of tests skipped for remote - # OK, now make sure cvs log doesn't have any trouble with the # newphrases and such. dotest rcs-14 "${testcvs} -q log file2" " @@ -11258,6 +12063,145 @@ date: 1971/01/01 08:00:05; author: joe; state: Exp; lines: ${PLUS}1 -1 rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + rcs2) + # More date tests. Might as well do this as a separate + # test from "rcs", so that we don't need to perturb the + # "written by RCS 5.7" RCS file. + mkdir ${CVSROOT_DIRNAME}/first-dir + # Significance of various dates: + # * At least one Y2K standard refers to recognizing 9 Sep 1999 + # (as an example of a pre-2000 date, I guess). + # * At least one Y2K standard refers to recognizing 1 Jan 2001 + # (as an example of a post-2000 date, I guess). + # * Many Y2K standards refer to 2000 being a leap year. + cat <<EOF >${CVSROOT_DIRNAME}/first-dir/file1,v +head 1.7; access; symbols; locks; strict; +1.7 date 2004.08.31.01.01.01; author sue; state; branches; next 1.6; +1.6 date 2004.02.29.01.01.01; author sue; state; branches; next 1.5; +1.5 date 2003.02.28.01.01.01; author sue; state; branches; next 1.4; +1.4 date 2001.01.01.01.01.01; author sue; state; branches; next 1.3; +1.3 date 2000.02.29.01.01.01; author sue; state; branches; next 1.2; +1.2 date 99.09.09.01.01.01; author sue; state; branches; next 1.1; +1.1 date 98.09.10.01.01.01; author sue; state; branches; next; +desc @a test file@ +1.7 log @@ text @head revision@ +1.6 log @@ text @d1 1 +a1 1 +2004 was a great year for leaping@ +1.5 log @@ text @d1 1 +a1 1 +2003 wasn't@ +1.4 log @@ text @d1 1 +a1 1 +two year hiatus@ +1.3 log @@ text @d1 1 +a1 1 +2000 is also a good year for leaping@ +1.2 log @@ text @d1 1 +a1 1 +Tonight we're going to party like it's a certain year@ +1.1 log @@ text @d1 1 +a1 1 +Need to start somewhere@ +EOF + # ' Match the 3rd single quote in the here doc -- for font-lock mode. + + dotest rcs2-1 "${testcvs} -q co first-dir" 'U first-dir/file1' + cd first-dir + + # 9 Sep 1999 + if ${testcvs} -q update -p -D '1999-09-09 11:30 UT' file1 \ + >${TESTDIR}/rcs4.tmp + then + dotest rcs2-2 "cat ${TESTDIR}/rcs4.tmp" \ +"Tonight we're going to party like it's a certain year" + else + fail rcs2-2 + fi + # 1 Jan 2001. + if ${testcvs} -q update -p -D '2001-01-01 11:30 UT' file1 \ + >${TESTDIR}/rcs4.tmp + then + dotest rcs2-3 "cat ${TESTDIR}/rcs4.tmp" \ +"two year hiatus" + else + fail rcs2-3 + fi + # 29 Feb 2000 + if ${testcvs} -q update -p -D '2000-02-29 11:30 UT' file1 \ + >${TESTDIR}/rcs4.tmp + then + dotest rcs2-4 "cat ${TESTDIR}/rcs4.tmp" \ +"2000 is also a good year for leaping" + else + fail rcs2-4 + fi + # 29 Feb 2003 is invalid + if ${testcvs} -q update -p -D '2003-02-29 11:30 UT' file1 \ + >${TESTDIR}/rcs4.tmp 2>&1 + then + fail rcs2-5 + else + dotest rcs2-5 "cat ${TESTDIR}/rcs4.tmp" \ +"${PROG} \[[a-z]* aborted\]: Can't parse date/time: 2003-02-29 11:30 UT" + fi + rm ${TESTDIR}/rcs4.tmp + + cd .. + rm -r first-dir + rm -rf ${CVSROOT_DIRNAME}/first-dir + ;; + + history) + # CVSROOT/history tests: + # history: various "cvs history" invocations + # basic2: Generating the CVSROOT/history file via CVS commands. + + # Put in some data for the history file (discarding what was + # there before). Note that this file format is fixed; the + # user may wish to analyze data from a previous version of + # CVS. If we phase out this format, it should be done + # slowly and carefully. + cat >${CVSROOT_DIRNAME}/CVSROOT/history <<EOF +O3395c677|anonymous|<remote>/*0|ccvs||ccvs +M339cafae|nk|<remote>|ccvs/src|1.229|sanity.sh +M339dc339|kingdon|~/work/*0|ccvs/src|1.231|sanity.sh +W33a6eada|anonymous|<remote>*4|ccvs/emx||Makefile.in +C3b235f50|kingdon|<remote>|ccvs/emx|1.3|README +M3b23af50|kingdon|~/work/*0|ccvs/doc|1.281|cvs.texinfo +EOF + dotest history-1 "${testcvs} history -e -a" \ +"O 06/04 19:48 ${PLUS}0000 anonymous ccvs =ccvs= <remote>/\* +W 06/17 19:51 ${PLUS}0000 anonymous Makefile\.in ccvs/emx == <remote>/emx +M 06/10 21:12 ${PLUS}0000 kingdon 1\.231 sanity\.sh ccvs/src == ~/work/ccvs/src +C 06/10 11:51 ${PLUS}0000 kingdon 1\.3 README ccvs/emx == <remote> +M 06/10 17:33 ${PLUS}0000 kingdon 1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc +M 06/10 01:36 ${PLUS}0000 nk 1\.229 sanity\.sh ccvs/src == <remote>" + if ${testcvs} history -e -a -D '10 Jun 1997 13:00 UT' \ + >${TESTDIR}/output.tmp + then + dotest history-2 "cat ${TESTDIR}/output.tmp" \ +"W 06/17 19:51 ${PLUS}0000 anonymous Makefile\.in ccvs/emx == <remote>/emx +M 06/10 21:12 ${PLUS}0000 kingdon 1\.231 sanity\.sh ccvs/src == ~/work/ccvs/src +C 06/10 11:51 ${PLUS}0000 kingdon 1\.3 README ccvs/emx == <remote> +M 06/10 17:33 ${PLUS}0000 kingdon 1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc" + else + fail history-2 + fi + if ${testcvs} history -e -a -D '10 Jun 2001 13:00 UT' \ + >${TESTDIR}/output.tmp + then + # For reasons that are completely unclear to me, the number + # of spaces betwen "kingdon" and "1.281" is different than + # for the other tests. + dotest history-3 "cat ${TESTDIR}/output.tmp" \ +"M 06/10 17:33 ${PLUS}0000 kingdon 1\.281 cvs\.texinfo ccvs/doc == ~/work/ccvs/doc" + else + fail history-3 + fi + rm ${TESTDIR}/output.tmp + ;; + big) # Test ability to operate on big files. Intention is to @@ -11441,6 +12385,52 @@ done" # tests "should" not care about them... ;; + modes2) + # More tests of file permissions in the working directory + # and that sort of thing. + + # The usual setup, file first-dir/aa with two revisions. + mkdir 1; cd 1 + dotest modes2-1 "${testcvs} -q co -l ." '' + mkdir first-dir + dotest modes2-2 "${testcvs} add first-dir" \ +"Directory ${TESTDIR}/cvsroot/first-dir added to the repository" + cd first-dir + touch aa + dotest modes2-3 "${testcvs} add aa" \ +"${PROG} [a-z]*: scheduling file .aa. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest modes2-4 "${testcvs} -q ci -m add" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/aa,v +done +Checking in aa; +${TESTDIR}/cvsroot/first-dir/aa,v <-- aa +initial revision: 1\.1 +done" + echo "more money" >> aa + dotest modes2-5 "${testcvs} -q ci -m add" \ +"Checking in aa; +${TESTDIR}/cvsroot/first-dir/aa,v <-- aa +new revision: 1\.2; previous revision: 1\.1 +done" + + # OK, here is the test. The idea is to see what + # No_Difference does if it can't open the file. + # If we don't change the st_mtime, CVS doesn't even try to read + # the file. Note that some versions of "touch" require that we + # do this while the file is still writable. + touch aa + chmod a= aa + dotest_fail modes2-6 "${testcvs} -q update -r 1.1 aa" \ +"${PROG} \[update aborted\]: cannot open file aa for comparing: Permission denied" \ +"${PROG} \[update aborted\]: reading aa: Permission denied" + + chmod u+rwx aa + cd ../.. + rm -r 1 + rm -rf ${CVSROOT_DIRNAME}/first-dir + ;; + stamps) # Test timestamps. mkdir 1; cd 1 @@ -11581,6 +12571,202 @@ done" rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + perms) + # short cut around checking out and committing CVSROOT + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + + mkdir 1; cd 1 + dotest perms-1 "${testcvs} -q co -l ." '' + mkdir first-dir + dotest perms-2 "${testcvs} add first-dir" \ +"Directory ${TESTDIR}/cvsroot/first-dir added to the repository" + cd first-dir + + touch foo + chmod 431 foo + dotest perms-3 "${testcvs} add foo" \ +"${PROG} [a-z]*: scheduling file .foo. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest perms-4 "${testcvs} -q ci -m ''" \ +"RCS file: ${CVSROOT_DIRNAME}/first-dir/foo,v +done +Checking in foo; +${TESTDIR}/cvsroot/first-dir/foo,v <-- foo +initial revision: 1\.1 +done" + + # Test checking out files with different permissions. + cd ../.. + mkdir 2; cd 2 + dotest perms-5 "${testcvs} -q co first-dir" "U first-dir/foo" + cd first-dir + if test "$remote" = no; then + # PreservePermissions not yet implemented for remote. + dotest perms-6 "ls -l foo" "-r---wx--x .* foo" + fi + + cd ../.. + rm -rf 1 2 + rm -rf ${CVSROOT_DIRNAME}/first-dir + + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + touch ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + ;; + + symlinks) + # short cut around checking out and committing CVSROOT + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + + mkdir 1; cd 1 + dotest symlinks-1 "${testcvs} -q co -l ." '' + mkdir first-dir + dotest symlinks-2 "${testcvs} add first-dir" \ +"Directory ${TESTDIR}/cvsroot/first-dir added to the repository" + cd first-dir + + dotest symlinks-2.1 "ln -s ${TESTDIR}/fumble slink" "" + dotest symlinks-3 "${testcvs} add slink" \ +"${PROG} [a-z]*: scheduling file .slink. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + if test "$remote" = yes; then + # Remote doesn't implement PreservePermissions, and in its + # absence the correct behavior is to follow the symlink. + dotest_fail symlinks-4 "${testcvs} -q ci -m ''" \ +"${PROG} \[commit aborted\]: reading slink: No such file or directory" + else + dotest symlinks-4 "${testcvs} -q ci -m ''" \ +"RCS file: ${CVSROOT_DIRNAME}/first-dir/slink,v +done +Checking in slink; +${TESTDIR}/cvsroot/first-dir/slink,v <-- slink +initial revision: 1\.1 +done" + + # Test checking out symbolic links. + cd ../.. + mkdir 2; cd 2 + dotest symlinks-5 "${testcvs} -q co first-dir" "U first-dir/slink" + cd first-dir + dotest symlinks-6 "ls -l slink" \ +"l[rwx\-]* .* slink -> ${TESTDIR}/fumble" + fi + + cd ../.. + rm -rf 1 2 + rm -rf ${CVSROOT_DIRNAME}/first-dir + + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + touch ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + ;; + + hardlinks) + # short cut around checking out and committing CVSROOT + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + echo 'PreservePermissions=yes' > ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + + mkdir 1; cd 1 + dotest hardlinks-1 "${testcvs} -q co -l ." '' + mkdir first-dir + dotest hardlinks-2 "${testcvs} add first-dir" \ +"Directory ${TESTDIR}/cvsroot/first-dir added to the repository" + cd first-dir + + # Make up some ugly filenames, to test that they get + # encoded properly in the delta nodes. Note that `dotest' screws + # up if some arguments have embedded spaces. + if touch aaaa + then + pass hardlinks-2.1 + else + fail hardlinks-2.1 + fi + + if ln aaaa b.b.b.b + then + pass hardlinks-2.2 + else + fail hardlinks-2.2 + fi + + if ln aaaa 'dd dd dd' + then + pass hardlinks-2.3 + else + fail hardlinks-2.3 + fi + + dotest hardlinks-3 "${testcvs} add [abd]*" \ +"${PROG} [a-z]*: scheduling file .aaaa. for addition +${PROG} [a-z]*: scheduling file .b\.b\.b\.b. for addition +${PROG} [a-z]*: scheduling file .dd dd dd. for addition +${PROG} [a-z]*: use .${PROG} commit. to add these files permanently" + dotest hardlinks-4 "${testcvs} -q ci -m ''" \ +"RCS file: ${CVSROOT_DIRNAME}/first-dir/aaaa,v +done +Checking in aaaa; +${TESTDIR}/cvsroot/first-dir/aaaa,v <-- aaaa +initial revision: 1\.1 +done +RCS file: ${CVSROOT_DIRNAME}/first-dir/b\.b\.b\.b,v +done +Checking in b\.b\.b\.b; +${TESTDIR}/cvsroot/first-dir/b\.b\.b\.b,v <-- b\.b\.b\.b +initial revision: 1\.1 +done +RCS file: ${CVSROOT_DIRNAME}/first-dir/dd dd dd,v +done +Checking in dd dd dd; +${TESTDIR}/cvsroot/first-dir/dd dd dd,v <-- dd dd dd +initial revision: 1\.1 +done" + # Test checking out hardlinked files. + cd ../.. + mkdir 2; cd 2 + if test "$remote" = yes; then + # Remote does not implement PreservePermissions. + dotest hardlinks-5 "${testcvs} -q co first-dir" \ +"U first-dir/aaaa +U first-dir/b\.b\.b\.b +U first-dir/dd dd dd" + cd first-dir + dotest hardlinks-6 "ls -l [abd]*" \ +"-[rwx\-]* *1 .* aaaa +-[rwx\-]* *1 .* b\.b\.b\.b +-[rwx\-]* *1 .* dd dd dd" + else + dotest hardlinks-5 "${testcvs} -q co first-dir" \ +"U first-dir/aaaa +U first-dir/b\.b\.b\.b +U first-dir/dd dd dd" + cd first-dir + # To make sure that the files are properly hardlinked, it + # would be nice to do `ls -i' and make sure all the inodes + # match. But I think that would require expr to support + # tagged regexps, and I don't think we can rely on that. + # So instead we just see that each file has the right + # number of links. -twp + dotest hardlinks-6 "ls -l [abd]*" \ +"-[rwx\-]* *3 .* aaaa +-[rwx\-]* *3 .* b\.b\.b\.b +-[rwx\-]* *3 .* dd dd dd" + fi + + cd ../.. + rm -rf 1 2 + rm -rf ${CVSROOT_DIRNAME}/first-dir + + rm -f ${CVSROOT_DIRNAME}/CVSROOT/config + touch ${CVSROOT_DIRNAME}/CVSROOT/config + chmod 444 ${CVSROOT_DIRNAME}/CVSROOT/config + ;; + sticky) # More tests of sticky tags, particularly non-branch sticky tags. # See many tests (e.g. multibranch) for ordinary sticky tag @@ -12131,24 +13317,11 @@ add a line on trunk after trunktag" "imported contents add a line on trunk add a line on trunk after trunktag" - # But diff thinks that HEAD is "brtag". Case (c) from - # cvs.texinfo (the "strange, maybe accidental" case). - dotest_fail head-brtag-diff "${testcvs} -q diff -c -r HEAD -r br1" \ -"Index: file1 -=================================================================== -RCS file: ${TESTDIR}/cvsroot/first-dir/file1,v -retrieving revision 1\.3\.2\.1 -retrieving revision 1\.3\.2\.2 -diff -c -r1\.3\.2\.1 -r1\.3\.2\.2 -\*\*\* file1 [0-9/]* [0-9:]* 1\.3\.2\.1 ---- file1 [0-9/]* [0-9:]* 1\.3\.2\.2 -\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* -\*\*\* 2,4 \*\*\*\* ---- 2,5 ---- - add a line on trunk - add a line on trunk after trunktag - modify on branch -${PLUS} modify on branch after brtag" + + # CVS 1.9 and older thought that HEAD is "brtag" (this was + # noted as "strange, maybe accidental"). But "br1" makes a + # whole lot more sense. + dotest head-brtag-diff "${testcvs} -q diff -c -r HEAD -r br1" "" # With a nonbranch sticky tag on the trunk, HEAD is the head # of the trunk, I think. @@ -12160,24 +13333,23 @@ add a line on trunk" "imported contents add a line on trunk add a line on trunk after trunktag" - # Like head-brtag-diff, HEAD is the sticky tag. Similarly - # questionable. + # Like head-brtag-diff, there is a non-branch sticky tag. dotest_fail head-trunktag-diff \ "${testcvs} -q diff -c -r HEAD -r br1" \ "Index: file1 =================================================================== RCS file: ${TESTDIR}/cvsroot/first-dir/file1,v -retrieving revision 1\.2 +retrieving revision 1\.3 retrieving revision 1\.3\.2\.2 -diff -c -r1\.2 -r1\.3\.2\.2 -\*\*\* file1 [0-9/]* [0-9:]* 1\.2 +diff -c -r1\.3 -r1\.3\.2\.2 +\*\*\* file1 [0-9/]* [0-9:]* 1\.3 --- file1 [0-9/]* [0-9:]* 1\.3\.2\.2 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\* -\*\*\* 1,2 \*\*\*\* +\*\*\* 1,3 \*\*\*\* --- 1,5 ---- imported contents add a line on trunk -${PLUS} add a line on trunk after trunktag + add a line on trunk after trunktag ${PLUS} modify on branch ${PLUS} modify on branch after brtag" @@ -12390,6 +13562,91 @@ done" rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + tag8k) + # In cvs-1.9.27, there is a bug that can cause an abort. + # It happens when you commit a change to a ,v file that has + # just the right amount of tag/branch info to align one of the + # semicolons in the branch info to be on a 8k-byte boundary. + # The result: rcsbuf_getkey got an abort. This failure doesn't + # corrupt the ,v file -- that would be really serious. But it + # does leave stale write locks that have to be removed manually. + + mkdir 1 + cd 1 + + module=x + + : > junk + dotest tag8k-1 "$testcvs -Q import -m . $module X Y" '' + dotest tag8k-2 "$testcvs -Q co $module" '' + cd $module + + file=m + : > $file + dotest tag8k-3 "$testcvs add $file" \ +"${PROG} [a-z]*: scheduling file .$file. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + dotest tag8k-4 "$testcvs -Q ci -m . $file" \ +"RCS file: ${TESTDIR}/cvsroot/$module/$file,v +done +Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +initial revision: 1\.1 +done" + + # It seems there have to be at least two versions. + echo a > $file + dotest tag8k-5 "$testcvs -Q ci -m . $file" \ +"Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +new revision: 1\.2; previous revision: 1\.1 +done" + + # Add just under 8K worth of tags. + t=TAG--------------------------------------------------------------------- + t=$t$t + t=$t$t$t$t$t + # Now $t is 720 bytes long. + + # Apply some tags with that long prefix. + dotest tag8k-6 "$testcvs -Q tag $t-0 $file" '' + dotest tag8k-7 "$testcvs -Q tag $t-1 $file" '' + dotest tag8k-8 "$testcvs -Q tag $t-2 $file" '' + dotest tag8k-9 "$testcvs -Q tag $t-3 $file" '' + dotest tag8k-10 "$testcvs -Q tag $t-4 $file" '' + dotest tag8k-11 "$testcvs -Q tag $t-5 $file" '' + dotest tag8k-12 "$testcvs -Q tag $t-6 $file" '' + dotest tag8k-13 "$testcvs -Q tag $t-7 $file" '' + dotest tag8k-14 "$testcvs -Q tag $t-8 $file" '' + dotest tag8k-15 "$testcvs -Q tag $t-9 $file" '' + dotest tag8k-16 "$testcvs -Q tag $t-a $file" '' + + # Determine the length of the author value. + name=`sed -n 's/.*; author \([^;]*\);.*/\1/p' ${TESTDIR}/cvsroot/$module/$file,v|head -1` + name_len=`expr length $name` + + # CAREFUL: this will lose if $name is longer than 16. + # Then, form a string of length 16 - $name_len. + add_len=`expr 16 - $name_len` + suffix=`expr substr 1234567890123456 1 $add_len` + + # Add a final tag with length chosen so that it will push the + # offset of the `;' in the 2nd occurrence of `;\tauthor' in the + # ,v file to exactly 8192. + dotest tag8k-17 "$testcvs -Q tag "x8bytes-$suffix" $file" '' + + # This commit would fail with 1.9.27. + echo a >> $file + dotest tag8k-18 "$testcvs -Q ci -m . $file" \ +"Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +new revision: 1\.3; previous revision: 1\.2 +done" + cd ../.. + rm -r 1 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + admin) # More "cvs admin" tests. @@ -12401,6 +13658,7 @@ done" # For -o, see: # admin-22-o1 through admin-23 (various cases not involving ::) # binfiles2-o* (:rev, rev on trunk; rev:, deleting entire branch) + # basicb-o* (attempt to delete all revisions) # basica-o1 through basica-o3 (basic :: usage) # head-o1 (::branch, where this deletes a revision or is noop) # branches-o1 (::branch, similar, with different branch topology) @@ -12996,6 +14254,192 @@ text add a line on the branch @" + # Tests of cvs admin -n. Make use of the results of + # admin-1 through admin-25. + # FIXME: We probably shouldn't make use of those results; + # this test is way too long as it is. + + # tagtwo should be a revision + # + dotest admin-26-1 "${testcvs} admin -ntagtwo:tagone file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + # br1 should be a branch + # + dotest admin-26-2 "${testcvs} admin -nbr1:br file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + # Attach some tags using RCS versions + # + dotest admin-26-3 "${testcvs} admin -ntagthree:1.1 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + dotest admin-26-4 "${testcvs} admin -nbr2:1.1.2 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + dotest admin-26-5 "${testcvs} admin -nbr4:1.1.0.2 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + # Check results so far + # + dotest admin-26-6 "${testcvs} status -v file2" \ +"=================================================================== +File: file2 Status: Up-to-date + + Working revision: 1\.2.* + Repository revision: 1\.2 ${TESTDIR}/cvsroot/first-dir/file2,v + Sticky Tag: (none) + Sticky Date: (none) + Sticky Options: (none) + + Existing Tags: + br4 (branch: 1\.1\.2) + br2 (branch: 1\.1\.2) + tagthree (revision: 1\.1) + br1 (branch: 1\.1\.2) + tagtwo (revision: 1\.1) + tagone (revision: 1\.1) + br (branch: 1\.1\.2)" + + + # Add a couple more revisions + # + echo "nuthr_line" >> file2 + dotest admin-27-1 "${testcvs} commit -m nuthr_line file2" \ +"Checking in file2; +${TESTDIR}/cvsroot/first-dir/file2,v <-- file2 +new revision: 1\.3; previous revision: 1\.2 +done" + + echo "yet_another" >> file2 + dotest admin-27-2 "${testcvs} commit -m yet_another file2" \ +"Checking in file2; +${TESTDIR}/cvsroot/first-dir/file2,v <-- file2 +new revision: 1\.4; previous revision: 1\.3 +done" + + # Fail trying to reattach existing tag with -n + # + dotest admin-27-3 "${testcvs} admin -ntagfour:1.1 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + dotest_fail admin-27-4 "${testcvs} admin -ntagfour:1.3 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} [a-z]*: ${TESTDIR}/cvsroot/first-dir/file2,v: symbolic name tagfour already bound to 1\.1 +${PROG} [a-z]*: cannot modify RCS file for .file2." + + # Succeed at reattaching existing tag, using -N + # + dotest admin-27-5 "${testcvs} admin -Ntagfour:1.3 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +done" + + # Fail on some bogus operations + # Try to attach to nonexistant tag + # + dotest_fail admin-28-1 "${testcvs} admin -ntagsix:tagfive file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: tag .tagfive. does not exist" + + # Try a some nonexisting numeric target tags + # + dotest_fail admin-28-2 "${testcvs} admin -ntagseven:2.1 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: revision .2\.1. does not exist" + + dotest_fail admin-28-3 "${testcvs} admin -ntageight:2.1.2 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: revision .2\.1\.2. does not exist" + + # Try some invalid targets + # + dotest_fail admin-28-4 "${testcvs} admin -ntagnine:1.a.2 file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: tag .1\.a\.2. must start with a letter" + + dotest_fail admin-28-5 "${testcvs} admin -ntagten:BO+GUS file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: tag .BO${PLUS}GUS. does not exist" + + dotest_fail admin-28-6 "${testcvs} admin -nq.werty:tagfour file2" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/file2,v +${PROG} \[[a-z]* aborted\]: tag .q\.werty. must not contain the characters ..*" + + # Verify the archive + # + dotest admin-29 "cat ${TESTDIR}/cvsroot/first-dir/file2,v" \ +"head 1\.4; +access + auth3 + auth2 + foo; +symbols + tagfour:1\.3 + br4:1\.1\.0\.2 + br2:1\.1\.0\.2 + tagthree:1\.1 + br1:1\.1\.0\.2 + tagtwo:1\.1 + tagone:1\.1 + br:1\.1\.0\.2; +locks; strict; +comment @# @; + + +1\.4 +date [0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]; author ${username}; state Exp; +branches; +next 1\.3; + +1\.3 +date [0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]; author ${username}; state Exp; +branches; +next 1\.2; + +1\.2 +date [0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]; author ${username}; state Exp; +branches; +next ; + + +desc +@@ + + +1\.4 +log +@yet_another +@ +text +@add a line +nuthr_line +yet_another +@ + + +1\.3 +log +@nuthr_line +@ +text +@d3 1 +@ + + +1\.2 +log +@modify +@ +text +@d2 1 +@" + cd ../.. rm -r 1 rm -rf ${CVSROOT_DIRNAME}/first-dir @@ -13141,6 +14585,11 @@ ${PROG} [a-z]*: Rebuilding administrative file database" "fred has file a-lock locked for version 1\.1 ${PROG} [a-z]*: Pre-commit check failed ${PROG} \[[a-z]* aborted\]: correct above errors first!" + # OK, now test "cvs admin -l" in the case where someone + # else has the file locked. + dotest_fail reserved-13c "${testcvs} admin -l a-lock" \ +"RCS file: ${TESTDIR}/cvsroot/first-dir/a-lock,v +${PROG} \[[a-z]* aborted\]: Revision 1\.1 is already locked by fred" dotest reserved-14 "${testcvs} admin -u1.1 a-lock" \ "RCS file: ${TESTDIR}/cvsroot/first-dir/a-lock,v @@ -13152,10 +14601,25 @@ ${TESTDIR}/cvsroot/first-dir/a-lock,v <-- a-lock new revision: 1\.2; previous revision: 1\.1 done" + # Now test for a bug involving branches and locks + sed -e 's/locks; strict;/locks fred:1.2; strict;/' ${TESTDIR}/cvsroot/first-dir/a-lock,v > a-lock,v + chmod 644 ${TESTDIR}/cvsroot/first-dir/a-lock,v + dotest reserved-16 \ +"mv a-lock,v ${TESTDIR}/cvsroot/first-dir/a-lock,v" "" + chmod 444 ${TESTDIR}/cvsroot/first-dir/a-lock,v + dotest reserved-17 "${testcvs} -q tag -b br a-lock" "T a-lock" + dotest reserved-18 "${testcvs} -q update -r br a-lock" "" + echo edit it >>a-lock + dotest reserved-19 "${testcvs} -q ci -m modify a-lock" \ +"Checking in a-lock; +${TESTDIR}/cvsroot/first-dir/a-lock,v <-- a-lock +new revision: 1\.2\.2\.1; previous revision: 1\.2 +done" + # undo commitinfo changes cd ../CVSROOT echo '# vanilla commitinfo' >commitinfo - dotest reserved-16 "${testcvs} -q ci -m back commitinfo" \ + dotest reserved-cleanup-1 "${testcvs} -q ci -m back commitinfo" \ "Checking in commitinfo; ${TESTDIR}/cvsroot/CVSROOT/commitinfo,v <-- commitinfo new revision: 1\.3; previous revision: 1\.2 |
