tests: update test-convert-cvs*.t

The preceding commit caused their outputs to change.

tests/test-convert-cvs-synthetic.t

@@ -1,217 +1,223
 This feature requires use of builtin cvsps!
 
   $ "$TESTDIR/hghave" cvs || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert = " >> $HGRCPATH
   $ echo "graphlog = " >> $HGRCPATH
 
 create cvs repository with one project
 
   $ mkdir cvsrepo
   $ cd cvsrepo
   $ CVSROOT=`pwd`
   $ export CVSROOT
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
   $ cvscall()
   > {
   >     cvs -f "$@"
   > }
 
 output of 'cvs ci' varies unpredictably, so just discard it
 
   $ cvsci()
   > {
   >     sleep 1
   >     cvs -f ci "$@" >/dev/null
   > }
   $ cvscall -d "$CVSROOT" init
   $ mkdir cvsrepo/proj
   $ cvscall -q co proj
 
 create file1 on the trunk
 
   $ cd proj
   $ touch file1
   $ cvscall -Q add file1
   $ cvsci -m"add file1 on trunk" file1
 
 create two branches
 
   $ cvscall -q tag -b v1_0
   T file1
   $ cvscall -q tag -b v1_1
   T file1
 
 create file2 on branch v1_0
 
   $ cvscall -Q up -rv1_0
   $ touch file2
   $ cvscall -Q add file2
   $ cvsci -m"add file2" file2
 
 create file3, file4 on branch v1_1
 
   $ cvscall -Q up -rv1_1
   $ touch file3
   $ touch file4
   $ cvscall -Q add file3 file4
   $ cvsci -m"add file3, file4 on branch v1_1" file3 file4
 
 merge file2 from v1_0 to v1_1
 
   $ cvscall -Q up -jv1_0
   $ cvsci -m"MERGE from v1_0: add file2"
   cvs commit: Examining .
 
 Step things up a notch: now we make the history really hairy, with
 changes bouncing back and forth between trunk and v1_2 and merges
 going both ways.  (I.e., try to model the real world.)
 create branch v1_2
 
   $ cvscall -Q up -A
   $ cvscall -q tag -b v1_2
   T file1
 
 create file5 on branch v1_2
 
   $ cvscall -Q up -rv1_2
   $ touch file5
   $ cvs -Q add file5
   $ cvsci -m"add file5 on v1_2"
   cvs commit: Examining .
 
 create file6 on trunk post-v1_2
 
   $ cvscall -Q up -A
   $ touch file6
   $ cvscall -Q add file6
   $ cvsci -m"add file6 on trunk post-v1_2"
   cvs commit: Examining .
 
 merge file5 from v1_2 to trunk
 
   $ cvscall -Q up -A
   $ cvscall -Q up -jv1_2 file5
   $ cvsci -m"MERGE from v1_2: add file5"
   cvs commit: Examining .
 
 merge file6 from trunk to v1_2
 
   $ cvscall -Q up -rv1_2
   $ cvscall up -jHEAD file6
   U file6
   $ cvsci -m"MERGE from HEAD: add file6"
   cvs commit: Examining .
 
 cvs rlog output
 
   $ cvscall -q rlog proj | egrep '^(RCS file|revision)'
   RCS file: $TESTTMP/cvsrepo/proj/file1,v
   revision 1.1
   RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v
   revision 1.1
   revision 1.1.4.2
   revision 1.1.4.1
   revision 1.1.2.1
   RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v
   revision 1.1
   revision 1.1.2.1
   RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v
   revision 1.1
   revision 1.1.2.1
   RCS file: $TESTTMP/cvsrepo/proj/file5,v
   revision 1.2
   revision 1.1
   revision 1.1.2.1
   RCS file: $TESTTMP/cvsrepo/proj/file6,v
   revision 1.1
   revision 1.1.2.2
   revision 1.1.2.1
 
 convert to hg (#1)
 
   $ cd ..
   $ hg convert --datesort proj proj.hg
   initializing destination proj.hg repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   15 log entries
   creating changesets
-  8 changeset entries
+  9 changeset entries
   sorting...
   converting...
-  7 add file1 on trunk
-  6 add file2
-  5 add file3, file4 on branch v1_1
-  4 MERGE from v1_0: add file2
+  8 add file1 on trunk
+  7 add file2
+  6 MERGE from v1_0: add file2
+  5 file file3 was initially added on branch v1_1.
+  4 add file3, file4 on branch v1_1
   3 add file5 on v1_2
   2 add file6 on trunk post-v1_2
-  1 MERGE from v1_2: add file5
-  0 MERGE from HEAD: add file6
+  1 MERGE from HEAD: add file6
+  0 MERGE from v1_2: add file5
 
 hg glog output (#1)
 
   $ hg -R proj.hg glog --template "{rev} {desc}\n"
-  o  7 MERGE from HEAD: add file6
+  o  8 MERGE from v1_2: add file5
   |
-  | o  6 MERGE from v1_2: add file5
+  | o  7 MERGE from HEAD: add file6
   | |
-  | o  5 add file6 on trunk post-v1_2
+  o |  6 add file6 on trunk post-v1_2
   | |
-  o |  4 add file5 on v1_2
-  |/
-  | o  3 MERGE from v1_0: add file2
+  | o  5 add file5 on v1_2
   | |
-  | o  2 add file3, file4 on branch v1_1
+  | | o  4 add file3, file4 on branch v1_1
+  | | |
+  o | |  3 file file3 was initially added on branch v1_1.
+  |/ /
+  | o  2 MERGE from v1_0: add file2
   |/
   | o  1 add file2
   |/
   o  0 add file1 on trunk
   
 
 convert to hg (#2: with merge detection)
 
   $ hg convert \
   >   --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \
   >   --datesort \
   >   proj proj.hg2
   initializing destination proj.hg2 repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   15 log entries
   creating changesets
-  8 changeset entries
+  9 changeset entries
   sorting...
   converting...
-  7 add file1 on trunk
-  6 add file2
-  5 add file3, file4 on branch v1_1
-  4 MERGE from v1_0: add file2
+  8 add file1 on trunk
+  7 add file2
+  6 MERGE from v1_0: add file2
+  5 file file3 was initially added on branch v1_1.
+  4 add file3, file4 on branch v1_1
   3 add file5 on v1_2
   2 add file6 on trunk post-v1_2
-  1 MERGE from v1_2: add file5
-  0 MERGE from HEAD: add file6
+  1 MERGE from HEAD: add file6
+  0 MERGE from v1_2: add file5
 
 hg glog output (#2)
 
   $ hg -R proj.hg2 glog --template "{rev} {desc}\n"
-  o  7 MERGE from HEAD: add file6
+  o  8 MERGE from v1_2: add file5
   |
-  | o  6 MERGE from v1_2: add file5
+  | o  7 MERGE from HEAD: add file6
   | |
-  | o  5 add file6 on trunk post-v1_2
+  o |  6 add file6 on trunk post-v1_2
   | |
-  o |  4 add file5 on v1_2
-  |/
-  | o  3 MERGE from v1_0: add file2
+  | o  5 add file5 on v1_2
   | |
-  | o  2 add file3, file4 on branch v1_1
+  | | o  4 add file3, file4 on branch v1_1
+  | | |
+  o | |  3 file file3 was initially added on branch v1_1.
+  |/ /
+  | o  2 MERGE from v1_0: add file2
   |/
   | o  1 add file2
   |/
   o  0 add file1 on trunk
   

tests/test-convert-cvs.t

@@ -1,468 +1,468
 
   $ "$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
   $ cat > cvshooks.py <<EOF
   > def cvslog(ui,repo,hooktype,log):
   >     print "%s hook: %d entries"%(hooktype,len(log))
   > 
   > def cvschangesets(ui,repo,hooktype,changesets):
   >     print "%s hook: %d changesets"%(hooktype,len(changesets))
   > EOF
   $ hookpath=`pwd`
   $ echo "[hooks]" >> $HGRCPATH
   $ echo "cvslog=python:$hookpath/cvshooks.py:cvslog" >> $HGRCPATH
   $ echo "cvschangesets=python:$hookpath/cvshooks.py:cvschangesets" >> $HGRCPATH
 
 create cvs repository
 
   $ mkdir cvsrepo
   $ cd cvsrepo
   $ CVSROOT=`pwd`
   $ export CVSROOT
   $ CVS_OPTIONS=-f
   $ export CVS_OPTIONS
   $ cd ..
   $ cvscall -q -d "$CVSROOT" init
 
 create source directory
 
   $ mkdir src-temp
   $ cd src-temp
   $ echo a > a
   $ mkdir b
   $ cd b
   $ echo c > c
   $ cd ..
 
 import source directory
 
   $ cvscall -q import -m import src INITIAL start
   N src/a
   N src/b/c
   
   No conflicts created by this import
   
   $ cd ..
 
 checkout source directory
 
   $ cvscall -q checkout src
   U src/a
   U src/b/c
 
 commit a new revision changing b/c
 
   $ cd src
   $ sleep 1
   $ echo c >> b/c
   $ cvscall -q commit -mci0 . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert fresh repo and also check localtimezone option
 
 NOTE: This doesn't check all time zones -- it merely determines that
 the configuration option is taking effect.
 
 An arbitrary (U.S.) time zone is used here.  TZ=US/Hawaii is selected
 since it does not use DST (unlike other U.S. time zones) and is always
 a fixed difference from UTC.
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
   initializing destination src-hg repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   5 log entries
   cvslog hook: 5 entries
   creating changesets
   3 changeset entries
   cvschangesets hook: 3 changesets
   sorting...
   converting...
   2 Initial revision
   1 import
   0 ci0
   updating tags
   $ hgcat a
   a
   $ hgcat b/c
   c
   c
 
 convert fresh repo with --filemap
 
   $ echo include b/c > filemap
   $ hg convert --filemap filemap src src-filemap
   initializing destination src-filemap repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   5 log entries
   cvslog hook: 5 entries
   creating changesets
   3 changeset entries
   cvschangesets hook: 3 changesets
   sorting...
   converting...
   2 Initial revision
   1 import
   filtering out empty revision
   repository tip rolled back to revision 0 (undo commit)
   0 ci0
   updating tags
   $ hgcat b/c
   c
   c
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   2 update tags files: .hgtags
   1 ci0 files: b/c
   0 Initial revision files: b/c
 
 convert full repository (issue1649)
 
   $ cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT
   U srcfull/src/a
   U srcfull/src/b/c
   $ ls srcfull
   CVS
   CVSROOT
   src
   $ hg convert srcfull srcfull-hg \
   >     | grep -v 'log entries' | grep -v 'hook:' \
   >     | grep -v '^[0-3] .*' # filter instable changeset order
   initializing destination srcfull-hg repository
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   creating changesets
   4 changeset entries
   sorting...
   converting...
   updating tags
   $ hg cat -r tip --cwd srcfull-hg src/a
   a
   $ hg cat -r tip --cwd srcfull-hg src/b/c
   c
   c
 
 commit new file revisions
 
   $ cd src
   $ echo a >> a
   $ echo c >> b/c
   $ cvscall -q commit -mci1 . | grep '<--'
   $TESTTMP/cvsrepo/src/a,v  <--  a
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   7 log entries
   cvslog hook: 7 entries
   creating changesets
   4 changeset entries
   cvschangesets hook: 4 changesets
   sorting...
   converting...
   0 ci1
   $ hgcat a
   a
   a
   $ hgcat b/c
   c
   c
   c
 
 convert again with --filemap
 
   $ hg convert --filemap filemap src src-filemap
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   7 log entries
   cvslog hook: 7 entries
   creating changesets
   4 changeset entries
   cvschangesets hook: 4 changesets
   sorting...
   converting...
   0 ci1
   $ hgcat b/c
   c
   c
   c
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   3 ci1 files: b/c
   2 update tags files: .hgtags
   1 ci0 files: b/c
   0 Initial revision files: b/c
 
 commit branch
 
   $ cd src
   $ cvs -q update -r1.1 b/c
   U b/c
   $ cvs -q tag -b branch
   T a
   T b/c
   $ cvs -q update -r branch > /dev/null
   $ echo d >> b/c
   $ cvs -q commit -mci2 . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   8 log entries
   cvslog hook: 8 entries
   creating changesets
   5 changeset entries
   cvschangesets hook: 5 changesets
   sorting...
   converting...
   0 ci2
   $ hgcat b/c
   c
   d
 
 convert again with --filemap
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True --filemap filemap src src-filemap
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   8 log entries
   cvslog hook: 8 entries
   creating changesets
   5 changeset entries
   cvschangesets hook: 5 changesets
   sorting...
   converting...
   0 ci2
   $ hgcat b/c
   c
   d
   $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
   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
 
   $ 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'
   checking in src/a,v
 
 commit new file revisions with some fuzz
 
   $ sleep 1
   $ echo f >> a
   $ cvscall -q commit -mfuzzy . | grep '<--'
   $TESTTMP/cvsrepo/src/a,v  <--  a
   $ sleep 4 # the two changes will be split if fuzz < 4
   $ echo g >> b/c
   $ cvscall -q commit -mfuzzy . | grep '<--'
   $TESTTMP/cvsrepo/src/b/c,v  <--  *c (glob)
   $ cd ..
 
 convert again
 
   $ TZ=US/Hawaii hg convert --config convert.cvsps.fuzz=2 --config convert.localtimezone=True src src-hg
   connecting to $TESTTMP/cvsrepo
   scanning source...
   collecting CVS rlog
   11 log entries
   cvslog hook: 11 entries
   creating changesets
   8 changeset entries
   cvschangesets hook: 8 changesets
   sorting...
   converting...
   2 funny
   1 fuzzy
   0 fuzzy
   $ hg -R src-hg glog --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n'
   o  8 (branch) fuzzy date: * -1000 files: b/c (glob)
   |
   o  7 (branch) fuzzy date: * -1000 files: a (glob)
   |
   o  6 (branch) funny
   |  ----------------------------
   |  log message date: * -1000 files: a (glob)
   o  5 (branch) ci2 date: * -1000 files: b/c (glob)
   
   o  4 () ci1 date: * -1000 files: a b/c (glob)
   |
   o  3 () update tags date: * +0000 files: .hgtags (glob)
   |
   o  2 () ci0 date: * -1000 files: b/c (glob)
   |
   | o  1 (INITIAL) import date: * -1000 files: (glob)
   |/
   o  0 () Initial revision date: * -1000 files: a b/c (glob)
   
 
 testing debugcvsps
 
   $ cd src
   $ hg debugcvsps --fuzz=2
   collecting CVS rlog
   11 log entries
   cvslog hook: 11 entries
   creating changesets
   10 changeset entries
   cvschangesets hook: 10 changesets
   ---------------------
   PatchSet 1 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Branchpoints: INITIAL 
   Log:
   Initial revision
   
   Members: 
   	a:INITIAL->1.1 
   
   ---------------------
   PatchSet 2 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Branchpoints: INITIAL, branch 
   Log:
   Initial revision
   
   Members: 
   	b/c:INITIAL->1.1 
   
   ---------------------
   PatchSet 3 
   Date: * (glob)
   Author: * (glob)
   Branch: INITIAL
   Tag: start 
   Log:
   import
   
   Members: 
   	a:1.1->1.1.1.1 
   	b/c:1.1->1.1.1.1 
   
   ---------------------
   PatchSet 4 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
   Log:
   ci0
   
   Members: 
   	b/c:1.1->1.2 
   
   ---------------------
   PatchSet 5 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
-  Branchpoints: branch 
   Log:
   ci1
   
   Members: 
-  	a:1.1->1.2 
+  	b/c:1.2->1.3 
   
   ---------------------
   PatchSet 6 
   Date: * (glob)
   Author: * (glob)
   Branch: HEAD
   Tag: (none) 
+  Branchpoints: branch 
   Log:
   ci1
   
   Members: 
-  	b/c:1.2->1.3 
+  	a:1.1->1.2 
   
   ---------------------
   PatchSet 7 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   ci2
   
   Members: 
   	b/c:1.1->1.1.2.1 
   
   ---------------------
   PatchSet 8 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   funny
   ----------------------------
   log message
   
   Members: 
   	a:1.2->1.2.2.1 
   
   ---------------------
   PatchSet 9 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   fuzzy
   
   Members: 
   	a:1.2.2.1->1.2.2.2 
   
   ---------------------
   PatchSet 10 
   Date: * (glob)
   Author: * (glob)
   Branch: branch
   Tag: (none) 
   Log:
   fuzzy
   
   Members: 
   	b/c:1.1.2.1->1.1.2.2 
   
 
   $ cd ..