shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Importing and checking out nested trees works!

Browse Source
This commit is contained in:
Colin Walters 2011-10-15 01:22:42 -04:00
parent 6f1b880377
commit 3eb77d4ce8
5 changed files with 73 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libhacktree/hacktree-repo.c
View File

@ -1116,7 +1116,7 @@ add_one_path_to_tree_and_import (HacktreeRepo *self,
}
/* Implicitly add intermediate directories */
if (!add_one_directory_to_tree_and_import (self, component,
abspath, current_tree, dir,
component_abspath, current_tree, dir,
error))
goto out;
}

6
src/libhtutil/ht-unix-utils.c
View File

@ -117,9 +117,9 @@ ht_util_path_split (const char *path)
else
{
g_ptr_array_add (ret, g_strndup (p, slash - p));
p += 1;
p = slash + 1;
}
} while (p);
} while (p && *p);
return ret;
}
@ -127,7 +127,7 @@ ht_util_path_split (const char *path)
char *
ht_util_path_join_n (const char *base, GPtrArray *components, int n)
{
int max = MAX(n+1, components->len);
int max = MIN(n+1, components->len);
GPtrArray *subcomponents;
char *path;
int i;

29
tests/libtest.sh
View File

@ -32,6 +32,10 @@ die () {
fi
}
assert_has_file () {
test -f $1 || (echo "Couldn't find $1"; exit 1)
}
setup_test_repository1 () {
mkdir files
cd files
@ -45,7 +49,30 @@ setup_test_repository1 () {
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 first" --add=secondfile
hacktree commit $ht_repo -s "Test Commit 2" -b "Commit body second" --add=secondfile
hacktree fsck -q $ht_repo
}
setup_test_repository2 () {
mkdir files
cd files
ht_files=`pwd`
export ht_files
echo first > firstfile
mkdir baz
echo moo > baz/cow
echo alien > baz/saucer
mkdir baz/deeper
echo hi > baz/deeper/ohyeah
mkdir baz/another/
echo x > baz/another/y
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=baz/cow --add=baz/saucer --add=baz/deeper/ohyeah --add=baz/another/y
hacktree fsck -q $ht_repo
}

4
tests/t0004-checkout-test1.sh
View File

@ -29,8 +29,8 @@ echo 'ok setup'
hacktree checkout $ht_repo HEAD $test_tmpdir/checkout1-head
echo 'ok checkout cmd'
cd $test_tmpdir/checkout1-head
test -f firstfile
test -f secondfile
assert_has_file firstfile
assert_has_file secondfile
echo 'ok checkout verify exists'

39
tests/t0005-nested-tree.sh Executable file
View File

@ -0,0 +1,39 @@
#!/bin/bash
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Author: Colin Walters <walters@verbum.org>
set -e
. libtest.sh
echo '1..3'
setup_test_repository2
echo 'ok setup'
hacktree checkout $ht_repo HEAD $test_tmpdir/checkout2-head
echo 'ok checkout cmd'
cd $test_tmpdir/checkout2-head
assert_has_file firstfile
assert_has_file baz/cow
assert_has_file baz/saucer
assert_has_file baz/deeper/ohyeah
assert_has_file baz/another/y
echo 'ok checkout verify exists'