mirror of
https://github.com/git/git.git
synced 2024-11-16 22:14:53 +01:00
a7b102302a
The SVN::Fetcher module is now able to filter for inclusion as well as exclusion (as used by --ignore-path). Also added tests, documentation changes and git completion script. If you have an SVN repository with many top level directories and you only want a git-svn clone of some of them then using --ignore-path is difficult as it requires a very long regexp. In this case it's much easier to filter for inclusion. [ew: remove trailing whitespace] Signed-off-by: Paul Walmsley <pjwhams@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
149 lines
3.5 KiB
Bash
Executable file
149 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2013 Paul Walmsley - based on t9134 by Vitaly Shukela
|
|
#
|
|
|
|
test_description='git svn property tests'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup test repository' '
|
|
svn_cmd co "$svnrepo" s &&
|
|
(
|
|
cd s &&
|
|
mkdir qqq www xxx &&
|
|
echo test_qqq > qqq/test_qqq.txt &&
|
|
echo test_www > www/test_www.txt &&
|
|
echo test_xxx > xxx/test_xxx.txt &&
|
|
svn_cmd add qqq &&
|
|
svn_cmd add www &&
|
|
svn_cmd add xxx &&
|
|
svn_cmd commit -m "create some files" &&
|
|
svn_cmd up &&
|
|
echo hi >> www/test_www.txt &&
|
|
svn_cmd commit -m "modify www/test_www.txt" &&
|
|
svn_cmd up
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone an SVN repository with filter to include qqq directory' '
|
|
git svn clone --include-paths="qqq" "$svnrepo" g &&
|
|
echo test_qqq > expect &&
|
|
for i in g/*/*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect expect2
|
|
'
|
|
|
|
|
|
test_expect_success 'init+fetch an SVN repository with included qqq directory' '
|
|
git svn init "$svnrepo" c &&
|
|
( cd c && git svn fetch --include-paths="qqq" ) &&
|
|
rm expect2 &&
|
|
echo test_qqq > expect &&
|
|
for i in c/*/*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect expect2
|
|
'
|
|
|
|
test_expect_success 'verify include-paths config saved by clone' '
|
|
(
|
|
cd g &&
|
|
git config --get svn-remote.svn.include-paths | fgrep "qqq"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change outside of www' '
|
|
(
|
|
cd s &&
|
|
echo b >> qqq/test_qqq.txt &&
|
|
svn_cmd commit -m "SVN-side change outside of www" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change outside of www"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (config include)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (option include)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --include-paths="qqq" &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change inside of ignored www' '
|
|
(
|
|
cd s &&
|
|
echo zaq >> www/test_www.txt
|
|
svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (config include)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (option include)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --include-paths="qqq" &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change in and out of included qqq' '
|
|
(
|
|
cd s &&
|
|
echo cvf >> www/test_www.txt
|
|
echo ygg >> qqq/test_qqq.txt
|
|
svn_cmd commit -m "SVN-side change in and out of ignored www" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo again (config include)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\nygg\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo again (option include)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --include-paths="qqq" &&
|
|
printf "test_qqq\nb\nygg\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_done
|