gistore 1.0.0.rc4

data/t/t1020-commit.sh

@@ -0,0 +1,134 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Jiang Xin
+#
+
+test_description='Test gistore commit'
+
+TEST_NO_CREATE_REPO=NoThanks
+. ./lib-worktree.sh
+. ./test-lib.sh
+
+cwd=$(pwd -P)
+
+cat >expect << EOF
+root/doc/COPYRIGHT
+root/src/README.txt
+root/src/images/test-binary-1.png
+root/src/images/test-binary-2.png
+root/src/lib/a/foo.c
+root/src/lib/b/bar.o
+root/src/lib/b/baz.a
+EOF
+
+test_expect_success 'initialize for commit' '
+	prepare_work_tree &&
+	gistore init --repo repo.git &&
+	gistore add --repo repo.git root/src &&
+	gistore add --repo repo.git root/doc &&
+	gistore commit --repo repo.git &&
+	test "$(count_git_commits repo.git)" = "1" &&
+	gistore repo repo.git ls-tree --name-only \
+		-r HEAD | sed -e "s#^${cwd#/}/##g" > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'nothing changed, no commit' '
+	gistore commit --repo repo.git &&
+	touch root/src/README.txt &&
+	gistore commit --repo repo.git &&
+	test "$(count_git_commits repo.git)" = "1"
+'
+
+test_expect_success 'commit if something changed' '
+	echo "more" >> root/src/README.txt &&
+	gistore commit --repo repo.git &&
+	test "$(count_git_commits repo.git)" = "2"
+'
+
+cat >expect << EOF
+root/doc/COPYRIGHT
+root/src/README.txt
+root/src/images/test-binary-1.png
+root/src/images/test-binary-2.png
+root/src/lib/a/foo.c
+root/src/lib/b/bar.o
+EOF
+
+test_expect_success 'commit if something removed' '
+	rm root/src/lib/b/baz.a &&
+	gistore commit --repo repo.git &&
+	test "$(count_git_commits repo.git)" = "3" &&
+	gistore repo repo.git ls-tree --name-only \
+		-r HEAD | sed -e "s#^${cwd#/}/##g" > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+root/doc/COPYRIGHT
+root/new_src/README.txt
+root/new_src/images/test-binary-1.png
+root/new_src/images/test-binary-2.png
+root/new_src/lib/a/foo.c
+root/new_src/lib/b/bar.o
+root/src
+EOF
+
+test_expect_success 'commit even for symlink' '
+	mv root/src root/new_src &&
+	ln -s new_src root/src &&
+	gistore commit --repo repo.git &&
+	test "$(count_git_commits repo.git)" = "4" &&
+	gistore repo repo.git ls-tree --name-only \
+		-r HEAD | sed -e "s#^${cwd#/}/##g" > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+root/doc/COPYRIGHT
+EOF
+
+test_expect_success 'not backup root/src any more' '
+	gistore rm --repo repo.git root/src &&
+	gistore commit --repo repo.git &&
+	test -L root/src &&
+	test -f root/new_src/README.txt &&
+	test -f root/new_src/images/test-binary-1.png &&
+	test -f root/new_src/lib/a/foo.c &&
+	test -f root/new_src/lib/b/bar.o &&
+	gistore repo repo.git ls-tree --name-only \
+		-r HEAD | sed -e "s#^${cwd#/}/##g" > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+root/doc/COPYRIGHT
+root/mod1/README.txt
+root/mod1/lib/doc/bar.txt
+root/mod1/lib/src/foo.c
+root/mod2/README.txt
+root/mod2/doc/bar.txt
+root/mod2/lib/hello.txt
+root/mod2/src/foo.c
+EOF
+
+test_expect_success 'add real files instead of submodule' '
+	gistore add --repo repo.git root/mod1 &&
+	gistore add --repo repo.git root/mod2 &&
+	gistore commit --repo repo.git &&
+	gistore repo repo.git ls-tree --name-only \
+		-r HEAD | sed -e "s#^${cwd#/}/##g" > actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<EOF
+Error: Can not find repo at "non-exist-repo.git"
+EOF
+
+test_expect_success 'fail if commit on non-exist repo' '
+	test_must_fail gistore commit --repo non-exist-repo.git &&
+	(gistore commit --repo non-exist-repo.git 2>actual || true) &&
+	test_cmp expect actual
+'
+
+test_done

data/t/t1030-commit-and-rotate.sh

