equal
deleted
inserted
replaced
3 "$TESTDIR/hghave" cvs || exit 80 |
3 "$TESTDIR/hghave" cvs || exit 80 |
4 |
4 |
5 cvscall() |
5 cvscall() |
6 { |
6 { |
7 cvs -f "$@" |
7 cvs -f "$@" |
|
8 } |
|
9 |
|
10 hgcat() |
|
11 { |
|
12 hg --cwd src-hg cat -r tip "$1" |
8 } |
13 } |
9 |
14 |
10 echo "[extensions]" >> $HGRCPATH |
15 echo "[extensions]" >> $HGRCPATH |
11 echo "convert = " >> $HGRCPATH |
16 echo "convert = " >> $HGRCPATH |
12 echo "graphlog = " >> $HGRCPATH |
17 echo "graphlog = " >> $HGRCPATH |
46 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
51 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
47 cd .. |
52 cd .. |
48 |
53 |
49 echo % convert fresh repo |
54 echo % convert fresh repo |
50 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
55 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
51 cat src-hg/a |
56 hgcat a |
52 cat src-hg/b/c |
57 hgcat b/c |
53 |
58 |
54 echo % convert fresh repo with --filemap |
59 echo % convert fresh repo with --filemap |
55 echo include b/c > filemap |
60 echo include b/c > filemap |
56 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
61 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
57 cat src-hg/b/c |
62 hgcat b/c |
58 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
63 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
59 |
64 |
60 echo % commit new file revisions |
65 echo % commit new file revisions |
61 cd src |
66 cd src |
62 echo a >> a |
67 echo a >> a |
65 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
70 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
66 cd .. |
71 cd .. |
67 |
72 |
68 echo % convert again |
73 echo % convert again |
69 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
74 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
70 cat src-hg/a |
75 hgcat a |
71 cat src-hg/b/c |
76 hgcat b/c |
72 |
77 |
73 echo % convert again with --filemap |
78 echo % convert again with --filemap |
74 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
79 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
75 cat src-hg/b/c |
80 hgcat b/c |
76 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
81 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
77 |
82 |
78 echo % commit branch |
83 echo % commit branch |
79 cd src |
84 cd src |
80 cvs -q update -r1.1 b/c |
85 cvs -q update -r1.1 b/c |
85 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
90 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
86 cd .. |
91 cd .. |
87 |
92 |
88 echo % convert again |
93 echo % convert again |
89 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
94 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
90 cat src-hg/a |
95 hgcat a |
91 cat src-hg/b/c |
96 hgcat b/c |
92 |
97 |
93 echo % convert again with --filemap |
98 echo % convert again with --filemap |
94 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
99 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' |
95 cat src-hg/b/c |
100 hgcat b/c |
96 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
101 hg -R src-filemap log --template '#rev# #desc# files: #files#\n' |
97 |
102 |
98 echo "graphlog = " >> $HGRCPATH |
103 echo "graphlog = " >> $HGRCPATH |
99 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n' |
104 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n' |