kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

git-svn: Allow deep branch names by supporting multi-globs 

Some repositories use a deep branching strategy, such as:

    branches/1.0/1.0.rc1
    branches/1.0/1.0.rc2
    branches/1.0/1.0.rtm
    branches/1.0/1.0.gold

Only allowing a single glob stiffles this.

This change allows for a single glob 'set' to accept this deep
branching strategy.

The ref glob depth must match the branch glob depth.  When using
the -b or -t options for init or clone, this is automatically
done.

For example, using the above branches:

  svn-remote.svn.branches = branches/*/*:refs/remote/*/*

gives the following branch names:

  1.0/1.0.rc1
  1.0/1.0.rc2
  1.0/1.0.rtm
  1.0/1.0.gold

[ew:
  * removed unrelated line-wrapping changes
  * fixed line-wrapping in a few more places
  * removed trailing whitespace
  * fixed bashism in test
  * removed unnecessary httpd startup in test
  * changed copyright on tests to 2008 Marcus Griep
  * added executable permissions to new tests
]

Signed-off-by: Marcus Griep <marcus@griep.us>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Marcus Griep 17 years ago committed by Junio C Hamano
parent
b47ddefe02
commit
570d35c26d
4 changed files with 246 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      git-svn.perl
  2. 9
      t/t9108-git-svn-glob.sh
  3. 160
      t/t9108-git-svn-multi-glob.sh
  4. 37
      t/t9125-git-svn-multi-glob-branch-names.sh

60
git-svn.perl
Unescape View File

@ -987,8 +987,10 @@ sub complete_url_ls_init {
if (length $pfx && $pfx !~ m#/$#) { if (length $pfx && $pfx !~ m#/$#) {
die "--prefix='$pfx' must have a trailing slash '/'\n"; die "--prefix='$pfx' must have a trailing slash '/'\n";
} }
command_noisy('config', "svn-remote.$gs->{repo_id}.$n", command_noisy('config',
"$remote_path:refs/remotes/$pfx*"); "svn-remote.$gs->{repo_id}.$n",
"$remote_path:refs/remotes/$pfx*" .
('/*' x (($remote_path =~ tr/*/*/) - 1)) );
} }