@@ -0,0 +1,266 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Jiang Xin
+#
+
+test_description='Test gistore commit'
+
+TEST_NO_CREATE_REPO=NoThanks
+. ./lib-worktree.sh
+. ./test-lib.sh
+
+do_hack()
+{
+	echo "hack $*" >> root/src/README.txt
+	echo "hack $*" >> root/doc/COPYRIGHT
+}
+
+cwd=$(pwd -P)
+n=0
+
+test_expect_success 'initialize for commit' '
+	n=$((n+1)) &&
+	prepare_work_tree &&
+	gistore init --repo repo.git &&
+	gistore config --repo repo.git full_backup_number 3 &&
+	gistore config --repo repo.git increment_backup_number 5 &&
+	gistore add --repo repo.git root/src &&
+	gistore add --repo repo.git root/doc &&
+	gistore commit --repo repo.git -m "Backup No. $n" &&
+	test "$(count_git_commits repo.git)" = "$n"
+'
+
+cat >expect << EOF
+Backup No. 6
+Backup No. 5
+Backup No. 4
+Backup No. 3
+Backup No. 2
+Backup No. 1
+EOF
+
+test_expect_success 'no rotate when commit 5 times' '
+	i=0 &&
+	while test $i -lt 5; do
+		i=$((i+1));
+		n=$((n+1));
+		do_hack $n;
+		gistore commit --repo repo.git -m "Backup No. $n";
+	done &&
+	git_log_only_subject repo.git > actual &&
+	test_cmp expect actual &&
+	echo "* master" > expect &&
+	gistore repo repo.git branch > actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<EOF
+  gistore/1
+* master
+EOF
+
+test_expect_success 'rotate with additional commit' '
+	n=$((n+1)) && do_hack $n &&
+	gistore commit --repo repo.git -m "Backup No. $n" &&
+	gistore repo repo.git branch > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 7
+Full backup of repo.git
+Backup No. 5
+Backup No. 4
+Backup No. 3
+Backup No. 2
+Backup No. 1
+EOF
+
+test_expect_success 'graft test' '
+	git_log_only_subject repo.git > actual &&
+	test_cmp expect actual &&
+	head -2 expect > expect2 &&
+	git_log_only_subject repo.git --without_grafts > actual &&
+	test_cmp expect2 actual &&
+	echo "Backup No. 6" >  expect3 &&
+	tail -5 expect       >> expect3 &&
+	git_log_only_subject repo.git --without_grafts gistore/1 > actual &&
+	test_cmp expect3 actual
+'
+
+cat >expect << EOF
+Backup No. 12
+Full backup of repo.git
+Backup No. 10
+Backup No. 9
+Backup No. 8
+Backup No. 7
+Full backup of repo.git
+Backup No. 5
+Backup No. 4
+Backup No. 3
+Backup No. 2
+Backup No. 1
+EOF
+
+test_expect_success 'rotate after commit another 5 times' '
+	i=0 &&
+	while test $i -lt 5; do
+		i=$((i+1));
+		n=$((n+1));
+		do_hack $n;
+		gistore commit --repo repo.git -m "Backup No. $n";
+	done &&
+	git_log_only_subject repo.git > actual &&
+	test_cmp expect actual &&
+	echo "  gistore/1" >  expect &&
+	echo "  gistore/2" >> expect &&
+	echo "* master"    >> expect &&
+	gistore repo repo.git branch > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 12
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of master (no grafts)' '
+	git_log_only_subject repo.git --without_grafts > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 11
+Backup No. 10
+Backup No. 9
+Backup No. 8
+Backup No. 7
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of gistore/1 (no grafts)' '
+	git_log_only_subject repo.git --without_grafts gistore/1 > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 6
+Backup No. 5
+Backup No. 4
+Backup No. 3
+Backup No. 2
+Backup No. 1
+EOF
+
+test_expect_success 'commit log of gistore/2 (no grafts)' '
+	git_log_only_subject repo.git --without_grafts gistore/2 > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+  gistore/1
+  gistore/2
+  gistore/3
+* master
+EOF
+
+test_expect_success 'after 20 commits' '
+	i=0 &&
+	while test $i -lt 20; do
+		i=$((i+1));
+		n=$((n+1));
+		do_hack $n;
+		gistore commit --repo repo.git -m "Backup No. $n";
+	done &&
+	gistore repo repo.git branch > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 21
+Backup No. 20
+Backup No. 19
+Backup No. 18
+Backup No. 17
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of gistore/3 (no grafts)' '
+	git_log_only_subject repo.git --without_grafts gistore/3 > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 26
+Backup No. 25
+Backup No. 24
+Backup No. 23
+Backup No. 22
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of gistore/2 (no grafts)' '
+	git_log_only_subject repo.git --without_grafts gistore/2 > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 31
+Backup No. 30
+Backup No. 29
+Backup No. 28
+Backup No. 27
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of gistore/1 (no grafts)' '
+	git_log_only_subject repo.git --without_grafts gistore/1 > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 32
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of master (no grafts)' '
+	git_log_only_subject repo.git --without_grafts > actual &&
+	test_cmp expect actual
+'
+
+cat >expect << EOF
+Backup No. 32
+Full backup of repo.git
+Backup No. 30
+Backup No. 29
+Backup No. 28
+Backup No. 27
+Full backup of repo.git
+Backup No. 25
+Backup No. 24
+Backup No. 23
+Backup No. 22
+Full backup of repo.git
+Backup No. 20
+Backup No. 19
+Backup No. 18
+Backup No. 17
+Full backup of repo.git
+EOF
+
+test_expect_success 'commit log of master (with grafts)' '
+	git_log_only_subject repo.git > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'purge history using gc' '
+	count=$(count_git_objects repo.git) &&
+	gistore repo repo.git prune --expire=now &&
+	gistore repo repo.git gc &&
+	test $(count_git_objects repo.git) -eq $count &&
+	gistore gc --repo repo.git --force &&
+	test $(count_git_objects repo.git) -lt $count
+'
+
+test_done

