]>
Commit | Line | Data |
---|---|---|
a00439ac EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Eric Wong | |
4 | # | |
5 | ||
1364ff27 | 6 | test_description='git svn fetching' |
a00439ac EW |
7 | . ./lib-git-svn.sh |
8 | ||
f69e836f | 9 | test_expect_success 'initialize repo' ' |
a00439ac | 10 | mkdir import && |
18a82692 JN |
11 | ( |
12 | cd import && | |
13 | mkdir -p trunk && | |
14 | echo hello >trunk/readme && | |
15 | svn_cmd import -m "initial" . "$svnrepo" | |
fd4ec4f2 | 16 | ) && |
da083d68 | 17 | svn_cmd co "$svnrepo" wc && |
18a82692 JN |
18 | ( |
19 | cd wc && | |
20 | echo world >>trunk/readme && | |
21 | poke trunk/readme && | |
22 | svn_cmd commit -m "another commit" && | |
23 | svn_cmd up && | |
24 | svn_cmd mv trunk thunk && | |
25 | echo goodbye >>thunk/readme && | |
26 | poke thunk/readme && | |
27 | svn_cmd commit -m "bye now" | |
fd4ec4f2 | 28 | ) |
f69e836f | 29 | ' |
a00439ac | 30 | |
f69e836f | 31 | test_expect_success 'init and fetch a moved directory' ' |
1364ff27 NS |
32 | git svn init --minimize-url -i thunk "$svnrepo"/thunk && |
33 | git svn fetch -i thunk && | |
f69e836f BD |
34 | test "`git rev-parse --verify refs/remotes/thunk@2`" \ |
35 | = "`git rev-parse --verify refs/remotes/thunk~1`" && | |
36 | test "`git cat-file blob refs/remotes/thunk:readme |\ | |
37 | sed -n -e "3p"`" = goodbye && | |
38 | test -z "`git config --get svn-remote.svn.fetch \ | |
39 | "^trunk:refs/remotes/thunk@2$"`" | |
40 | ' | |
a00439ac | 41 | |
f69e836f BD |
42 | test_expect_success 'init and fetch from one svn-remote' ' |
43 | git config svn-remote.svn.url "$svnrepo" && | |
5be60078 | 44 | git config --add svn-remote.svn.fetch \ |
8b8fc068 | 45 | trunk:refs/remotes/svn/trunk && |
5be60078 | 46 | git config --add svn-remote.svn.fetch \ |
8b8fc068 | 47 | thunk:refs/remotes/svn/thunk && |
1364ff27 | 48 | git svn fetch -i svn/thunk && |
f69e836f BD |
49 | test "`git rev-parse --verify refs/remotes/svn/trunk`" \ |
50 | = "`git rev-parse --verify refs/remotes/svn/thunk~1`" && | |
51 | test "`git cat-file blob refs/remotes/svn/thunk:readme |\ | |
52 | sed -n -e "3p"`" = goodbye | |
53 | ' | |
8b8fc068 | 54 | |
f69e836f | 55 | test_expect_success 'follow deleted parent' ' |
da083d68 | 56 | (svn_cmd cp -m "resurrecting trunk as junk" \ |
f69e836f BD |
57 | "$svnrepo"/trunk@2 "$svnrepo"/junk || |
58 | svn cp -m "resurrecting trunk as junk" \ | |
59 | -r2 "$svnrepo"/trunk "$svnrepo"/junk) && | |
5be60078 | 60 | git config --add svn-remote.svn.fetch \ |
a2003abc | 61 | junk:refs/remotes/svn/junk && |
1364ff27 NS |
62 | git svn fetch -i svn/thunk && |
63 | git svn fetch -i svn/junk && | |
f69e836f BD |
64 | test -z "`git diff svn/junk svn/trunk`" && |
65 | test "`git merge-base svn/junk svn/trunk`" \ | |
66 | = "`git rev-parse svn/trunk`" | |
67 | ' | |
a2003abc | 68 | |
f69e836f | 69 | test_expect_success 'follow larger parent' ' |
7f578c55 EW |
70 | mkdir -p import/trunk/thunk/bump/thud && |
71 | echo hi > import/trunk/thunk/bump/thud/file && | |
f69e836f BD |
72 | svn import -m "import a larger parent" import "$svnrepo"/larger-parent && |
73 | svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger && | |
1364ff27 | 74 | git svn init --minimize-url -i larger \ |
f69e836f | 75 | "$svnrepo"/another-larger/trunk/thunk/bump/thud && |
1364ff27 | 76 | git svn fetch -i larger && |
5be60078 JH |
77 | git rev-parse --verify refs/remotes/larger && |
78 | git rev-parse --verify \ | |
7f578c55 | 79 | refs/remotes/larger-parent/trunk/thunk/bump/thud && |
f69e836f | 80 | test "`git merge-base \ |
7f578c55 | 81 | refs/remotes/larger-parent/trunk/thunk/bump/thud \ |
f69e836f BD |
82 | refs/remotes/larger`" = \ |
83 | "`git rev-parse refs/remotes/larger`" | |
7f578c55 | 84 | true |
f69e836f | 85 | ' |
7f578c55 | 86 | |
f69e836f | 87 | test_expect_success 'follow higher-level parent' ' |
18a82692 JN |
88 | svn mkdir -m "follow higher-level parent" "$svnrepo"/blob && |
89 | svn co "$svnrepo"/blob blob && | |
90 | ( | |
91 | cd blob && | |
92 | echo hi > hi && | |
93 | svn add hi && | |
fd4ec4f2 | 94 | svn commit -m "hihi" |
18a82692 JN |
95 | ) && |
96 | svn mkdir -m "new glob at top level" "$svnrepo"/glob && | |
97 | svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob && | |
98 | git svn init --minimize-url -i blob "$svnrepo"/glob/blob && | |
1364ff27 | 99 | git svn fetch -i blob |
f69e836f | 100 | ' |
1492b424 | 101 | |
f69e836f | 102 | test_expect_success 'follow deleted directory' ' |
da083d68 ER |
103 | svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye && |
104 | svn_cmd rm -m "remove glob" "$svnrepo"/glob && | |
1364ff27 NS |
105 | git svn init --minimize-url -i glob "$svnrepo"/glob && |
106 | git svn fetch -i glob && | |
f69e836f BD |
107 | test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi && |
108 | test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1 | |
109 | ' | |
e5a0b240 | 110 | |
2b27f6c8 EW |
111 | # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn) |
112 | # in trunk/subversion/bindings/swig/perl | |
f69e836f | 113 | test_expect_success 'follow-parent avoids deleting relevant info' ' |
2b27f6c8 EW |
114 | mkdir -p import/trunk/subversion/bindings/swig/perl/t && |
115 | for i in a b c ; do \ | |
f69e836f BD |
116 | echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm && |
117 | echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \ | |
2b27f6c8 | 118 | done && |
f69e836f | 119 | echo "bad delete test" > \ |
2b27f6c8 | 120 | import/trunk/subversion/bindings/swig/perl/t/larger-parent && |
f69e836f | 121 | echo "bad delete test 2" > \ |
2b27f6c8 | 122 | import/trunk/subversion/bindings/swig/perl/another-larger && |
18a82692 JN |
123 | ( |
124 | cd import && | |
125 | svn import -m "r9270 test" . "$svnrepo"/r9270 | |
fd4ec4f2 | 126 | ) && |
da083d68 | 127 | svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 && |
18a82692 JN |
128 | ( |
129 | cd r9270 && | |
130 | svn mkdir native && | |
131 | svn mv t native/t && | |
132 | for i in a b c | |
133 | do | |
134 | svn mv $i.pm native/$i.pm | |
135 | done && | |
136 | echo z >>native/t/c.t && | |
137 | poke native/t/c.t && | |
138 | svn commit -m "reorg test" | |
fd4ec4f2 | 139 | ) && |
1364ff27 | 140 | git svn init --minimize-url -i r9270-t \ |
f69e836f | 141 | "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t && |
1364ff27 | 142 | git svn fetch -i r9270-t && |
f69e836f BD |
143 | test `git rev-list r9270-t | wc -l` -eq 2 && |
144 | test "`git ls-tree --name-only r9270-t~1`" = \ | |
145 | "`git ls-tree --name-only r9270-t`" | |
146 | ' | |
2b27f6c8 | 147 | |
f69e836f | 148 | test_expect_success "track initial change if it was only made to parent" ' |
da083d68 | 149 | svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk && |
1364ff27 | 150 | git svn init --minimize-url -i r9270-d \ |
f69e836f | 151 | "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t && |
1364ff27 | 152 | git svn fetch -i r9270-d && |
f69e836f BD |
153 | test `git rev-list r9270-d | wc -l` -eq 3 && |
154 | test "`git ls-tree --name-only r9270-t`" = \ | |
155 | "`git ls-tree --name-only r9270-d`" && | |
156 | test "`git rev-parse r9270-t`" = \ | |
157 | "`git rev-parse r9270-d~1`" | |
158 | ' | |
28937057 | 159 | |
553589f7 DM |
160 | test_expect_success "follow-parent is atomic" ' |
161 | ( | |
162 | cd wc && | |
da083d68 ER |
163 | svn_cmd up && |
164 | svn_cmd mkdir stunk && | |
553589f7 | 165 | echo "trunk stunk" > stunk/readme && |
da083d68 ER |
166 | svn_cmd add stunk/readme && |
167 | svn_cmd ci -m "trunk stunk" && | |
553589f7 | 168 | echo "stunk like junk" >> stunk/readme && |
da083d68 | 169 | svn_cmd ci -m "really stunk" && |
553589f7 | 170 | echo "stink stank stunk" >> stunk/readme && |
da083d68 | 171 | svn_cmd ci -m "even the grinch agrees" |
553589f7 | 172 | ) && |
da083d68 | 173 | svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk && |
553589f7 DM |
174 | { svn cp -m "early stunk flunked too" \ |
175 | "$svnrepo"/stunk@17 "$svnrepo"/flunked || | |
da083d68 | 176 | svn_cmd cp -m "early stunk flunked too" \ |
553589f7 DM |
177 | -r17 "$svnrepo"/stunk "$svnrepo"/flunked; } && |
178 | git svn init --minimize-url -i stunk "$svnrepo"/stunk && | |
179 | git svn fetch -i stunk && | |
180 | git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 && | |
181 | git update-ref -d refs/remotes/stunk && | |
182 | git config --unset svn-remote.svn.fetch stunk && | |
6f5748e1 AB |
183 | mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 && |
184 | rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) && | |
185 | dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \ | |
186 | of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 && | |
187 | rm -rf "$GIT_DIR"/svn/refs/remotes/stunk && | |
553589f7 DM |
188 | git svn init --minimize-url -i flunk "$svnrepo"/flunk && |
189 | git svn fetch -i flunk && | |
190 | git svn init --minimize-url -i stunk "$svnrepo"/stunk && | |
191 | git svn fetch -i stunk && | |
192 | git svn init --minimize-url -i flunked "$svnrepo"/flunked && | |
a48fcd83 | 193 | git svn fetch -i flunked && |
553589f7 DM |
194 | test "`git rev-parse --verify refs/remotes/flunk@18`" \ |
195 | = "`git rev-parse --verify refs/remotes/stunk`" && | |
196 | test "`git rev-parse --verify refs/remotes/flunk~1`" \ | |
197 | = "`git rev-parse --verify refs/remotes/stunk`" && | |
198 | test "`git rev-parse --verify refs/remotes/flunked~1`" \ | |
199 | = "`git rev-parse --verify refs/remotes/stunk~1`" | |
200 | ' | |
201 | ||
f69e836f | 202 | test_expect_success "track multi-parent paths" ' |
da083d68 | 203 | svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob && |
1364ff27 | 204 | git svn multi-fetch && |
f69e836f BD |
205 | test `git cat-file commit refs/remotes/glob | \ |
206 | grep "^parent " | wc -l` -eq 2 | |
207 | ' | |
b9dffd8c | 208 | |
8a603774 | 209 | test_expect_success "multi-fetch continues to work" " |
1364ff27 | 210 | git svn multi-fetch |
8a603774 EW |
211 | " |
212 | ||
f69e836f BD |
213 | test_expect_success "multi-fetch works off a 'clean' repository" ' |
214 | rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" && | |
215 | mkdir "$GIT_DIR/svn" && | |
1364ff27 | 216 | git svn multi-fetch |
f69e836f | 217 | ' |
8a603774 | 218 | |
a00439ac EW |
219 | test_debug 'gitk --all &' |
220 | ||
221 | test_done |