#!/bin/sh # # Copyright (c) 2007 Eric Wong # global test_description := ''git svn funky branch names'' source ./lib-git-svn.sh # Abo-Uebernahme (Bug #994) global scary_uri := ''Abo-Uebernahme%20%28Bug%20%23994%29'' global scary_ref := ''Abo-Uebernahme%20(Bug%20#994)'' test_expect_success 'setup svnrepo' ' mkdir project project/trunk project/branches project/tags && echo foo > project/trunk/foo && svn_cmd import -m "$test_description" project "$svnrepo/pr ject" && rm -rf project && svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \ "$svnrepo/pr ject/branches/fun plugin" && svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \ "$svnrepo/pr ject/branches/more fun plugin!" && svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \ "$svnrepo/pr ject/branches/$scary_uri" && svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \ "$svnrepo/pr ject/branches/.leading_dot" && if test_have_prereq !MINGW then svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \ "$svnrepo/pr ject/branches/trailing_dot." fi && svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \ "$svnrepo/pr ject/branches/trailing_dotlock.lock" && svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \ "$svnrepo/pr ject/branches/not-a@{0}reflog@" && maybe_start_httpd ' # SVN 1.7 will truncate "not-a%40{0]" to just "not-a". # Look at what SVN wound up naming the branch and use that. # Be sure to escape the @ if it shows up. global non_reflog := $[svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/] test_expect_success 'test clone with funky branch names' ' git svn clone -s "$svnrepo/pr ject" project && ( cd project && git rev-parse "refs/remotes/origin/fun%20plugin" && git rev-parse "refs/remotes/origin/more%20fun%20plugin!" && git rev-parse "refs/remotes/origin/$scary_ref" && git rev-parse "refs/remotes/origin/%2Eleading_dot" && if test_have_prereq !MINGW then git rev-parse "refs/remotes/origin/trailing_dot%2E" fi && git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" && git rev-parse "refs/remotes/origin/$non_reflog" ) ' test_expect_success 'test dcommit to funky branch' " ( cd project && git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' && echo hello >> foo && git commit -m 'hello' -- foo && git svn dcommit ) " test_expect_success 'test dcommit to scary branch' ' ( cd project && git reset --hard "refs/remotes/origin/$scary_ref" && echo urls are scary >> foo && git commit -m "eep" -- foo && git svn dcommit ) ' test_expect_success 'test dcommit to trailing_dotlock branch' ' ( cd project && git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" && echo who names branches like this anyway? >> foo && git commit -m "bar" -- foo && git svn dcommit ) ' stop_httpd test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git svn funky branch names">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./lib-git-svn.sh)}) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:scary_uri) op: Equal rhs: {(SQ <"Abo-Uebernahme%20%28Bug%20%23994%29">)} spids: [26] ) ] spids: [26] ) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:scary_ref) op: Equal rhs: {(SQ <"Abo-Uebernahme%20(Bug%20#994)">)} spids: [31] ) ] spids: [31] ) (C {(test_expect_success)} {(SQ <"setup svnrepo">)} { (SQ <"\n"> <"\tmkdir project project/trunk project/branches project/tags &&\n"> <"\techo foo > project/trunk/foo &&\n"> <"\tsvn_cmd import -m \"$test_description\" project \"$svnrepo/pr ject\" &&\n"> <"\trm -rf project &&\n"> <"\tsvn_cmd cp -m \"fun\" \"$svnrepo/pr ject/trunk\" \\\n"> <"\t \"$svnrepo/pr ject/branches/fun plugin\" &&\n"> <"\tsvn_cmd cp -m \"more fun!\" \"$svnrepo/pr ject/branches/fun plugin\" \\\n"> <"\t \"$svnrepo/pr ject/branches/more fun plugin!\" &&\n"> <"\tsvn_cmd cp -m \"scary\" \"$svnrepo/pr ject/branches/fun plugin\" \\\n"> <"\t \"$svnrepo/pr ject/branches/$scary_uri\" &&\n"> <"\tsvn_cmd cp -m \"leading dot\" \"$svnrepo/pr ject/trunk\" \\\n"> <"\t\t\t\"$svnrepo/pr ject/branches/.leading_dot\" &&\n"> <"\tif test_have_prereq !MINGW\n"> <"\tthen\n"> <"\t\tsvn_cmd cp -m \"trailing dot\" \"$svnrepo/pr ject/trunk\" \\\n"> <"\t\t\t\"$svnrepo/pr ject/branches/trailing_dot.\"\n"> <"\tfi &&\n"> <"\tsvn_cmd cp -m \"trailing .lock\" \"$svnrepo/pr ject/trunk\" \\\n"> <"\t\t\t\"$svnrepo/pr ject/branches/trailing_dotlock.lock\" &&\n"> <"\tsvn_cmd cp -m \"reflog\" \"$svnrepo/pr ject/trunk\" \\\n"> <"\t\t\t\"$svnrepo/pr ject/branches/not-a@{0}reflog@\" &&\n"> <"\tmaybe_start_httpd\n"> <"\t"> ) } ) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:non_reflog) op: Equal rhs: { (CommandSubPart command_list: (CommandList children: [ (Pipeline children: [ (C {(svn_cmd)} {(ls)} {(DQ ($ VSub_Name "$svnrepo") ("/pr ject/branches"))}) (C {(grep)} {(not-a)}) (C {(sed)} {(SQ <"s/\\///">)}) (C {(sed)} {(SQ <"s/@/%40/">)}) ] negated: False ) ] ) left_token: spids: [81 112] ) } spids: [80] ) ] spids: [80] ) (C {(test_expect_success)} {(SQ <"test clone with funky branch names">)} { (SQ <"\n"> <"\tgit svn clone -s \"$svnrepo/pr ject\" project &&\n"> <"\t(\n"> <"\t\tcd project &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/fun%20plugin\" &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/more%20fun%20plugin!\" &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/$scary_ref\" &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/%2Eleading_dot\" &&\n"> <"\t\tif test_have_prereq !MINGW\n"> <"\t\tthen\n"> <"\t\t\tgit rev-parse \"refs/remotes/origin/trailing_dot%2E\"\n"> <"\t\tfi &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/trailing_dotlock%2Elock\" &&\n"> <"\t\tgit rev-parse \"refs/remotes/origin/$non_reflog\"\n"> <"\t)\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"test dcommit to funky branch">)} { (DQ ("\n") ("\t(\n") ("\t\tcd project &&\n") ("\t\tgit reset --hard 'refs/remotes/origin/more%20fun%20plugin!' &&\n") ("\t\techo hello >> foo &&\n") ("\t\tgit commit -m 'hello' -- foo &&\n") ("\t\tgit svn dcommit\n") ("\t)\n") ("\t") ) } ) (C {(test_expect_success)} {(SQ <"test dcommit to scary branch">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd project &&\n"> <"\t\tgit reset --hard \"refs/remotes/origin/$scary_ref\" &&\n"> <"\t\techo urls are scary >> foo &&\n"> <"\t\tgit commit -m \"eep\" -- foo &&\n"> <"\t\tgit svn dcommit\n"> <"\t)\n"> <"\t"> ) } ) (C {(test_expect_success)} {(SQ <"test dcommit to trailing_dotlock branch">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd project &&\n"> <"\t\tgit reset --hard \"refs/remotes/origin/trailing_dotlock%2Elock\" &&\n"> <"\t\techo who names branches like this anyway? >> foo &&\n"> <"\t\tgit commit -m \"bar\" -- foo &&\n"> <"\t\tgit svn dcommit\n"> <"\t)\n"> <"\t"> ) } ) (C {(stop_httpd)}) (C {(test_done)}) ] )