data/t/t2000-task-and-commit-all.sh

@@ -0,0 +1,132 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Jiang Xin
+#
+
+test_description='Test gistore task'
+
+TEST_NO_CREATE_REPO=NoThanks
+. ./lib-worktree.sh
+. ./test-lib.sh
+
+do_hack()
+{
+	echo "hack $*" >> root/src/README.txt
+	echo "hack $*" >> root/doc/COPYRIGHT
+}
+
+cwd=$(pwd -P)
+
+HOME=$cwd
+unset XDG_CONFIG_HOME
+GISTORE_TEST_GIT_CONFIG=Yes
+export HOME XDG_CONFIG_HOME GISTORE_TEST_GIT_CONFIG
+
+touch config_file
+GIT_CONFIG=$cwd/config_file
+export GIT_CONFIG
+
+cat >expect << EOF
+System level Tasks
+User level Tasks
+EOF
+
+test_expect_success 'initial config' '
+	prepare_work_tree &&
+	gistore init --repo repo1.git &&
+	gistore init --repo repo2.git &&
+	gistore add  --repo repo1.git root/src root/doc &&
+	gistore add  --repo repo2.git root/src root/doc &&
+	gistore task list |sed -e "/^$/d" > actual &&
+	test_cmp expect actual
+'
+
+# Ruby hash to yaml may have different order, so sort before compare.
+cat >expect << EOF
+    hello => repo1.git
+    world => repo2.git
+EOF
+
+test_expect_success 'task add and task list' '
+	gistore task add hello repo1.git &&
+	gistore task add world repo2.git &&
+	gistore task list | grep -q "$cwd" &&
+	gistore task list | sed -e "/^$/d" | \
+		sed -e "s#${cwd}/##g" | grep "^ " | sort -u > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'commit specific task' '
+	test "$(count_git_commits repo1.git)" = "0" &&
+	test "$(count_git_commits repo2.git)" = "0" &&
+	gistore commit --repo hello -m "task hello, commit no.1" &&
+	test "$(count_git_commits repo1.git)" = "1" &&
+	test "$(count_git_commits repo2.git)" = "0" &&
+	gistore ci     --repo world -m "for world, commit no.1" &&
+	test "$(count_git_commits repo1.git)" = "1" &&
+	test "$(count_git_commits repo2.git)" = "1" &&
+	test "$(git_log_only_subject repo1.git -1)" = \
+		"task hello, commit no.1" &&
+	test "$(git_log_only_subject repo2.git -1)" = \
+		"for world, commit no.1"
+'
+
+test_expect_success 'commit all task' '
+	do_hack &&
+	gistore commit-all &&
+	test "$(count_git_commits repo1.git)" = "2" &&
+	test "$(count_git_commits repo2.git)" = "2" &&
+	do_hack &&
+	gistore ci-all -m "commit invoke by ci-all" &&
+	test "$(count_git_commits repo1.git)" = "3" &&
+	test "$(count_git_commits repo2.git)" = "3" &&
+	test "$(git_log_only_subject repo1.git -1)" = \
+		"commit invoke by ci-all" &&
+	test "$(git_log_only_subject repo2.git -1)" = \
+		"commit invoke by ci-all"
+'
+
+cat >expect << EOF
+System level Tasks
+    hello => repo1.git
+User level Tasks
+    hello => repo1.git
+EOF
+
+test_expect_success 'task remove' '
+	do_hack &&
+	gistore task rm world &&
+	gistore task list |sed -e "/^$/d" | sed -e "s#${cwd}/##g" > actual &&
+	test_cmp expect actual &&
+	gistore commit-all &&
+	test "$(count_git_commits repo1.git)" = "4" &&
+	test "$(count_git_commits repo2.git)" = "3"
+'
+
+cat >expect << EOF
+    hello => repo1.git
+    world => repo2.git
+EOF
+
+test_expect_success 'commit-all while missing task repo' '
+	gistore task add hello repo1.git &&
+	gistore task add world repo2.git &&
+	gistore task list | grep -q "$cwd" &&
+	gistore task list | sed -e "/^$/d" | \
+		sed -e "s#${cwd}/##g" | grep "^ " | sort -u > actual &&
+	test_cmp expect actual &&
+	do_hack &&
+	gistore commit-all &&
+	test "$(count_git_commits repo1.git)" = "5" &&
+	test "$(count_git_commits repo2.git)" = "4" &&
+	mv repo1.git repo1.git.moved &&
+	do_hack &&
+	test_must_fail gistore commit-all &&
+	test "$(count_git_commits repo2.git)" = "5" &&
+	mv repo1.git.moved repo1.git &&
+	mv repo2.git repo2.git.moved &&
+	test_must_fail gistore commit-all &&
+	test "$(count_git_commits repo1.git)" = "6"
+'
+
+test_done