blob: 13b179e721ef12993ce2bc8f0f59d9f49940447c [file] [log] [blame]
Eric Wonga00439a2006-06-27 19:39:13 -07001#!/bin/sh
2#
3# Copyright (c) 2006 Eric Wong
4#
5
Nanako Shiraishi1364ff22008-09-08 19:02:08 +09006test_description='git svn fetching'
Eric Wonga00439a2006-06-27 19:39:13 -07007. ./lib-git-svn.sh
8
Bryan Donlanf69e8362008-05-04 01:37:59 -04009test_expect_success 'initialize repo' '
Eric Wonga00439a2006-06-27 19:39:13 -070010 mkdir import &&
Jonathan Nieder18a82692010-09-06 20:42:54 -050011 (
12 cd import &&
13 mkdir -p trunk &&
14 echo hello >trunk/readme &&
15 svn_cmd import -m "initial" . "$svnrepo"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020016 ) &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +040017 svn_cmd co "$svnrepo" wc &&
Jonathan Nieder18a82692010-09-06 20:42:54 -050018 (
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"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020028 )
Bryan Donlanf69e8362008-05-04 01:37:59 -040029 '
Eric Wonga00439a2006-06-27 19:39:13 -070030
Bryan Donlanf69e8362008-05-04 01:37:59 -040031test_expect_success 'init and fetch a moved directory' '
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090032 git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
33 git svn fetch -i thunk &&
Bryan Donlanf69e8362008-05-04 01:37:59 -040034 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 '
Eric Wonga00439a2006-06-27 19:39:13 -070041
Bryan Donlanf69e8362008-05-04 01:37:59 -040042test_expect_success 'init and fetch from one svn-remote' '
43 git config svn-remote.svn.url "$svnrepo" &&
Junio C Hamano5be60072007-07-02 22:52:14 -070044 git config --add svn-remote.svn.fetch \
Eric Wong8b8fc062007-01-22 11:44:57 -080045 trunk:refs/remotes/svn/trunk &&
Junio C Hamano5be60072007-07-02 22:52:14 -070046 git config --add svn-remote.svn.fetch \
Eric Wong8b8fc062007-01-22 11:44:57 -080047 thunk:refs/remotes/svn/thunk &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090048 git svn fetch -i svn/thunk &&
Bryan Donlanf69e8362008-05-04 01:37:59 -040049 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 '
Eric Wong8b8fc062007-01-22 11:44:57 -080054
Bryan Donlanf69e8362008-05-04 01:37:59 -040055test_expect_success 'follow deleted parent' '
Eygene Ryabinkinda083d62009-05-08 12:06:16 +040056 (svn_cmd cp -m "resurrecting trunk as junk" \
Bryan Donlanf69e8362008-05-04 01:37:59 -040057 "$svnrepo"/trunk@2 "$svnrepo"/junk ||
58 svn cp -m "resurrecting trunk as junk" \
59 -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
Junio C Hamano5be60072007-07-02 22:52:14 -070060 git config --add svn-remote.svn.fetch \
Eric Wonga2003ab2007-01-22 15:22:50 -080061 junk:refs/remotes/svn/junk &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090062 git svn fetch -i svn/thunk &&
63 git svn fetch -i svn/junk &&
Bryan Donlanf69e8362008-05-04 01:37:59 -040064 test -z "`git diff svn/junk svn/trunk`" &&
65 test "`git merge-base svn/junk svn/trunk`" \
66 = "`git rev-parse svn/trunk`"
67 '
Eric Wonga2003ab2007-01-22 15:22:50 -080068
Bryan Donlanf69e8362008-05-04 01:37:59 -040069test_expect_success 'follow larger parent' '
Eric Wong7f578c52007-01-24 02:16:25 -080070 mkdir -p import/trunk/thunk/bump/thud &&
71 echo hi > import/trunk/thunk/bump/thud/file &&
Bryan Donlanf69e8362008-05-04 01:37:59 -040072 svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
73 svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090074 git svn init --minimize-url -i larger \
Bryan Donlanf69e8362008-05-04 01:37:59 -040075 "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090076 git svn fetch -i larger &&
Junio C Hamano5be60072007-07-02 22:52:14 -070077 git rev-parse --verify refs/remotes/larger &&
78 git rev-parse --verify \
Eric Wong7f578c52007-01-24 02:16:25 -080079 refs/remotes/larger-parent/trunk/thunk/bump/thud &&
Bryan Donlanf69e8362008-05-04 01:37:59 -040080 test "`git merge-base \
Eric Wong7f578c52007-01-24 02:16:25 -080081 refs/remotes/larger-parent/trunk/thunk/bump/thud \
Bryan Donlanf69e8362008-05-04 01:37:59 -040082 refs/remotes/larger`" = \
83 "`git rev-parse refs/remotes/larger`"
Eric Wong7f578c52007-01-24 02:16:25 -080084 true
Bryan Donlanf69e8362008-05-04 01:37:59 -040085 '
Eric Wong7f578c52007-01-24 02:16:25 -080086
Bryan Donlanf69e8362008-05-04 01:37:59 -040087test_expect_success 'follow higher-level parent' '
Jonathan Nieder18a82692010-09-06 20:42:54 -050088 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 &&
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020094 svn commit -m "hihi"
Jonathan Nieder18a82692010-09-06 20:42:54 -050095 ) &&
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 &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +090099 git svn fetch -i blob
Bryan Donlanf69e8362008-05-04 01:37:59 -0400100 '
Eric Wong1492b422007-01-25 10:52:36 -0800101
Bryan Donlanf69e8362008-05-04 01:37:59 -0400102test_expect_success 'follow deleted directory' '
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400103 svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
104 svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900105 git svn init --minimize-url -i glob "$svnrepo"/glob &&
106 git svn fetch -i glob &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400107 test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
108 test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
109 '
Eric Wonge5a0b242007-01-25 15:44:54 -0800110
Eric Wong2b27f6c2007-01-28 04:59:05 -0800111# ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
112# in trunk/subversion/bindings/swig/perl
Bryan Donlanf69e8362008-05-04 01:37:59 -0400113test_expect_success 'follow-parent avoids deleting relevant info' '
Eric Wong2b27f6c2007-01-28 04:59:05 -0800114 mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
115 for i in a b c ; do \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400116 echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
117 echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
Eric Wong2b27f6c2007-01-28 04:59:05 -0800118 done &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400119 echo "bad delete test" > \
Eric Wong2b27f6c2007-01-28 04:59:05 -0800120 import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400121 echo "bad delete test 2" > \
Eric Wong2b27f6c2007-01-28 04:59:05 -0800122 import/trunk/subversion/bindings/swig/perl/another-larger &&
Jonathan Nieder18a82692010-09-06 20:42:54 -0500123 (
124 cd import &&
125 svn import -m "r9270 test" . "$svnrepo"/r9270
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +0200126 ) &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400127 svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
Jonathan Nieder18a82692010-09-06 20:42:54 -0500128 (
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"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +0200139 ) &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900140 git svn init --minimize-url -i r9270-t \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400141 "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900142 git svn fetch -i r9270-t &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400143 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 '
Eric Wong2b27f6c2007-01-28 04:59:05 -0800147
Bryan Donlanf69e8362008-05-04 01:37:59 -0400148test_expect_success "track initial change if it was only made to parent" '
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400149 svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900150 git svn init --minimize-url -i r9270-d \
Bryan Donlanf69e8362008-05-04 01:37:59 -0400151 "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900152 git svn fetch -i r9270-d &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400153 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 '
Eric Wong28937052007-01-30 00:35:18 -0800159
Deskin Miller553589f2008-12-08 08:31:31 -0500160test_expect_success "follow-parent is atomic" '
161 (
162 cd wc &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400163 svn_cmd up &&
164 svn_cmd mkdir stunk &&
Deskin Miller553589f2008-12-08 08:31:31 -0500165 echo "trunk stunk" > stunk/readme &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400166 svn_cmd add stunk/readme &&
167 svn_cmd ci -m "trunk stunk" &&
Deskin Miller553589f2008-12-08 08:31:31 -0500168 echo "stunk like junk" >> stunk/readme &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400169 svn_cmd ci -m "really stunk" &&
Deskin Miller553589f2008-12-08 08:31:31 -0500170 echo "stink stank stunk" >> stunk/readme &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400171 svn_cmd ci -m "even the grinch agrees"
Deskin Miller553589f2008-12-08 08:31:31 -0500172 ) &&
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400173 svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
Deskin Miller553589f2008-12-08 08:31:31 -0500174 { svn cp -m "early stunk flunked too" \
175 "$svnrepo"/stunk@17 "$svnrepo"/flunked ||
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400176 svn_cmd cp -m "early stunk flunked too" \
Deskin Miller553589f2008-12-08 08:31:31 -0500177 -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 &&
Adam Brewster6f5748e2009-08-11 23:14:27 -0400183 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 &&
Deskin Miller553589f2008-12-08 08:31:31 -0500188 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 &&
Jonathan Niedera48fcd82010-10-30 20:46:54 -0500193 git svn fetch -i flunked &&
Deskin Miller553589f2008-12-08 08:31:31 -0500194 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
Bryan Donlanf69e8362008-05-04 01:37:59 -0400202test_expect_success "track multi-parent paths" '
Eygene Ryabinkinda083d62009-05-08 12:06:16 +0400203 svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900204 git svn multi-fetch &&
Bryan Donlanf69e8362008-05-04 01:37:59 -0400205 test `git cat-file commit refs/remotes/glob | \
206 grep "^parent " | wc -l` -eq 2
207 '
Eric Wongb9dffd82007-02-09 01:28:30 -0800208
Eric Wong8a603772007-01-31 02:45:50 -0800209test_expect_success "multi-fetch continues to work" "
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900210 git svn multi-fetch
Eric Wong8a603772007-01-31 02:45:50 -0800211 "
212
Bryan Donlanf69e8362008-05-04 01:37:59 -0400213test_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" &&
Nanako Shiraishi1364ff22008-09-08 19:02:08 +0900216 git svn multi-fetch
Bryan Donlanf69e8362008-05-04 01:37:59 -0400217 '
Eric Wong8a603772007-01-31 02:45:50 -0800218
Eric Wonga00439a2006-06-27 19:39:13 -0700219test_debug 'gitk --all &'
220
221test_done