]>
Commit | Line | Data |
---|---|---|
a00439ac EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Eric Wong | |
4 | # | |
5 | ||
0bed5eaa | 6 | test_description='git-svn fetching' |
a00439ac EW |
7 | . ./lib-git-svn.sh |
8 | ||
a00439ac EW |
9 | test_expect_success 'initialize repo' " |
10 | mkdir import && | |
11 | cd import && | |
12 | mkdir -p trunk && | |
13 | echo hello > trunk/readme && | |
14 | svn import -m 'initial' . $svnrepo && | |
15 | cd .. && | |
16 | svn co $svnrepo wc && | |
17 | cd wc && | |
18 | echo world >> trunk/readme && | |
7b3fab87 | 19 | poke trunk/readme && |
a00439ac | 20 | svn commit -m 'another commit' && |
e66191f4 | 21 | svn up && |
a00439ac EW |
22 | svn mv -m 'rename to thunk' trunk thunk && |
23 | svn up && | |
24 | echo goodbye >> thunk/readme && | |
7b3fab87 | 25 | poke thunk/readme && |
a00439ac EW |
26 | svn commit -m 'bye now' && |
27 | cd .. | |
28 | " | |
29 | ||
0bed5eaa | 30 | test_expect_success 'init and fetch a moved directory' " |
4a1bb4c3 | 31 | git-svn init --minimize-url -i thunk $svnrepo/thunk && |
0bed5eaa | 32 | git-svn fetch -i thunk && |
ce2a0f2f | 33 | test \"\`git-rev-parse --verify refs/remotes/thunk@2\`\" \ |
15710b6f EW |
34 | = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" && |
35 | test \"\`git-cat-file blob refs/remotes/thunk:readme |\ | |
ce2a0f2f | 36 | sed -n -e '3p'\`\" = goodbye && |
9fa00b65 | 37 | test -z \"\`git-config --get svn-remote.svn.fetch \ |
ce2a0f2f | 38 | '^trunk:refs/remotes/thunk@2$'\`\" |
a00439ac EW |
39 | " |
40 | ||
8b8fc068 | 41 | test_expect_success 'init and fetch from one svn-remote' " |
ccb6b6f5 EW |
42 | git-config svn-remote.svn.url $svnrepo && |
43 | git-config --add svn-remote.svn.fetch \ | |
8b8fc068 | 44 | trunk:refs/remotes/svn/trunk && |
ccb6b6f5 | 45 | git-config --add svn-remote.svn.fetch \ |
8b8fc068 | 46 | thunk:refs/remotes/svn/thunk && |
0bed5eaa | 47 | git-svn fetch -i svn/thunk && |
8b8fc068 EW |
48 | test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \ |
49 | = \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" && | |
50 | test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\ | |
51 | sed -n -e '3p'\`\" = goodbye | |
52 | " | |
53 | ||
a2003abc EW |
54 | test_expect_success 'follow deleted parent' " |
55 | svn cp -m 'resurrecting trunk as junk' \ | |
56 | -r2 $svnrepo/trunk $svnrepo/junk && | |
ccb6b6f5 | 57 | git-config --add svn-remote.svn.fetch \ |
a2003abc | 58 | junk:refs/remotes/svn/junk && |
0bed5eaa EW |
59 | git-svn fetch -i svn/thunk && |
60 | git-svn fetch -i svn/junk && | |
a2003abc EW |
61 | test -z \"\`git diff svn/junk svn/trunk\`\" && |
62 | test \"\`git merge-base svn/junk svn/trunk\`\" \ | |
63 | = \"\`git rev-parse svn/trunk\`\" | |
64 | " | |
65 | ||
7f578c55 EW |
66 | test_expect_success 'follow larger parent' " |
67 | mkdir -p import/trunk/thunk/bump/thud && | |
68 | echo hi > import/trunk/thunk/bump/thud/file && | |
69 | svn import -m 'import a larger parent' import $svnrepo/larger-parent && | |
70 | svn cp -m 'hi' $svnrepo/larger-parent $svnrepo/another-larger && | |
4a1bb4c3 EW |
71 | git-svn init --minimize-url -i larger \ |
72 | $svnrepo/another-larger/trunk/thunk/bump/thud && | |
0bed5eaa | 73 | git-svn fetch -i larger && |
7f578c55 EW |
74 | git-rev-parse --verify refs/remotes/larger && |
75 | git-rev-parse --verify \ | |
76 | refs/remotes/larger-parent/trunk/thunk/bump/thud && | |
77 | test \"\`git-merge-base \ | |
78 | refs/remotes/larger-parent/trunk/thunk/bump/thud \ | |
79 | refs/remotes/larger\`\" = \ | |
80 | \"\`git-rev-parse refs/remotes/larger\`\" | |
81 | true | |
82 | " | |
83 | ||
1492b424 EW |
84 | test_expect_success 'follow higher-level parent' " |
85 | svn mkdir -m 'follow higher-level parent' $svnrepo/blob && | |
86 | svn co $svnrepo/blob blob && | |
87 | cd blob && | |
88 | echo hi > hi && | |
89 | svn add hi && | |
e5a0b240 | 90 | svn commit -m 'hihi' && |
1492b424 EW |
91 | cd .. |
92 | svn mkdir -m 'new glob at top level' $svnrepo/glob && | |
93 | svn mv -m 'move blob down a level' $svnrepo/blob $svnrepo/glob/blob && | |
4a1bb4c3 | 94 | git-svn init --minimize-url -i blob $svnrepo/glob/blob && |
0bed5eaa | 95 | git-svn fetch -i blob |
1492b424 EW |
96 | " |
97 | ||
e5a0b240 | 98 | test_expect_success 'follow deleted directory' " |
8a603774 | 99 | svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye && |
e5a0b240 | 100 | svn rm -m 'remove glob' $svnrepo/glob && |
4a1bb4c3 | 101 | git-svn init --minimize-url -i glob $svnrepo/glob && |
e5a0b240 | 102 | git-svn fetch -i glob && |
8a603774 EW |
103 | test \"\`git cat-file blob refs/remotes/glob:blob/bye\`\" = hi && |
104 | test \"\`git ls-tree refs/remotes/glob | wc -l \`\" -eq 1 | |
e5a0b240 EW |
105 | " |
106 | ||
2b27f6c8 EW |
107 | # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn) |
108 | # in trunk/subversion/bindings/swig/perl | |
28937057 | 109 | test_expect_success 'follow-parent avoids deleting relevant info' " |
2b27f6c8 EW |
110 | mkdir -p import/trunk/subversion/bindings/swig/perl/t && |
111 | for i in a b c ; do \ | |
112 | echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm && | |
113 | echo _\$i > import/trunk/subversion/bindings/swig/perl/t/\$i.t; \ | |
114 | done && | |
115 | echo 'bad delete test' > \ | |
116 | import/trunk/subversion/bindings/swig/perl/t/larger-parent && | |
117 | echo 'bad delete test 2' > \ | |
118 | import/trunk/subversion/bindings/swig/perl/another-larger && | |
119 | cd import && | |
120 | svn import -m 'r9270 test' . $svnrepo/r9270 && | |
121 | cd .. && | |
122 | svn co $svnrepo/r9270/trunk/subversion/bindings/swig/perl r9270 && | |
123 | cd r9270 && | |
124 | svn mkdir native && | |
125 | svn mv t native/t && | |
126 | for i in a b c; do svn mv \$i.pm native/\$i.pm; done && | |
127 | echo z >> native/t/c.t && | |
ccb6b6f5 | 128 | poke native/t/c.t && |
2b27f6c8 EW |
129 | svn commit -m 'reorg test' && |
130 | cd .. && | |
4a1bb4c3 | 131 | git-svn init --minimize-url -i r9270-t \ |
2b27f6c8 | 132 | $svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t && |
0bed5eaa | 133 | git-svn fetch -i r9270-t && |
2b27f6c8 EW |
134 | test \`git rev-list r9270-t | wc -l\` -eq 2 && |
135 | test \"\`git ls-tree --name-only r9270-t~1\`\" = \ | |
136 | \"\`git ls-tree --name-only r9270-t\`\" | |
137 | " | |
138 | ||
28937057 EW |
139 | test_expect_success "track initial change if it was only made to parent" " |
140 | svn cp -m 'wheee!' $svnrepo/r9270/trunk $svnrepo/r9270/drunk && | |
4a1bb4c3 | 141 | git-svn init --minimize-url -i r9270-d \ |
28937057 | 142 | $svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t && |
0bed5eaa | 143 | git-svn fetch -i r9270-d && |
28937057 EW |
144 | test \`git rev-list r9270-d | wc -l\` -eq 3 && |
145 | test \"\`git ls-tree --name-only r9270-t\`\" = \ | |
146 | \"\`git ls-tree --name-only r9270-d\`\" && | |
147 | test \"\`git rev-parse r9270-t\`\" = \ | |
148 | \"\`git rev-parse r9270-d~1\`\" | |
149 | " | |
150 | ||
b9dffd8c EW |
151 | test_expect_success "track multi-parent paths" " |
152 | svn cp -m 'resurrect /glob' $svnrepo/r9270 $svnrepo/glob && | |
0bed5eaa | 153 | git-svn multi-fetch && |
b9dffd8c EW |
154 | test \`git cat-file commit refs/remotes/glob | \ |
155 | grep '^parent ' | wc -l\` -eq 2 | |
156 | " | |
157 | ||
8a603774 | 158 | test_expect_success "multi-fetch continues to work" " |
0bed5eaa | 159 | git-svn multi-fetch |
8a603774 EW |
160 | " |
161 | ||
162 | test_expect_success "multi-fetch works off a 'clean' repository" " | |
163 | rm -r $GIT_DIR/svn $GIT_DIR/refs/remotes $GIT_DIR/logs && | |
164 | mkdir $GIT_DIR/svn && | |
0bed5eaa | 165 | git-svn multi-fetch |
8a603774 EW |
166 | " |
167 | ||
a00439ac EW |
168 | test_debug 'gitk --all &' |
169 | ||
170 | test_done |