Andrew's git / gitweb.git / t/t9100-git-svn-basic.sh
?
t / t9100-git-svn-basic.shon commit Merge branch 'master' of git://bogomips.org/git-svn (675fff4)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Eric Wong
   4#
   5
   6test_description='git svn basic tests'
   7GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
   8
   9. ./lib-git-svn.sh
  10
  11say 'define NO_SVN_TESTS to skip git svn tests'
  12
  13case "$GIT_SVN_LC_ALL" in
  14*.UTF-8)
  15        test_set_prereq UTF8
  16        ;;
  17*)
  18        say "# UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)"
  19        ;;
  20esac
  21
  22test_expect_success \
  23    'initialize git svn' '
  24        mkdir import &&
  25        (
  26                cd import &&
  27                echo foo >foo &&
  28                ln -s foo foo.link
  29                mkdir -p dir/a/b/c/d/e &&
  30                echo "deep dir" >dir/a/b/c/d/e/file &&
  31                mkdir bar &&
  32                echo "zzz" >bar/zzz &&
  33                echo "#!/bin/sh" >exec.sh &&
  34                chmod +x exec.sh &&
  35                svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
  36        ) &&
  37        rm -rf import &&
  38        git svn init "$svnrepo"'
  39
  40test_expect_success \
  41    'import an SVN revision into git' \
  42    'git svn fetch'
  43
  44test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
  45
  46name='try a deep --rmdir with a commit'
  47test_expect_success "$name" '
  48        git checkout -f -b mybranch ${remotes_git_svn} &&
  49        mv dir/a/b/c/d/e/file dir/file &&
  50        cp dir/file file &&
  51        git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
  52        git commit -m "$name" &&
  53        git svn set-tree --find-copies-harder --rmdir \
  54                ${remotes_git_svn}..mybranch &&
  55        svn_cmd up "$SVN_TREE" &&
  56        test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
  57
  58
  59name='detect node change from file to directory #1'
  60test_expect_success "$name" "
  61        mkdir dir/new_file &&
  62        mv dir/file dir/new_file/file &&
  63        mv dir/new_file dir/file &&
  64        git update-index --remove dir/file &&
  65        git update-index --add dir/file/file &&
  66        git commit -m '$name' &&
  67        test_must_fail git svn set-tree --find-copies-harder --rmdir \
  68                ${remotes_git_svn}..mybranch" || true
  69
  70
  71name='detect node change from directory to file #1'
  72test_expect_success "$name" '
  73        rm -rf dir "$GIT_DIR"/index &&
  74        git checkout -f -b mybranch2 ${remotes_git_svn} &&
  75        mv bar/zzz zzz &&
  76        rm -rf bar &&
  77        mv zzz bar &&
  78        git update-index --remove -- bar/zzz &&
  79        git update-index --add -- bar &&
  80        git commit -m "$name" &&
  81        test_must_fail git svn set-tree --find-copies-harder --rmdir \
  82                ${remotes_git_svn}..mybranch2' || true
  83
  84
  85name='detect node change from file to directory #2'
  86test_expect_success "$name" '
  87        rm -f "$GIT_DIR"/index &&
  88        git checkout -f -b mybranch3 ${remotes_git_svn} &&
  89        rm bar/zzz &&
  90        git update-index --remove bar/zzz &&
  91        mkdir bar/zzz &&
  92        echo yyy > bar/zzz/yyy &&
  93        git update-index --add bar/zzz/yyy &&
  94        git commit -m "$name" &&
  95        git svn set-tree --find-copies-harder --rmdir \
  96                ${remotes_git_svn}..mybranch3 &&
  97        svn_cmd up "$SVN_TREE" &&
  98        test -d "$SVN_TREE"/bar/zzz &&
  99        test -e "$SVN_TREE"/bar/zzz/yyy ' || true
 100
 101name='detect node change from directory to file #2'
 102test_expect_success "$name" '
 103        rm -f "$GIT_DIR"/index &&
 104        git checkout -f -b mybranch4 ${remotes_git_svn} &&
 105        rm -rf dir &&
 106        git update-index --remove -- dir/file &&
 107        touch dir &&
 108        echo asdf > dir &&
 109        git update-index --add -- dir &&
 110        git commit -m "$name" &&
 111        test_must_fail git svn set-tree --find-copies-harder --rmdir \
 112                ${remotes_git_svn}..mybranch4' || true
 113
 114
 115name='remove executable bit from a file'
 116test_expect_success "$name" '
 117        rm -f "$GIT_DIR"/index &&
 118        git checkout -f -b mybranch5 ${remotes_git_svn} &&
 119        chmod -x exec.sh &&
 120        git update-index exec.sh &&
 121        git commit -m "$name" &&
 122        git svn set-tree --find-copies-harder --rmdir \
 123                ${remotes_git_svn}..mybranch5 &&
 124        svn_cmd up "$SVN_TREE" &&
 125        test ! -x "$SVN_TREE"/exec.sh'
 126
 127
 128name='add executable bit back file'
 129test_expect_success "$name" '
 130        chmod +x exec.sh &&
 131        git update-index exec.sh &&
 132        git commit -m "$name" &&
 133        git svn set-tree --find-copies-harder --rmdir \
 134                ${remotes_git_svn}..mybranch5 &&
 135        svn_cmd up "$SVN_TREE" &&
 136        test -x "$SVN_TREE"/exec.sh'
 137
 138
 139name='executable file becomes a symlink to file'
 140test_expect_success "$name" '
 141        rm exec.sh &&
 142        ln -s file exec.sh &&
 143        git update-index exec.sh &&
 144        git commit -m "$name" &&
 145        git svn set-tree --find-copies-harder --rmdir \
 146                ${remotes_git_svn}..mybranch5 &&
 147        svn_cmd up "$SVN_TREE" &&
 148        test -h "$SVN_TREE"/exec.sh'
 149
 150name='new symlink is added to a file that was also just made executable'
 151
 152test_expect_success "$name" '
 153        chmod +x file &&
 154        ln -s file exec-2.sh &&
 155        git update-index --add file exec-2.sh &&
 156        git commit -m "$name" &&
 157        git svn set-tree --find-copies-harder --rmdir \
 158                ${remotes_git_svn}..mybranch5 &&
 159        svn_cmd up "$SVN_TREE" &&
 160        test -x "$SVN_TREE"/file &&
 161        test -h "$SVN_TREE"/exec-2.sh'
 162
 163name='modify a symlink to become a file'
 164test_expect_success "$name" '
 165        echo git help > help || true &&
 166        rm exec-2.sh &&
 167        cp help exec-2.sh &&
 168        git update-index exec-2.sh &&
 169        git commit -m "$name" &&
 170        git svn set-tree --find-copies-harder --rmdir \
 171                ${remotes_git_svn}..mybranch5 &&
 172        svn_cmd up "$SVN_TREE" &&
 173        test -f "$SVN_TREE"/exec-2.sh &&
 174        test ! -h "$SVN_TREE"/exec-2.sh &&
 175        test_cmp help "$SVN_TREE"/exec-2.sh'
 176
 177name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
 178LC_ALL="$GIT_SVN_LC_ALL"
 179export LC_ALL
 180test_expect_success UTF8 "$name" "
 181        echo '# hello' >> exec-2.sh &&
 182        git update-index exec-2.sh &&
 183        git commit -m 'éï∏' &&
 184        git svn set-tree HEAD"
 185unset LC_ALL
 186
 187name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
 188GIT_SVN_ID=alt
 189export GIT_SVN_ID
 190test_expect_success "$name" \
 191    'git svn init "$svnrepo" && git svn fetch &&
 192     git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
 193     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
 194     test_cmp a b'
 195
 196name='check imported tree checksums expected tree checksums'
 197rm -f expected
 198if test_have_prereq UTF8
 199then
 200        echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected
 201fi
 202cat >> expected <<\EOF
 203tree c3322890dcf74901f32d216f05c5044f670ce632
 204tree d3ccd5035feafd17b030c5732e7808cc49122853
 205tree d03e1630363d4881e68929d532746b20b0986b83
 206tree 149d63cd5878155c846e8c55d7d8487de283f89e
 207tree 312b76e4f64ce14893aeac8591eb3960b065e247
 208tree 149d63cd5878155c846e8c55d7d8487de283f89e
 209tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
 210tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
 211EOF
 212
 213test_expect_success "$name" "test_cmp a expected"
 214
 215test_expect_success 'exit if remote refs are ambigious' "
 216        git config --add svn-remote.svn.fetch \
 217                              bar:refs/${remotes_git_svn} &&
 218        test_must_fail git svn migrate
 219"
 220
 221test_expect_success 'exit if init-ing a would clobber a URL' '
 222        svnadmin create "${PWD}/svnrepo2" &&
 223        svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
 224        git config --unset svn-remote.svn.fetch \
 225                                "^bar:refs/${remotes_git_svn}$" &&
 226        test_must_fail git svn init "${svnrepo}2/bar"
 227        '
 228
 229test_expect_success \
 230  'init allows us to connect to another directory in the same repo' '
 231        git svn init --minimize-url -i bar "$svnrepo/bar" &&
 232        git config --get svn-remote.svn.fetch \
 233                              "^bar:refs/remotes/bar$" &&
 234        git config --get svn-remote.svn.fetch \
 235                              "^:refs/${remotes_git_svn}$"
 236        '
 237
 238test_expect_success 'dcommit $rev does not clobber current branch' '
 239        git svn fetch -i bar &&
 240        git checkout -b my-bar refs/remotes/bar &&
 241        echo 1 > foo &&
 242        git add foo &&
 243        git commit -m "change 1" &&
 244        echo 2 > foo &&
 245        git add foo &&
 246        git commit -m "change 2" &&
 247        old_head=$(git rev-parse HEAD) &&
 248        git svn dcommit -i bar HEAD^ &&
 249        test $old_head = $(git rev-parse HEAD) &&
 250        test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
 251        git log refs/remotes/bar | grep "change 1" &&
 252        ! git log refs/remotes/bar | grep "change 2" &&
 253        git checkout master &&
 254        git branch -D my-bar
 255        '
 256
 257test_expect_success 'able to dcommit to a subdirectory' "
 258        git svn fetch -i bar &&
 259        git checkout -b my-bar refs/remotes/bar &&
 260        echo abc > d &&
 261        git update-index --add d &&
 262        git commit -m '/bar/d should be in the log' &&
 263        git svn dcommit -i bar &&
 264        test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
 265        mkdir newdir &&
 266        echo new > newdir/dir &&
 267        git update-index --add newdir/dir &&
 268        git commit -m 'add a new directory' &&
 269        git svn dcommit -i bar &&
 270        test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
 271        echo foo >> newdir/dir &&
 272        git update-index newdir/dir &&
 273        git commit -m 'modify a file in new directory' &&
 274        git svn dcommit -i bar &&
 275        test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
 276        "
 277
 278test_expect_success 'dcommit should not fail with a touched file' '
 279        test_commit "commit-new-file-foo2" foo2 &&
 280        test-chmtime =-60 foo &&
 281        git svn dcommit
 282'
 283
 284test_expect_success 'rebase should not fail with a touched file' '
 285        test-chmtime =-60 foo &&
 286        git svn rebase
 287'
 288
 289test_expect_success 'able to set-tree to a subdirectory' "
 290        echo cba > d &&
 291        git update-index d &&
 292        git commit -m 'update /bar/d' &&
 293        git svn set-tree -i bar HEAD &&
 294        test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
 295        "
 296
 297test_expect_success 'git-svn works in a bare repository' '
 298        mkdir bare-repo &&
 299        ( cd bare-repo &&
 300        git init --bare &&
 301        GIT_DIR=. git svn init "$svnrepo" &&
 302        git svn fetch ) &&
 303        rm -rf bare-repo
 304        '
 305
 306test_done