test: added testcase for cvsps log message lookahead

tests/test-convert-cvs-builtincvsps

@@ -1,108 +1,121
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 hgcat()
 {
     hg --cwd src-hg cat -r tip "$1"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
 export CVSROOT=`pwd`
 export CVS_OPTIONS=-f
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
 cd src-temp
 echo a > a
 mkdir b
 cd b
 echo c > c
 cd ..
 
 echo % import source directory
 cvscall -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
 cvscall -q checkout src
 
 echo % commit a new revision changing b/c
 cd src
 sleep 1
 echo c >> b/c
 cvscall -q commit -mci0 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert fresh repo
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert fresh repo with --filemap
 echo include b/c > filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit new file revisions
 cd src
 echo a >> a
 echo c >> b/c
 cvscall -q commit -mci1 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit branch
 cd src
 cvs -q update -r1.1 b/c
 cvs -q tag -b branch
 cvs -q update -r branch
 echo d >> b/c
 cvs -q commit -mci2 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat a
 hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
+echo % commit a new revision with funny log message
+cd src
+sleep 1
+echo e >> a
+cvscall -q commit -m'funny
+----------------------------
+log message' . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
+cd ..
+
+echo % convert again
+hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
+
 echo "graphlog = " >> $HGRCPATH
 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
 
 echo % testing debugcvsps
 cd src
 hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' 

tests/test-convert-cvs-builtincvsps.out

@@ -1,206 +1,236
 % create cvs repository
 % create source directory
 % import source directory
 N src/a
 N src/b/c
 
 No conflicts created by this import
 
 % checkout source directory
 U src/a
 U src/b/c
 % commit a new revision changing b/c
 checking in src/b/c,v
 % convert fresh repo
 initializing destination src-hg repository
 using builtin cvsps
 collecting CVS rlog
 5 log entries
 creating changesets
 3 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 2 Initial revision
 1 import
 0 ci0
 updating tags
 a
 c
 c
 % convert fresh repo with --filemap
 initializing destination src-filemap repository
 using builtin cvsps
 collecting CVS rlog
 5 log entries
 creating changesets
 3 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 2 Initial revision
 1 import
 rolling back last transaction
 0 ci0
 updating tags
 c
 c
 2 update tags files: .hgtags
 1 ci0 files: b/c
 0 Initial revision files: b/c
 % commit new file revisions
 checking in src/a,v
 checking in src/b/c,v
 % convert again
 using builtin cvsps
 collecting CVS rlog
 7 log entries
 creating changesets
 4 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 0 ci1
 a
 a
 c
 c
 c
 % convert again with --filemap
 using builtin cvsps
 collecting CVS rlog
 7 log entries
 creating changesets
 4 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 0 ci1
 c
 c
 c
 3 ci1 files: b/c
 2 update tags files: .hgtags
 1 ci0 files: b/c
 0 Initial revision files: b/c
 % commit branch
 U b/c
 T a
 T b/c
 checking in src/b/c,v
 % convert again
 using builtin cvsps
 collecting CVS rlog
 8 log entries
 creating changesets
 5 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 0 ci2
 a
 c
 d
 % convert again with --filemap
 using builtin cvsps
 collecting CVS rlog
 8 log entries
 creating changesets
 5 changeset entries
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 0 ci2
 c
 d
 4 ci2 files: b/c
 3 ci1 files: b/c
 2 update tags files: .hgtags
 1 ci0 files: b/c
 0 Initial revision files: b/c
+% commit a new revision with funny log message
+checking in src/a,v
+% convert again
+using builtin cvsps
+collecting CVS rlog
+9 log entries
+creating changesets
+6 changeset entries
+connecting to cvsrepo
+scanning source...
+sorting...
+converting...
+0 funny
+o  6 (branch) funny
+|  ----------------------------
+|  log message files: a
 o  5 (branch) ci2 files: b/c
 |
 | o  4 () ci1 files: a b/c
 | |
 | o  3 () update tags files: .hgtags
 | |
 | o  2 () ci0 files: b/c
 |/
 | o  1 (INITIAL) import files:
 |/
 o  0 () Initial revision files: a b/c
 
 % testing debugcvsps
 collecting CVS rlog
-8 log entries
+9 log entries
 creating changesets
-5 changeset entries
+6 changeset entries
 ---------------------
 PatchSet 1 
 Date:
 Author:
 Branch: HEAD
 Tag: (none) 
 Log:
 Initial revision
 
 Members: 
 	a:INITIAL->1.1 
 	b/c:INITIAL->1.1 
 
 ---------------------
 PatchSet 2 
 Date:
 Author:
 Branch: INITIAL
 Tag: start 
 Log:
 import
 
 Members: 
 	a:1.1->1.1.1.1 
 	b/c:1.1->1.1.1.1 
 
 ---------------------
 PatchSet 3 
 Date:
 Author:
 Branch: HEAD
 Tag: (none) 
 Log:
 ci0
 
 Members: 
 	b/c:1.1->1.2 
 
 ---------------------
 PatchSet 4 
 Date:
 Author:
 Branch: HEAD
 Tag: (none) 
 Log:
 ci1
 
 Members: 
 	a:1.1->1.2 
 	b/c:1.2->1.3 
 
 ---------------------
 PatchSet 5 
 Date:
 Author:
 Branch: branch
 Tag: (none) 
 Log:
 ci2
 
 Members: 
 	b/c:1.1->1.1.2.1 
 
+---------------------
+PatchSet 6 
+Date:
+Author:
+Branch: branch
+Tag: (none) 
+Log:
+funny
+----------------------------
+log message
+
+Members: 
+	a:1.2->1.2.2.1 
+