Andrew's git - gitweb.git/blob - t/t9100-git-svn-basic.sh

   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
  69"
  70
  71
  72name='detect node change from directory to file #1'
  73test_expect_success "$name" '
  74        rm -rf dir "$GIT_DIR"/index &&
  75        git checkout -f -b mybranch2 ${remotes_git_svn} &&
  76        mv bar/zzz zzz &&
  77        rm -rf bar &&
  78        mv zzz bar &&
  79        git update-index --remove -- bar/zzz &&
  80        git update-index --add -- bar &&
  81        git commit -m "$name" &&
  82        test_must_fail git svn set-tree --find-copies-harder --rmdir \
  83                ${remotes_git_svn}..mybranch2
  84'
  85
  86
  87name='detect node change from file to directory #2'
  88test_expect_success "$name" '
  89        rm -f "$GIT_DIR"/index &&
  90        git checkout -f -b mybranch3 ${remotes_git_svn} &&
  91        rm bar/zzz &&
  92        git update-index --remove bar/zzz &&
  93        mkdir bar/zzz &&
  94        echo yyy > bar/zzz/yyy &&
  95        git update-index --add bar/zzz/yyy &&
  96        git commit -m "$name" &&
  97        git svn set-tree --find-copies-harder --rmdir \
  98                ${remotes_git_svn}..mybranch3 &&
  99        svn_cmd up "$SVN_TREE" &&
 100        test -d "$SVN_TREE"/bar/zzz &&
 101        test -e "$SVN_TREE"/bar/zzz/yyy
 102'
 103
 104name='detect node change from directory to file #2'
 105test_expect_success "$name" '
 106        rm -f "$GIT_DIR"/index &&
 107        git checkout -f -b mybranch4 ${remotes_git_svn} &&
 108        rm -rf dir &&
 109        git update-index --remove -- dir/file &&
 110        touch dir &&
 111        echo asdf > dir &&
 112        git update-index --add -- dir &&
 113        git commit -m "$name" &&
 114        test_must_fail git svn set-tree --find-copies-harder --rmdir \
 115                ${remotes_git_svn}..mybranch4
 116'
 117
 118
 119name='remove executable bit from a file'
 120test_expect_success POSIXPERM "$name" '
 121        rm -f "$GIT_DIR"/index &&
 122        git checkout -f -b mybranch5 ${remotes_git_svn} &&
 123        chmod -x exec.sh &&
 124        git update-index exec.sh &&
 125        git commit -m "$name" &&
 126        git svn set-tree --find-copies-harder --rmdir \
 127                ${remotes_git_svn}..mybranch5 &&
 128        svn_cmd up "$SVN_TREE" &&
 129        test ! -x "$SVN_TREE"/exec.sh'
 130
 131
 132name='add executable bit back file'
 133test_expect_success POSIXPERM "$name" '
 134        chmod +x exec.sh &&
 135        git update-index exec.sh &&
 136        git commit -m "$name" &&
 137        git svn set-tree --find-copies-harder --rmdir \
 138                ${remotes_git_svn}..mybranch5 &&
 139        svn_cmd up "$SVN_TREE" &&
 140        test -x "$SVN_TREE"/exec.sh'
 141
 142
 143name='executable file becomes a symlink to file'
 144test_expect_success SYMLINKS "$name" '
 145        rm exec.sh &&
 146        ln -s file exec.sh &&
 147        git update-index exec.sh &&
 148        git commit -m "$name" &&
 149        git svn set-tree --find-copies-harder --rmdir \
 150                ${remotes_git_svn}..mybranch5 &&
 151        svn_cmd up "$SVN_TREE" &&
 152        test -h "$SVN_TREE"/exec.sh'
 153
 154name='new symlink is added to a file that was also just made executable'
 155
 156test_expect_success POSIXPERM,SYMLINKS "$name" '
 157        chmod +x file &&
 158        ln -s file exec-2.sh &&
 159        git update-index --add file exec-2.sh &&
 160        git commit -m "$name" &&
 161        git svn set-tree --find-copies-harder --rmdir \
 162                ${remotes_git_svn}..mybranch5 &&
 163        svn_cmd up "$SVN_TREE" &&
 164        test -x "$SVN_TREE"/file &&
 165        test -h "$SVN_TREE"/exec-2.sh'
 166
 167name='modify a symlink to become a file'
 168test_expect_success POSIXPERM,SYMLINKS "$name" '
 169        echo git help >help &&
 170        rm exec-2.sh &&
 171        cp help exec-2.sh &&
 172        git update-index exec-2.sh &&
 173        git commit -m "$name" &&
 174        git svn set-tree --find-copies-harder --rmdir \
 175                ${remotes_git_svn}..mybranch5 &&
 176        svn_cmd up "$SVN_TREE" &&
 177        test -f "$SVN_TREE"/exec-2.sh &&
 178        test ! -h "$SVN_TREE"/exec-2.sh &&
 179        test_cmp help "$SVN_TREE"/exec-2.sh'
 180
 181name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
 182LC_ALL="$GIT_SVN_LC_ALL"
 183export LC_ALL
 184# This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
 185test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
 186        echo '# hello' >> exec-2.sh &&
 187        git update-index exec-2.sh &&
 188        git commit -m 'éï∏' &&
 189        git svn set-tree HEAD"
 190unset LC_ALL
 191
 192name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
 193GIT_SVN_ID=alt
 194export GIT_SVN_ID
 195test_expect_success "$name" \
 196    'git svn init "$svnrepo" && git svn fetch &&
 197     git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
 198     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
 199     test_cmp a b'
 200
 201name='check imported tree checksums expected tree checksums'
 202rm -f expected
 203if test_have_prereq UTF8
 204then
 205        echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected
 206fi
 207cat >> expected <<\EOF
 208tree c3322890dcf74901f32d216f05c5044f670ce632
 209tree d3ccd5035feafd17b030c5732e7808cc49122853
 210tree d03e1630363d4881e68929d532746b20b0986b83
 211tree 149d63cd5878155c846e8c55d7d8487de283f89e
 212tree 312b76e4f64ce14893aeac8591eb3960b065e247
 213tree 149d63cd5878155c846e8c55d7d8487de283f89e
 214tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
 215tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
 216EOF
 217
 218test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
 219
 220test_expect_success 'exit if remote refs are ambigious' "
 221        git config --add svn-remote.svn.fetch \
 222                              bar:refs/${remotes_git_svn} &&
 223        test_must_fail git svn migrate
 224"
 225
 226test_expect_success 'exit if init-ing a would clobber a URL' '
 227        svnadmin create "${PWD}/svnrepo2" &&
 228        svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
 229        git config --unset svn-remote.svn.fetch \
 230                                "^bar:refs/${remotes_git_svn}$" &&
 231        test_must_fail git svn init "${svnrepo}2/bar"
 232        '
 233
 234test_expect_success \
 235  'init allows us to connect to another directory in the same repo' '
 236        git svn init --minimize-url -i bar "$svnrepo/bar" &&
 237        git config --get svn-remote.svn.fetch \
 238                              "^bar:refs/remotes/bar$" &&
 239        git config --get svn-remote.svn.fetch \
 240                              "^:refs/${remotes_git_svn}$"
 241        '
 242
 243test_expect_success 'dcommit $rev does not clobber current branch' '
 244        git svn fetch -i bar &&
 245        git checkout -b my-bar refs/remotes/bar &&
 246        echo 1 > foo &&
 247        git add foo &&
 248        git commit -m "change 1" &&
 249        echo 2 > foo &&
 250        git add foo &&
 251        git commit -m "change 2" &&
 252        old_head=$(git rev-parse HEAD) &&
 253        git svn dcommit -i bar HEAD^ &&
 254        test $old_head = $(git rev-parse HEAD) &&
 255        test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
 256        git log refs/remotes/bar | grep "change 1" &&
 257        ! git log refs/remotes/bar | grep "change 2" &&
 258        git checkout master &&
 259        git branch -D my-bar
 260        '
 261
 262test_expect_success 'able to dcommit to a subdirectory' "
 263        git svn fetch -i bar &&
 264        git checkout -b my-bar refs/remotes/bar &&
 265        echo abc > d &&
 266        git update-index --add d &&
 267        git commit -m '/bar/d should be in the log' &&
 268        git svn dcommit -i bar &&
 269        test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
 270        mkdir newdir &&
 271        echo new > newdir/dir &&
 272        git update-index --add newdir/dir &&
 273        git commit -m 'add a new directory' &&
 274        git svn dcommit -i bar &&
 275        test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
 276        echo foo >> newdir/dir &&
 277        git update-index newdir/dir &&
 278        git commit -m 'modify a file in new directory' &&
 279        git svn dcommit -i bar &&
 280        test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
 281        "
 282
 283test_expect_success 'dcommit should not fail with a touched file' '
 284        test_commit "commit-new-file-foo2" foo2 &&
 285        test-chmtime =-60 foo &&
 286        git svn dcommit
 287'
 288
 289test_expect_success 'rebase should not fail with a touched file' '
 290        test-chmtime =-60 foo &&
 291        git svn rebase
 292'
 293
 294test_expect_success 'able to set-tree to a subdirectory' "
 295        echo cba > d &&
 296        git update-index d &&
 297        git commit -m 'update /bar/d' &&
 298        git svn set-tree -i bar HEAD &&
 299        test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
 300        "
 301
 302test_expect_success 'git-svn works in a bare repository' '
 303        mkdir bare-repo &&
 304        ( cd bare-repo &&
 305        git init --bare &&
 306        GIT_DIR=. git svn init "$svnrepo" &&
 307        git svn fetch ) &&
 308        rm -rf bare-repo
 309        '
 310test_expect_success 'git-svn works in in a repository with a gitdir: link' '
 311        mkdir worktree gitdir &&
 312        ( cd worktree &&
 313        git svn init "$svnrepo" &&
 314        git init --separate-git-dir ../gitdir &&
 315        git svn fetch ) &&
 316        rm -rf worktree gitdir
 317        '
 318
 319test_done