sub verify_ref { sub verify_ref {
@ -4124,16 +4126,38 @@ sub gs_fetch_loop_common {
Git::SVN::gc(); Git::SVN::gc();
} }


sub get_dir_globbed {
my ($self, $left, $depth, $r) = @_;

my @x = eval { $self->get_dir($left, $r) };
return unless scalar @x == 3;
my $dirents = $x[0];
my @finalents;
foreach my $de (keys %$dirents) {
next if $dirents->{$de}->{kind} != $SVN::Node::dir;
if ($depth > 1) {
my @args = ("$left/$de", $depth - 1, $r);
foreach my $dir ($self->get_dir_globbed(@args)) {
push @finalents, "$de/$dir";
}
} else {
push @finalents, $de;
}
}
@finalents;
}

sub match_globs { sub match_globs {
my ($self, $exists, $paths, $globs, $r) = @_; my ($self, $exists, $paths, $globs, $r) = @_;


sub get_dir_check { sub get_dir_check {
my ($self, $exists, $g, $r) = @_; my ($self, $exists, $g, $r) = @_;
my @x = eval { $self->get_dir($g->{path}->{left}, $r) };
return unless scalar @x == 3; my @dirs = $self->get_dir_globbed($g->{path}->{left},
my $dirents = $x[0]; $g->{path}->{depth},
foreach my $de (keys %$dirents) { $r);
next if $dirents->{$de}->{kind} != $SVN::Node::dir;
foreach my $de (@dirs) {
my $p = $g->{path}->full_path($de); my $p = $g->{path}->full_path($de);
next if $exists->{$p}; next if $exists->{$p};
next if (length $g->{path}->{right} && next if (length $g->{path}->{right} &&
@ -4915,16 +4939,20 @@ sub new {
my ($class, $glob) = @_; my ($class, $glob) = @_;
my $re = $glob; my $re = $glob;
$re =~ s!/+$!!g; # no need for trailing slashes $re =~ s!/+$!!g; # no need for trailing slashes
my $nr = $re =~ tr/*/*/; $re =~ m!^([^*]*)(\*(?:/\*)*)([^*]*)$!;
if ($nr > 1) { my $temp = $re;
die "Only one '*' wildcard expansion ", my ($left, $right) = ($1, $3);
"is supported (got $nr): '$glob'\n"; $re = $2;
} elsif ($nr == 0) { my $depth = $re =~ tr/*/*/;
if ($depth != $temp =~ tr/*/*/) {
die "Only one set of wildcard directories " .
"(e.g. '*' or '*/*/*') is supported: '$glob'\n";
}
if ($depth == 0) {
die "One '*' is needed for glob: '$glob'\n"; die "One '*' is needed for glob: '$glob'\n";
} }
$re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; $re =~ s!\*!\[^/\]*!g;
my ($left, $right) = ($1, $2); $re = quotemeta($left) . "($re)" . quotemeta($right);
$re = quotemeta($left) . $re . quotemeta($right);
if (length $left && !($left =~ s!/+$!!g)) { if (length $left && !($left =~ s!/+$!!g)) {
die "Missing trailing '/' on left side of: '$glob' ($left)\n"; die "Missing trailing '/' on left side of: '$glob' ($left)\n";
} }
@ -4933,7 +4961,7 @@ sub new {
} }
my $left_re = qr/^\/\Q$left\E(\/|$)/; my $left_re = qr/^\/\Q$left\E(\/|$)/;
bless { left => $left, right => $right, left_regex => $left_re, bless { left => $left, right => $right, left_regex => $left_re,
regex => qr/$re/, glob => $glob }, $class; regex => qr/$re/, glob => $glob, depth => $depth }, $class;
} }


sub full_path { sub full_path {

9
t/t9108-git-svn-glob.sh
Unescape View File

@ -53,7 +53,8 @@ test_expect_success 'test refspec globbing' '
test "`git rev-parse refs/remotes/tags/end~1`" = \ test "`git rev-parse refs/remotes/tags/end~1`" = \
"`git rev-parse refs/remotes/branches/start`" && "`git rev-parse refs/remotes/branches/start`" &&
test "`git rev-parse refs/remotes/branches/start~2`" = \ test "`git rev-parse refs/remotes/branches/start~2`" = \
"`git rev-parse refs/remotes/trunk`" "`git rev-parse refs/remotes/trunk`" &&
test_must_fail git rev-parse refs/remotes/tags/end@3
' '


echo try to try > expect.two echo try to try > expect.two
@ -85,8 +86,8 @@ test_expect_success 'test left-hand-side only globbing' '
test_cmp expect.two output.two test_cmp expect.two output.two
' '


echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \ echo "Only one set of wildcard directories" \
> expect.three "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
echo "" >> expect.three echo "" >> expect.three


test_expect_success 'test disallow multi-globs' ' test_expect_success 'test disallow multi-globs' '
@ -94,7 +95,7 @@ test_expect_success 'test disallow multi-globs' '
git config --add svn-remote.three.fetch \ git config --add svn-remote.three.fetch \
trunk:refs/remotes/three/trunk && trunk:refs/remotes/three/trunk &&
git config --add svn-remote.three.branches \ git config --add svn-remote.three.branches \
"branches/*/*:refs/remotes/three/branches/*" && "branches/*/t/*:refs/remotes/three/branches/*" &&
git config --add svn-remote.three.tags \ git config --add svn-remote.three.tags \
"tags/*/*:refs/remotes/three/tags/*" && "tags/*/*:refs/remotes/three/tags/*" &&
( (

160
t/t9108-git-svn-multi-glob.sh
Unescape View File

@ -0,0 +1,160 @@
#!/bin/sh
# Copyright (c) 2007 Eric Wong
test_description='git-svn globbing refspecs'
. ./lib-git-svn.sh

cat > expect.end <<EOF
the end
hi
start a new branch
initial
EOF

test_expect_success 'test refspec globbing' '
mkdir -p trunk/src/a trunk/src/b trunk/doc &&
echo "hello world" > trunk/src/a/readme &&
echo "goodbye world" > trunk/src/b/readme &&
svn import -m "initial" trunk "$svnrepo"/trunk &&
svn co "$svnrepo" tmp &&
(
cd tmp &&
mkdir branches branches/v1 tags &&
svn add branches tags &&
svn cp trunk branches/v1/start &&
svn commit -m "start a new branch" &&
svn up &&
echo "hi" >> branches/v1/start/src/b/readme &&
poke branches/v1/start/src/b/readme &&
echo "hey" >> branches/v1/start/src/a/readme &&
poke branches/v1/start/src/a/readme &&
svn commit -m "hi" &&
svn up &&
svn cp branches/v1/start tags/end &&
echo "bye" >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
echo "aye" >> tags/end/src/a/readme &&
poke tags/end/src/a/readme &&
svn commit -m "the end" &&
echo "byebye" >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
svn commit -m "nothing to see here"
) &&
git config --add svn-remote.svn.url "$svnrepo" &&
git config --add svn-remote.svn.fetch \
"trunk/src/a:refs/remotes/trunk" &&
git config --add svn-remote.svn.branches \
"branches/*/*/src/a:refs/remotes/branches/*/*" &&
git config --add svn-remote.svn.tags\
"tags/*/src/a:refs/remotes/tags/*" &&
git-svn multi-fetch &&
git log --pretty=oneline refs/remotes/tags/end | \
sed -e "s/^.\{41\}//" > output.end &&
test_cmp expect.end output.end &&
test "`git rev-parse refs/remotes/tags/end~1`" = \
"`git rev-parse refs/remotes/branches/v1/start`" &&
test "`git rev-parse refs/remotes/branches/v1/start~2`" = \
"`git rev-parse refs/remotes/trunk`" &&
test_must_fail git rev-parse refs/remotes/tags/end@3
'

echo try to try > expect.two
echo nothing to see here >> expect.two
cat expect.end >> expect.two

test_expect_success 'test left-hand-side only globbing' '
git config --add svn-remote.two.url "$svnrepo" &&
git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
git config --add svn-remote.two.branches \
"branches/*/*:refs/remotes/two/branches/*/*" &&
git config --add svn-remote.two.tags \
"tags/*:refs/remotes/two/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
svn commit -m "try to try"
) &&
git-svn fetch two &&
test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
test `git rev-list refs/remotes/two/branches/v1/start | wc -l` -eq 3 &&
test `git rev-parse refs/remotes/two/branches/v1/start~2` = \
`git rev-parse refs/remotes/two/trunk` &&
test `git rev-parse refs/remotes/two/tags/end~3` = \
`git rev-parse refs/remotes/two/branches/v1/start` &&
git log --pretty=oneline refs/remotes/two/tags/end | \
sed -e "s/^.\{41\}//" > output.two &&
test_cmp expect.two output.two
'
cat > expect.four <<EOF
adios
adding more
Changed 2 in v2/start
Another versioned branch
initial
EOF

test_expect_success 'test another branch' '
(
cd tmp &&
mkdir branches/v2 &&
svn add branches/v2 &&
svn cp trunk branches/v2/start &&
svn commit -m "Another versioned branch" &&
svn up &&
echo "hello" >> branches/v2/start/src/b/readme &&
poke branches/v2/start/src/b/readme &&
echo "howdy" >> branches/v2/start/src/a/readme &&
poke branches/v2/start/src/a/readme &&
svn commit -m "Changed 2 in v2/start" &&
svn up &&
svn cp branches/v2/start tags/next &&
echo "bye" >> tags/next/src/b/readme &&
poke tags/next/src/b/readme &&
echo "aye" >> tags/next/src/a/readme &&
poke tags/next/src/a/readme &&
svn commit -m "adding more" &&
echo "byebye" >> tags/next/src/b/readme &&
poke tags/next/src/b/readme &&
svn commit -m "adios"
) &&
git config --add svn-remote.four.url "$svnrepo" &&
git config --add svn-remote.four.fetch trunk:refs/remotes/four/trunk &&
git config --add svn-remote.four.branches \
"branches/*/*:refs/remotes/four/branches/*/*" &&
git config --add svn-remote.four.tags \
"tags/*:refs/remotes/four/tags/*" &&
git-svn fetch four &&
test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
test `git rev-parse refs/remotes/four/branches/v2/start~2` = \
`git rev-parse refs/remotes/four/trunk` &&
test `git rev-parse refs/remotes/four/tags/next~2` = \
`git rev-parse refs/remotes/four/branches/v2/start` &&
git log --pretty=oneline refs/remotes/four/tags/next | \
sed -e "s/^.\{41\}//" > output.four &&
test_cmp expect.four output.four
'

echo "Only one set of wildcard directories" \
"(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
echo "" >> expect.three

test_expect_success 'test disallow multiple globs' '
git config --add svn-remote.three.url "$svnrepo" &&
git config --add svn-remote.three.fetch \
trunk:refs/remotes/three/trunk &&
git config --add svn-remote.three.branches \
"branches/*/t/*:refs/remotes/three/branches/*/*" &&
git config --add svn-remote.three.tags \
"tags/*:refs/remotes/three/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
svn commit -m "try to try"
) &&
test_must_fail git-svn fetch three 2> stderr.three &&
test_cmp expect.three stderr.three
'

test_done

37
t/t9125-git-svn-multi-glob-branch-names.sh
Unescape View File

@ -0,0 +1,37 @@
#!/bin/sh
# Copyright (c) 2008 Marcus Griep

test_description='git-svn multi-glob branch names'
. ./lib-git-svn.sh

test_expect_success 'setup svnrepo' '
mkdir project project/trunk project/branches \
project/branches/v14.1 project/tags &&
echo foo > project/trunk/foo &&
svn import -m "$test_description" project "$svnrepo/project" &&
rm -rf project &&
svn cp -m "fun" "$svnrepo/project/trunk" \
"$svnrepo/project/branches/v14.1/beta" &&
svn cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
"$svnrepo/project/branches/v14.1/gold"
'

test_expect_success 'test clone with multi-glob in branch names' '
git svn clone -T trunk -b branches/*/* -t tags \
"$svnrepo/project" project &&
cd project &&
git rev-parse "refs/remotes/v14.1/beta" &&
git rev-parse "refs/remotes/v14.1/gold" &&
cd ..
'

test_expect_success 'test dcommit to multi-globbed branch' "
cd project &&
git reset --hard 'refs/remotes/v14.1/gold' &&
echo hello >> foo &&
git commit -m 'hello' -- foo &&
git svn dcommit &&
cd ..
"

test_done
Write Preview
Loading…
Cancel
Save