]>
Commit | Line | Data |
---|---|---|
795c7c0b JK |
1 | #!/bin/sh |
2 | ||
f964732c | 3 | test_description='git cvsimport basic tests' |
535bb893 | 4 | . ./lib-cvs.sh |
795c7c0b | 5 | |
40ae8872 FL |
6 | CVSROOT=$(pwd)/cvsroot |
7 | export CVSROOT | |
dcbcb707 | 8 | |
161261b1 | 9 | test_expect_success 'setup cvsroot' '$CVS init' |
795c7c0b JK |
10 | |
11 | test_expect_success 'setup a cvs module' ' | |
12 | ||
f69e836f | 13 | mkdir "$CVSROOT/module" && |
161261b1 | 14 | $CVS co -d module-cvs module && |
795c7c0b JK |
15 | cd module-cvs && |
16 | cat <<EOF >o_fortuna && | |
17 | O Fortuna | |
18 | velut luna | |
19 | statu variabilis, | |
20 | ||
21 | semper crescis | |
22 | aut decrescis; | |
23 | vita detestabilis | |
24 | ||
25 | nunc obdurat | |
26 | et tunc curat | |
27 | ludo mentis aciem, | |
28 | ||
29 | egestatem, | |
30 | potestatem | |
31 | dissolvit ut glaciem. | |
32 | EOF | |
161261b1 | 33 | $CVS add o_fortuna && |
795c7c0b JK |
34 | cat <<EOF >message && |
35 | add "O Fortuna" lyrics | |
36 | ||
37 | These public domain lyrics make an excellent sample text. | |
38 | EOF | |
161261b1 | 39 | $CVS commit -F message && |
795c7c0b JK |
40 | cd .. |
41 | ' | |
42 | ||
43 | test_expect_success 'import a trivial module' ' | |
44 | ||
45 | git cvsimport -a -z 0 -C module-git module && | |
3af82863 | 46 | test_cmp module-cvs/o_fortuna module-git/o_fortuna |
795c7c0b JK |
47 | |
48 | ' | |
49 | ||
9da0dabc JK |
50 | test_expect_success 'pack refs' 'cd module-git && git gc && cd ..' |
51 | ||
795c7c0b JK |
52 | test_expect_success 'update cvs module' ' |
53 | ||
54 | cd module-cvs && | |
55 | cat <<EOF >o_fortuna && | |
56 | O Fortune, | |
57 | like the moon | |
58 | you are changeable, | |
59 | ||
60 | ever waxing | |
61 | and waning; | |
62 | hateful life | |
63 | ||
64 | first oppresses | |
65 | and then soothes | |
66 | as fancy takes it; | |
67 | ||
68 | poverty | |
69 | and power | |
70 | it melts them like ice. | |
71 | EOF | |
72 | cat <<EOF >message && | |
73 | translate to English | |
74 | ||
75 | My Latin is terrible. | |
76 | EOF | |
161261b1 | 77 | $CVS commit -F message && |
795c7c0b JK |
78 | cd .. |
79 | ' | |
80 | ||
81 | test_expect_success 'update git module' ' | |
82 | ||
83 | cd module-git && | |
84 | git cvsimport -a -z 0 module && | |
85 | git merge origin && | |
86 | cd .. && | |
3af82863 | 87 | test_cmp module-cvs/o_fortuna module-git/o_fortuna |
795c7c0b JK |
88 | |
89 | ' | |
90 | ||
67d23242 JK |
91 | test_expect_success 'update cvs module' ' |
92 | ||
93 | cd module-cvs && | |
94 | echo 1 >tick && | |
161261b1 MH |
95 | $CVS add tick && |
96 | $CVS commit -m 1 | |
67d23242 JK |
97 | cd .. |
98 | ||
99 | ' | |
100 | ||
101 | test_expect_success 'cvsimport.module config works' ' | |
102 | ||
103 | cd module-git && | |
104 | git config cvsimport.module module && | |
105 | git cvsimport -a -z0 && | |
106 | git merge origin && | |
107 | cd .. && | |
3af82863 | 108 | test_cmp module-cvs/tick module-git/tick |
67d23242 JK |
109 | |
110 | ' | |
111 | ||
4e596e98 JK |
112 | test_expect_success 'import from a CVS working tree' ' |
113 | ||
161261b1 | 114 | $CVS co -d import-from-wt module && |
4e596e98 JK |
115 | cd import-from-wt && |
116 | git cvsimport -a -z0 && | |
117 | echo 1 >expect && | |
118 | git log -1 --pretty=format:%s%n >actual && | |
3af82863 | 119 | test_cmp actual expect && |
4e596e98 JK |
120 | cd .. |
121 | ||
122 | ' | |
123 | ||
cefa318d MH |
124 | test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
125 | ||
795c7c0b | 126 | test_done |