mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: Add per-svn-remote ignore-paths config

Browse Source 
The --ignore-paths option to fetch is very useful for working on a subset
of a SVN repository.  For proper operation, every command that causes a
fetch (explicit or implied) must include a matching --ignore-paths option.

This patch adds a persistent svn-remote.$repo_id.ignore-paths config by
promoting Fetcher::is_path_ignored to a member function and initializing
$self->{ignore_regex} in Fetcher::new.  Command line --ignore-paths is
still recognized and acts in addition to the config value.

Signed-off-by: Ben Jackson <ben@ben.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Ben Jackson
2009-04-11 10:46:17 -07:00
committed by Eric Wong
parent 6ea4203288
commit 0d8bee71af
3 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
t/t9134-git-svn-ignore-paths.sh
View File

@ -31,6 +31,22 @@ test_expect_success 'clone an SVN repository with ignored www directory' '
test_cmp expect expect2
'
test_expect_success 'init+fetch an SVN repository with ignored www directory' '
git svn init "$svnrepo" c &&
( cd c && git svn fetch --ignore-paths="^www" ) &&
rm expect2 &&
echo test_qqq > expect &&
for i in c/*/*.txt; do cat $i >> expect2; done &&
test_cmp expect expect2
'
test_expect_success 'set persistent ignore-paths config' '
(
cd g &&
git config svn-remote.svn.ignore-paths "^www"
)
'
test_expect_success 'SVN-side change outside of www' '
(
cd s &&
@ -41,9 +57,20 @@ test_expect_success 'SVN-side change outside of www' '
)
'
test_expect_success 'update git svn-cloned repo' '
test_expect_success 'update git svn-cloned repo (config ignore)' '
(
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 ignore)' '
(
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\n" > expect &&
for i in */*.txt; do cat $i >> expect2; done &&
@ -62,9 +89,20 @@ test_expect_success 'SVN-side change inside of ignored www' '
)
'
test_expect_success 'update git svn-cloned repo' '
test_expect_success 'update git svn-cloned repo (config ignore)' '
(
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 ignore)' '
(
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\n" > expect &&
for i in */*.txt; do cat $i >> expect2; done &&
@ -84,9 +122,20 @@ test_expect_success 'SVN-side change in and out of ignored www' '
)
'
test_expect_success 'update git svn-cloned repo again' '
test_expect_success 'update git svn-cloned repo again (config ignore)' '
(
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 ignore)' '
(
cd c &&
git svn rebase --ignore-paths="^www" &&
printf "test_qqq\nb\nygg\n" > expect &&
for i in */*.txt; do cat $i >> expect2; done &&