#!/bin/sh # # Copyright (c) 2006 Eric Wong # global test_description := ''git svn fetching'' source ./lib-git-svn.sh test_expect_success 'initialize repo' ' mkdir import && ( cd import && mkdir -p trunk && echo hello >trunk/readme && svn_cmd import -m "initial" . "$svnrepo" ) && svn_cmd co "$svnrepo" wc && ( cd wc && echo world >>trunk/readme && poke trunk/readme && svn_cmd commit -m "another commit" && svn_cmd up && svn_cmd mv trunk thunk && echo goodbye >>thunk/readme && poke thunk/readme && svn_cmd commit -m "bye now" ) ' test_expect_success 'init and fetch a moved directory' ' git svn init --minimize-url -i thunk "$svnrepo"/thunk && git svn fetch -i thunk && test "$(git rev-parse --verify refs/remotes/thunk@2)" \ = "$(git rev-parse --verify refs/remotes/thunk~1)" && test "$(git cat-file blob refs/remotes/thunk:readme |\ sed -n -e "3p")" = goodbye && test -z "$(git config --get svn-remote.svn.fetch \ "^trunk:refs/remotes/thunk@2$")" ' test_expect_success 'init and fetch from one svn-remote' ' git config svn-remote.svn.url "$svnrepo" && git config --add svn-remote.svn.fetch \ trunk:refs/remotes/svn/trunk && git config --add svn-remote.svn.fetch \ thunk:refs/remotes/svn/thunk && git svn fetch -i svn/thunk && test "$(git rev-parse --verify refs/remotes/svn/trunk)" \ = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" && test "$(git cat-file blob refs/remotes/svn/thunk:readme |\ sed -n -e "3p")" = goodbye ' test_expect_success 'follow deleted parent' ' (svn_cmd cp -m "resurrecting trunk as junk" \ "$svnrepo"/trunk@2 "$svnrepo"/junk || svn cp -m "resurrecting trunk as junk" \ -r2 "$svnrepo"/trunk "$svnrepo"/junk) && git config --add svn-remote.svn.fetch \ junk:refs/remotes/svn/junk && git svn fetch -i svn/thunk && git svn fetch -i svn/junk && test -z "$(git diff svn/junk svn/trunk)" && test "$(git merge-base svn/junk svn/trunk)" \ = "$(git rev-parse svn/trunk)" ' test_expect_success 'follow larger parent' ' mkdir -p import/trunk/thunk/bump/thud && echo hi > import/trunk/thunk/bump/thud/file && svn import -m "import a larger parent" import "$svnrepo"/larger-parent && svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger && git svn init --minimize-url -i larger \ "$svnrepo"/larger-parent/trunk/thunk/bump/thud && git svn fetch -i larger && git svn init --minimize-url -i larger-parent \ "$svnrepo"/another-larger/trunk/thunk/bump/thud && git svn fetch -i larger-parent && git rev-parse --verify refs/remotes/larger && git rev-parse --verify \ refs/remotes/larger-parent && test "$(git merge-base \ refs/remotes/larger-parent \ refs/remotes/larger)" = \ "$(git rev-parse refs/remotes/larger)" ' test_expect_success 'follow higher-level parent' ' svn mkdir -m "follow higher-level parent" "$svnrepo"/blob && svn co "$svnrepo"/blob blob && ( cd blob && echo hi > hi && svn add hi && svn commit -m "hihi" ) && svn mkdir -m "new glob at top level" "$svnrepo"/glob && svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob && git svn init --minimize-url -i blob "$svnrepo"/glob/blob && git svn fetch -i blob ' test_expect_success 'follow deleted directory' ' svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye && svn_cmd rm -m "remove glob" "$svnrepo"/glob && git svn init --minimize-url -i glob "$svnrepo"/glob && git svn fetch -i glob && test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi && test "$(git ls-tree refs/remotes/glob | wc -l )" -eq 1 ' # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn) # in trunk/subversion/bindings/swig/perl test_expect_success 'follow-parent avoids deleting relevant info' ' mkdir -p import/trunk/subversion/bindings/swig/perl/t && for i in a b c ; do \ echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm && echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \ done && echo "bad delete test" > \ import/trunk/subversion/bindings/swig/perl/t/larger-parent && echo "bad delete test 2" > \ import/trunk/subversion/bindings/swig/perl/another-larger && ( cd import && svn import -m "r9270 test" . "$svnrepo"/r9270 ) && svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 && ( cd r9270 && svn mkdir native && svn mv t native/t && for i in a b c do svn mv $i.pm native/$i.pm done && echo z >>native/t/c.t && poke native/t/c.t && svn commit -m "reorg test" ) && git svn init --minimize-url -i r9270-t \ "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t && git svn fetch -i r9270-t && test $(git rev-list r9270-t | wc -l) -eq 2 && test "$(git ls-tree --name-only r9270-t~1)" = \ "$(git ls-tree --name-only r9270-t)" ' test_expect_success "track initial change if it was only made to parent" ' svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk && git svn init --minimize-url -i r9270-d \ "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t && git svn fetch -i r9270-d && test $(git rev-list r9270-d | wc -l) -eq 3 && test "$(git ls-tree --name-only r9270-t)" = \ "$(git ls-tree --name-only r9270-d)" && test "$(git rev-parse r9270-t)" = \ "$(git rev-parse r9270-d~1)" ' test_expect_success "follow-parent is atomic" ' ( cd wc && svn_cmd up && svn_cmd mkdir stunk && echo "trunk stunk" > stunk/readme && svn_cmd add stunk/readme && svn_cmd ci -m "trunk stunk" && echo "stunk like junk" >> stunk/readme && svn_cmd ci -m "really stunk" && echo "stink stank stunk" >> stunk/readme && svn_cmd ci -m "even the grinch agrees" ) && svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk && { svn cp -m "early stunk flunked too" \ "$svnrepo"/stunk@17 "$svnrepo"/flunked || svn_cmd cp -m "early stunk flunked too" \ -r17 "$svnrepo"/stunk "$svnrepo"/flunked; } && git svn init --minimize-url -i stunk "$svnrepo"/stunk && git svn fetch -i stunk && git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 && git update-ref -d refs/remotes/stunk && git config --unset svn-remote.svn.fetch stunk && mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 && rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) && dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \ of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 && rm -rf "$GIT_DIR"/svn/refs/remotes/stunk && git svn init --minimize-url -i flunk "$svnrepo"/flunk && git svn fetch -i flunk && git svn init --minimize-url -i stunk "$svnrepo"/stunk && git svn fetch -i stunk && git svn init --minimize-url -i flunked "$svnrepo"/flunked && git svn fetch -i flunked && test "$(git rev-parse --verify refs/remotes/flunk@18)" \ = "$(git rev-parse --verify refs/remotes/stunk)" && test "$(git rev-parse --verify refs/remotes/flunk~1)" \ = "$(git rev-parse --verify refs/remotes/stunk)" && test "$(git rev-parse --verify refs/remotes/flunked~1)" \ = "$(git rev-parse --verify refs/remotes/stunk~1)" ' test_expect_success "track multi-parent paths" ' svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob && git svn multi-fetch && test $(git cat-file commit refs/remotes/glob | \ grep "^parent " | wc -l) -eq 2 ' test_expect_success "multi-fetch continues to work" " git svn multi-fetch " test_expect_success "multi-fetch works off a 'clean' repository" ' rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" && mkdir "$GIT_DIR/svn" && git svn multi-fetch ' test_debug 'gitk --all &' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git svn fetching">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./lib-git-svn.sh)}) (C {(test_expect_success)} {(SQ <"initialize repo">)} { (SQ <"\n"> <"\tmkdir import &&\n"> <"\t(\n"> <"\t\tcd import &&\n"> <"\t\tmkdir -p trunk &&\n"> <"\t\techo hello >trunk/readme &&\n"> <"\t\tsvn_cmd import -m \"initial\" . \"$svnrepo\"\n"> <"\t) &&\n"> <"\tsvn_cmd co \"$svnrepo\" wc &&\n"> <"\t(\n"> <"\t\tcd wc &&\n"> <"\t\techo world >>trunk/readme &&\n"> <"\t\tpoke trunk/readme &&\n"> <"\t\tsvn_cmd commit -m \"another commit\" &&\n"> <"\t\tsvn_cmd up &&\n"> <"\t\tsvn_cmd mv trunk thunk &&\n"> <"\t\techo goodbye >>thunk/readme &&\n"> <"\t\tpoke thunk/readme &&\n"> <"\t\tsvn_cmd commit -m \"bye now\"\n"> <"\t)\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"init and fetch a moved directory">)} { (SQ <"\n"> <"\tgit svn init --minimize-url -i thunk \"$svnrepo\"/thunk &&\n"> <"\tgit svn fetch -i thunk &&\n"> <"\ttest \"$(git rev-parse --verify refs/remotes/thunk@2)\" \\\n"> <"\t = \"$(git rev-parse --verify refs/remotes/thunk~1)\" &&\n"> <"\ttest \"$(git cat-file blob refs/remotes/thunk:readme |\\\n"> <"\t\t sed -n -e \"3p\")\" = goodbye &&\n"> <"\ttest -z \"$(git config --get svn-remote.svn.fetch \\\n"> <"\t\t \"^trunk:refs/remotes/thunk@2$\")\"\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"init and fetch from one svn-remote">)} { (SQ <"\n"> <" git config svn-remote.svn.url \"$svnrepo\" &&\n"> <" git config --add svn-remote.svn.fetch \\\n"> <" trunk:refs/remotes/svn/trunk &&\n"> <" git config --add svn-remote.svn.fetch \\\n"> <" thunk:refs/remotes/svn/thunk &&\n"> <" git svn fetch -i svn/thunk &&\n"> <"\ttest \"$(git rev-parse --verify refs/remotes/svn/trunk)\" \\\n"> <"\t = \"$(git rev-parse --verify refs/remotes/svn/thunk~1)\" &&\n"> <"\ttest \"$(git cat-file blob refs/remotes/svn/thunk:readme |\\\n"> <"\t\t sed -n -e \"3p\")\" = goodbye\n"> <" "> ) } ) (C {(test_expect_success)} {(SQ <"follow deleted parent">)} { (SQ <"\n"> <" (svn_cmd cp -m \"resurrecting trunk as junk\" \\\n"> <" \"$svnrepo\"/trunk@2 \"$svnrepo\"/junk ||\n"> <" svn cp -m \"resurrecting trunk as junk\" \\\n"> <" -r2 \"$svnrepo\"/trunk \"$svnrepo\"/junk) &&\n"> <" git config --add svn-remote.svn.fetch \\\n"> <" junk:refs/remotes/svn/junk &&\n"> <" git svn fetch -i svn/thunk &&\n"> <" git svn fetch -i svn/junk &&\n"> <"\ttest -z \"$(git diff svn/junk svn/trunk)\" &&\n"> <"\ttest \"$(git merge-base svn/junk svn/trunk)\" \\\n"> <"\t = \"$(git rev-parse svn/trunk)\"\n"> <" "> ) } ) (C {(test_expect_success)} {(SQ <"follow larger parent">)} { (SQ <"\n"> <" mkdir -p import/trunk/thunk/bump/thud &&\n"> <" echo hi > import/trunk/thunk/bump/thud/file &&\n"> <" svn import -m \"import a larger parent\" import \"$svnrepo\"/larger-parent &&\n"> <" svn cp -m \"hi\" \"$svnrepo\"/larger-parent \"$svnrepo\"/another-larger &&\n"> <" git svn init --minimize-url -i larger \\\n"> <"\t \"$svnrepo\"/larger-parent/trunk/thunk/bump/thud &&\n"> <" git svn fetch -i larger &&\n"> <"\tgit svn init --minimize-url -i larger-parent \\\n"> <"\t \"$svnrepo\"/another-larger/trunk/thunk/bump/thud &&\n"> <"\tgit svn fetch -i larger-parent &&\n"> <" git rev-parse --verify refs/remotes/larger &&\n"> <" git rev-parse --verify \\\n"> <"\t refs/remotes/larger-parent &&\n"> <"\ttest \"$(git merge-base \\\n"> <"\t\t refs/remotes/larger-parent \\\n"> <"\t\t refs/remotes/larger)\" = \\\n"> <"\t \"$(git rev-parse refs/remotes/larger)\"\n"> <" "> ) } ) (C {(test_expect_success)} {(SQ <"follow higher-level parent">)} { (SQ <"\n"> <"\tsvn mkdir -m \"follow higher-level parent\" \"$svnrepo\"/blob &&\n"> <"\tsvn co \"$svnrepo\"/blob blob &&\n"> <"\t(\n"> <"\t\tcd blob &&\n"> <"\t\techo hi > hi &&\n"> <"\t\tsvn add hi &&\n"> <"\t\tsvn commit -m \"hihi\"\n"> <"\t) &&\n"> <"\tsvn mkdir -m \"new glob at top level\" \"$svnrepo\"/glob &&\n"> <"\tsvn mv -m \"move blob down a level\" \"$svnrepo\"/blob \"$svnrepo\"/glob/blob &&\n"> <"\tgit svn init --minimize-url -i blob \"$svnrepo\"/glob/blob &&\n"> <" git svn fetch -i blob\n"> <" "> ) } ) (C {(test_expect_success)} {(SQ <"follow deleted directory">)} { (SQ <"\n"> <"\tsvn_cmd mv -m \"bye!\" \"$svnrepo\"/glob/blob/hi \"$svnrepo\"/glob/blob/bye &&\n"> <"\tsvn_cmd rm -m \"remove glob\" \"$svnrepo\"/glob &&\n"> <"\tgit svn init --minimize-url -i glob \"$svnrepo\"/glob &&\n"> <"\tgit svn fetch -i glob &&\n"> <"\ttest \"$(git cat-file blob refs/remotes/glob:blob/bye)\" = hi &&\n"> <"\ttest \"$(git ls-tree refs/remotes/glob | wc -l )\" -eq 1\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"follow-parent avoids deleting relevant info">)} { (SQ <"\n"> <"\tmkdir -p import/trunk/subversion/bindings/swig/perl/t &&\n"> <"\tfor i in a b c ; do \\\n"> <"\t echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&\n"> <"\t echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \\\n"> <"\tdone &&\n"> <"\t echo \"bad delete test\" > \\\n"> <"\t import/trunk/subversion/bindings/swig/perl/t/larger-parent &&\n"> <"\t echo \"bad delete test 2\" > \\\n"> <"\t import/trunk/subversion/bindings/swig/perl/another-larger &&\n"> <"\t(\n"> <"\t\tcd import &&\n"> <"\t\tsvn import -m \"r9270 test\" . \"$svnrepo\"/r9270\n"> <"\t) &&\n"> <"\tsvn_cmd co \"$svnrepo\"/r9270/trunk/subversion/bindings/swig/perl r9270 &&\n"> <"\t(\n"> <"\t\tcd r9270 &&\n"> <"\t\tsvn mkdir native &&\n"> <"\t\tsvn mv t native/t &&\n"> <"\t\tfor i in a b c\n"> <"\t\tdo\n"> <"\t\t\tsvn mv $i.pm native/$i.pm\n"> <"\t\tdone &&\n"> <"\t\techo z >>native/t/c.t &&\n"> <"\t\tpoke native/t/c.t &&\n"> <"\t\tsvn commit -m \"reorg test\"\n"> <"\t) &&\n"> <"\tgit svn init --minimize-url -i r9270-t \\\n"> <"\t \"$svnrepo\"/r9270/trunk/subversion/bindings/swig/perl/native/t &&\n"> <"\tgit svn fetch -i r9270-t &&\n"> <"\ttest $(git rev-list r9270-t | wc -l) -eq 2 &&\n"> <"\ttest \"$(git ls-tree --name-only r9270-t~1)\" = \\\n"> <"\t \"$(git ls-tree --name-only r9270-t)\"\n"> <"\t"> ) } ) (C {(test_expect_success)} {(DQ ("track initial change if it was only made to parent"))} { (SQ <"\n"> <"\tsvn_cmd cp -m \"wheee!\" \"$svnrepo\"/r9270/trunk \"$svnrepo\"/r9270/drunk &&\n"> <"\tgit svn init --minimize-url -i r9270-d \\\n"> <"\t \"$svnrepo\"/r9270/drunk/subversion/bindings/swig/perl/native/t &&\n"> <"\tgit svn fetch -i r9270-d &&\n"> <"\ttest $(git rev-list r9270-d | wc -l) -eq 3 &&\n"> <"\ttest \"$(git ls-tree --name-only r9270-t)\" = \\\n"> <"\t \"$(git ls-tree --name-only r9270-d)\" &&\n"> <"\ttest \"$(git rev-parse r9270-t)\" = \\\n"> <"\t \"$(git rev-parse r9270-d~1)\"\n"> <"\t"> ) } ) (C {(test_expect_success)} {(DQ ("follow-parent is atomic"))} { (SQ <"\n"> <"\t(\n"> <"\t\tcd wc &&\n"> <"\t\tsvn_cmd up &&\n"> <"\t\tsvn_cmd mkdir stunk &&\n"> <"\t\techo \"trunk stunk\" > stunk/readme &&\n"> <"\t\tsvn_cmd add stunk/readme &&\n"> <"\t\tsvn_cmd ci -m \"trunk stunk\" &&\n"> <"\t\techo \"stunk like junk\" >> stunk/readme &&\n"> <"\t\tsvn_cmd ci -m \"really stunk\" &&\n"> <"\t\techo \"stink stank stunk\" >> stunk/readme &&\n"> <"\t\tsvn_cmd ci -m \"even the grinch agrees\"\n"> <"\t) &&\n"> <"\tsvn_cmd copy -m \"stunk flunked\" \"$svnrepo\"/stunk \"$svnrepo\"/flunk &&\n"> <"\t{ svn cp -m \"early stunk flunked too\" \\\n"> <"\t\t\"$svnrepo\"/stunk@17 \"$svnrepo\"/flunked ||\n"> <"\tsvn_cmd cp -m \"early stunk flunked too\" \\\n"> <"\t\t-r17 \"$svnrepo\"/stunk \"$svnrepo\"/flunked; } &&\n"> <"\tgit svn init --minimize-url -i stunk \"$svnrepo\"/stunk &&\n"> <"\tgit svn fetch -i stunk &&\n"> <"\tgit update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&\n"> <"\tgit update-ref -d refs/remotes/stunk &&\n"> <"\tgit config --unset svn-remote.svn.fetch stunk &&\n"> <"\tmkdir -p \"$GIT_DIR\"/svn/refs/remotes/flunk@18 &&\n"> <"\trev_map=$(cd \"$GIT_DIR\"/svn/refs/remotes/stunk && ls .rev_map*) &&\n"> <"\tdd if=\"$GIT_DIR\"/svn/refs/remotes/stunk/$rev_map \\\n"> <"\t of=\"$GIT_DIR\"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&\n"> <"\trm -rf \"$GIT_DIR\"/svn/refs/remotes/stunk &&\n"> <"\tgit svn init --minimize-url -i flunk \"$svnrepo\"/flunk &&\n"> <"\tgit svn fetch -i flunk &&\n"> <"\tgit svn init --minimize-url -i stunk \"$svnrepo\"/stunk &&\n"> <"\tgit svn fetch -i stunk &&\n"> <"\tgit svn init --minimize-url -i flunked \"$svnrepo\"/flunked &&\n"> <"\tgit svn fetch -i flunked &&\n"> <"\ttest \"$(git rev-parse --verify refs/remotes/flunk@18)\" \\\n"> <"\t = \"$(git rev-parse --verify refs/remotes/stunk)\" &&\n"> <"\ttest \"$(git rev-parse --verify refs/remotes/flunk~1)\" \\\n"> <"\t = \"$(git rev-parse --verify refs/remotes/stunk)\" &&\n"> <"\ttest \"$(git rev-parse --verify refs/remotes/flunked~1)\" \\\n"> <"\t = \"$(git rev-parse --verify refs/remotes/stunk~1)\"\n"> <"\t"> ) } ) (C {(test_expect_success)} {(DQ ("track multi-parent paths"))} { (SQ <"\n"> <"\tsvn_cmd cp -m \"resurrect /glob\" \"$svnrepo\"/r9270 \"$svnrepo\"/glob &&\n"> <"\tgit svn multi-fetch &&\n"> <"\ttest $(git cat-file commit refs/remotes/glob | \\\n"> <"\t grep \"^parent \" | wc -l) -eq 2\n"> <"\t"> ) } ) (C {(test_expect_success)} {(DQ ("multi-fetch continues to work"))} {(DQ ("\n") ("\tgit svn multi-fetch\n") ("\t"))} ) (C {(test_expect_success)} {(DQ ("multi-fetch works off a 'clean' repository"))} { (SQ <"\n"> <"\trm -r \"$GIT_DIR/svn\" \"$GIT_DIR/refs/remotes\" \"$GIT_DIR/logs\" &&\n"> <"\tmkdir \"$GIT_DIR/svn\" &&\n"> <"\tgit svn multi-fetch\n"> <"\t"> ) } ) (C {(test_debug)} {(SQ <"gitk --all &">)}) (C {(test_done)}) ] )