t/t9100-git-svn-basic.sh

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