"Hacktree" is now known as "OSTree"

It just sounds better.

tests/libtest.sh

@@ -20,7 +20,7 @@
 
 TMPDIR=${TMPDIR:-/tmp}
 export TMPDIR
-test_tmpdir=`mktemp -d "$TMPDIR/hacktree-tests.XXXXXXXXXX"`
+test_tmpdir=`mktemp -d "$TMPDIR/ostree-tests.XXXXXXXXXX"`
 cd "$test_tmpdir"
 touch "$test_tmpdir/.test$$"
 
@@ -57,12 +57,12 @@ setup_test_repository1 () {
     echo second > secondfile
 
     mkdir ../repo
-    ht_repo="--repo=../repo"
-    export ht_repo
-    hacktree init $ht_repo
-    hacktree commit $ht_repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
-    hacktree commit $ht_repo -s "Test Commit 2" -b "Commit body second" --add=secondfile
-    hacktree fsck -q $ht_repo
+    ot_repo="--repo=../repo"
+    export ot_repo
+    ostree init $ot_repo
+    ostree commit $ot_repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
+    ostree commit $ot_repo -s "Test Commit 2" -b "Commit body second" --add=secondfile
+    ostree fsck -q $ot_repo
 }
 
 setup_test_repository2 () {
@@ -82,13 +82,13 @@ setup_test_repository2 () {
     cd ..
     mkdir repo
     cd repo
-    ht_repo="--repo=`pwd`"
+    ot_repo="--repo=`pwd`"
     cd ../files
-    export ht_repo
-    hacktree init $ht_repo
-    hacktree commit $ht_repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
-    hacktree commit $ht_repo -s "Test Commit 2" -b "Commit body second" --add=baz/cow  --add=baz/saucer --add=baz/deeper/ohyeah --add=baz/another/y
-    hacktree fsck -q $ht_repo
+    export ot_repo
+    ostree init $ot_repo
+    ostree commit $ot_repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
+    ostree commit $ot_repo -s "Test Commit 2" -b "Commit body second" --add=baz/cow  --add=baz/saucer --add=baz/deeper/ohyeah --add=baz/another/y
+    ostree fsck -q $ot_repo
 }
 
 trap 'die' EXIT

tests/t0000-init-link-files-fsck.sh

@@ -31,15 +31,15 @@ echo moo > files/cow
 
 mkdir repo
 cd repo
-hacktree init
+ostree init
 echo 'ok init'
-hacktree fsck -q
+ostree fsck -q
 echo 'ok fsck'
-hacktree link-file $files/foo
+ostree link-file $files/foo
 echo 'ok link'
-hacktree fsck -q
+ostree fsck -q
 echo 'ok link-fsk'
-hacktree link-file $files/cow
-hacktree fsck -q
+ostree link-file $files/cow
+ostree fsck -q
 echo 'ok link-fsk2'
 

tests/t0001-init-out-of-tree.sh

@@ -29,9 +29,9 @@ cd files
 echo hello > yy
 
 mkdir ../repo
-hacktree init --repo=../repo
+ostree init --repo=../repo
 echo 'ok init'
-hacktree fsck --repo=../repo -q
+ostree fsck --repo=../repo -q
 echo 'ok fsck'
-hacktree link-file --repo=../repo yy
+ostree link-file --repo=../repo yy
 echo 'ok link'

tests/t0002-commit-one.sh

@@ -30,9 +30,9 @@ echo hello > yy
 
 mkdir ../repo
 repo="--repo=../repo"
-hacktree init $repo
+ostree init $repo
 echo 'ok init'
-hacktree commit $repo -s "Test Commit" -b "Commit body" --add=yy
+ostree commit $repo -s "Test Commit" -b "Commit body" --add=yy
 echo 'ok commit'
-hacktree fsck -q $repo
+ostree fsck -q $repo
 echo 'ok fsck'

tests/t0003-commit-multiple.sh

@@ -31,11 +31,11 @@ echo second > secondfile
 
 mkdir ../repo
 repo="--repo=../repo"
-hacktree init $repo
+ostree init $repo
 echo 'ok init'
-hacktree commit $repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
+ostree commit $repo -s "Test Commit 1" -b "Commit body first" --add=firstfile
 echo 'ok commit 1'
-hacktree commit $repo -s "Test Commit 2" -b "Commit body first" --add=secondfile
+ostree commit $repo -s "Test Commit 2" -b "Commit body first" --add=secondfile
 echo 'ok commit 2'
-hacktree fsck -q $repo
+ostree fsck -q $repo
 echo 'ok fsck'

tests/t0004-checkout-test1.sh

@@ -26,7 +26,7 @@ echo '1..3'
 
 setup_test_repository1
 echo 'ok setup'
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout1-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout1-head
 echo 'ok checkout cmd'
 cd $test_tmpdir/checkout1-head
 assert_has_file firstfile

tests/t0005-nested-tree.sh

@@ -26,7 +26,7 @@ echo '1..5'
 
 setup_test_repository2
 echo 'ok setup'
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout2-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout2-head
 echo 'ok checkout cmd'
 cd $test_tmpdir/checkout2-head
 assert_has_file firstfile

tests/t0006-removal.sh

@@ -25,14 +25,14 @@ set -e
 echo '1..4'
 
 setup_test_repository2
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout2-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout2-head
 echo 'ok setup'
 cd $test_tmpdir/checkout2-head
-hacktree commit -s delete $ht_repo -r firstfile
+ostree commit -s delete $ot_repo -r firstfile
 echo 'ok rm firstfile'
 assert_has_file firstfile  # It should still exist in this checkout
 cd $test_tmpdir
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout3-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout3-head
 echo 'ok checkout 3'
 cd $test_tmpdir/checkout3-head
 assert_not_has_file firstfile

tests/t0007-commit-stdin.sh

@@ -25,7 +25,7 @@ set -e
 echo "1..2"
 
 setup_test_repository2
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout2-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout2-head
 cd $test_tmpdir/checkout2-head
 mkdir -p a/nested/tree
 echo one > a/nested/tree/1
@@ -39,9 +39,9 @@ mkdir -p another/nested/tree
 echo anotherone > another/nested/tree/1
 echo whee2 > another/whee
 # FIXME - remove grep for .
-find | grep -v '^\.$' | hacktree commit $ht_repo --from-stdin -s "From find"
+find | grep -v '^\.$' | ostree commit $ot_repo --from-stdin -s "From find"
 echo "ok commit stdin"
-hacktree checkout $ht_repo HEAD $test_tmpdir/checkout3-head
+ostree checkout $ot_repo HEAD $test_tmpdir/checkout3-head
 cd $test_tmpdir/checkout3-head
 assert_has_file a/nested/2
 assert_file_has_content a/nested/2 'two2'

tests/t0008-log.sh

@@ -22,10 +22,10 @@ set -e
 
 . libtest.sh
 
-echo "1..2"
+echo "1..1"
 
 setup_test_repository2
-hacktree log $ht_repo > $test_tmpdir/log.txt
+ostree log $ot_repo > $test_tmpdir/log.txt
 assert_file_has_content $test_tmpdir/log.txt "Test Commit 1"
 assert_file_has_content $test_tmpdir/log.txt "Test Commit 2"
 echo "ok log"