git-svn: Allow deep branch names by supporting multi-globs
PATCH v2 2/2 git-svn: Allow deep branch names by supporting multi-globs
From 3b95061c8d19b2285cdbf94001f3b718c8264c32 Mon Sep 17 00:00:00 2001
From: Marcus Griep <[email protected]>
Date: Tue, 5 Aug 2008 15:13:20 -0400
Subject: [PATCH 2/2] 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
--- git-svn.perl | 53 +++++++--- t/t9108-git-svn-glob.sh | 9 +- t/t9108-git-svn-multi-glob.sh | 155 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 40 +++++++ 4 files changed, 238 insertions(+), 19 deletions(-) create mode 100755 t/t9108-git-svn-multi-glob.sh create mode 100755 t/t9125-git-svn-multi-glob-branch-names.sh
git-svn.perl +38 -15
@@ -981,7 +981,7 @@ sub complete_url_ls_init { die "--prefix='$pfx' must have a trailing slash '/'\n"; } command_noisy('config', "svn-remote.$gs->{repo_id}.$n", - "$remote_path:refs/remotes/$pfx*"); + "$remote_path:refs/remotes/$pfx*" . ('/*' x (($remote_path =~ tr/*/*/)-1))); } sub verify_ref {
@@ -4113,16 +4113,35 @@ sub gs_fetch_loop_common { 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) { + foreach my $dir ($self->get_dir_globbed($left.'/'.$de, $depth - 1, $r)) { + push @finalents, "$de/$dir"; + } + } else { + push @finalents, $de; + } + } + @finalents; +} + sub match_globs { my ($self, $exists, $paths, $globs, $r) = @_; sub get_dir_check { my ($self, $exists, $g, $r) = @_; - my @x = eval { $self->get_dir($g->{path}->{left}, $r) }; - return unless scalar @x == 3; - my $dirents = $x[0]; - foreach my $de (keys %$dirents) { - next if $dirents->{$de}->{kind} != $SVN::Node::dir; + + my @dirs = $self->get_dir_globbed($g->{path}->{left}, $g->{path}->{depth}, $r); + + foreach my $de (@dirs) { my $p = $g->{path}->full_path($de); next if $exists->{$p}; next if (length $g->{path}->{right} &&
@@ -4904,16 +4923,20 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = $re =~ tr/*/*/; - if ($nr > 1) { - die "Only one '*' wildcard expansion ", - "is supported (got $nr): '$glob'\n"; - } elsif ($nr == 0) { + $re =~ m!^([^*]*)(\*(?:/\*)*)([^*]*)$!; + my $temp = $re; + my ($left, $right) = ($1, $3); + $re = $2; + 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"; } - $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; - my ($left, $right) = ($1, $2); - $re = quotemeta($left) . $re . quotemeta($right); + $re =~ s!\*!\[^/\]*!g; +# $re =~ s!\?!\[^/\]!g; + $re = quotemeta($left) . "($re)" . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n"; }
@@ -4922,7 +4945,7 @@ sub new { } my $left_re = qr/^\/\Q$left\E(\/|$)/; 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 {
t/t9108-git-svn-glob.sh +5 -4
@@ -52,7 +52,8 @@ test_expect_success 'test refspec globbing' ' test "`git rev-parse refs/remotes/tags/end~1`" = \ "`git rev-parse refs/remotes/branches/start`" && 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
@@ -83,14 +84,14 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' -echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" > expect.three +echo "Only one set of wildcard directories (e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three echo "" >> expect.three -test_expect_success 'test disallow multi-globs' ' +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/*/*:refs/remotes/three/branches/*" && + "branches/*/t/*:refs/remotes/three/branches/*" && git config --add svn-remote.three.tags \ "tags/*/*:refs/remotes/three/tags/*" && cd tmp &&
t/t9108-git-svn-multi-glob.sh new file +155 -0
155 lines not on this page · raw message
t/t9125-git-svn-multi-glob-branch-names.sh new file +40 -0
@@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (c) 2007 Eric Wong +# + +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" && + start_httpd + ' + +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 .. + " + +stop_httpd + +test_done
--
1.5.4.3
Signature · 5 lines
Marcus Griep GPG Key ID: 0x5E968152 —— http://www.boohaunt.net את.ψο´
Quoted 14 lines · Marcus Griep
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.goldOnly 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.
Quoted 7 lines
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
Hi Marcus,
This looks awesome. Some folks have been wanting to do this for a long time but I was always too lazy to touch this code.
Unfortunately, I'm having trouble applying your patches due to whitespace conversion issues with your MUA. I suggest taking a look at Documentation/SubmittingPatches on how to submit easily applyable patches to the mailing list.
I usually use git-send-email myself, but sometimes mutt, too.
Also, there are some long lines that need to be wrapped at 80 characters or less to conform to the existing coding conventions.
I look forward to applying and testing your patches,
Thank you!
Signature · 1 line
Eric Wong
v2 cover git-svn multi-glob fix and extension
This patch series fixes and extends globs for branches and tags.
The first patch fixes the assertion that protects git-svn from allowing multi-globs in branch names, whereas the second removes that restriction altogether, allowing up to one multi-glob set in defining a branch hierarchy.
Also, patches are now under 80 chars wide except for a couple of echos in the test cases.
Marcus Griep (2):
Fix multi-glob assertion in git-svn
git-svn: Allow deep branch names by supporting multi-globs
git-svn.perl | 63 +++++++++--- t/t9108-git-svn-glob.sh | 22 ++++- t/t9108-git-svn-multi-glob.sh | 155 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 41 ++++++++ 4 files changed, 264 insertions(+), 17 deletions(-)
PATCH v2 1/2 Fix multi-glob assertion in git-svn
Fixes bad regex match check for multiple globs (would always return one glob regardless of actual number).
--- git-svn.perl | 5 +++-- t/t9108-git-svn-glob.sh | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-)
git-svn.perl +3 -2
@@ -4912,14 +4912,15 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g); - my ($left, $right) = ($1, $2); + my $nr = $re =~ tr/*/*/; if ($nr > 1) { die "Only one '*' wildcard expansion ", "is supported (got $nr): '$glob'\n"; } elsif ($nr == 0) { die "One '*' is needed for glob: '$glob'\n"; } + $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; + my ($left, $right) = ($1, $2); $re = quotemeta($left) . $re . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n";
t/t9108-git-svn-glob.sh +19 -0
@@ -83,4 +83,23 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' +echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" > expect.three +echo "" >> expect.three + +test_expect_success 'test disallow multi-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/*/*: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" + cd .. && + test_must_fail git-svn fetch three &> stderr.three && + cmp expect.three stderr.three + ' + test_done
Signature · 1 line
1.6.0.rc2.4.g39f8
PATCH v2 2/2 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
--- git-svn.perl | 64 +++++++++--- t/t9108-git-svn-glob.sh | 9 +- t/t9108-git-svn-multi-glob.sh | 155 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 41 ++++++++ 4 files changed, 248 insertions(+), 21 deletions(-) create mode 100755 t/t9108-git-svn-multi-glob.sh create mode 100755 t/t9125-git-svn-multi-glob-branch-names.sh
git-svn.perl +47 -17
@@ -169,7 +169,8 @@ my %cmd = ( 'color' => \$Git::SVN::Log::color, 'pager=s' => \$Git::SVN::Log::pager } ], - 'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish", + 'find-rev' => [ \&cmd_find_rev, + "Translate between SVN revision numbers and tree-ish", {} ], 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory", { 'merge|m|M' => \$_merge,
@@ -229,7 +230,9 @@ unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); read_repo_config(\%opts); -Getopt::Long::Configure('pass_through') if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')); +if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) { + Getopt::Long::Configure('pass_through'); +} my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version, 'minimize-connections' => \$Git::SVN::Migration::_minimize, 'id|i=s' => \$Git::SVN::default_ref_id,
@@ -985,7 +988,7 @@ sub complete_url_ls_init { die "--prefix='$pfx' must have a trailing slash '/'\n"; } command_noisy('config', "svn-remote.$gs->{repo_id}.$n", - "$remote_path:refs/remotes/$pfx*"); + "$remote_path:refs/remotes/$pfx*" . ('/*' x (($remote_path =~ tr/*/*/)-1))); } sub verify_ref {
@@ -4121,16 +4124,38 @@ sub gs_fetch_loop_common { 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) { + foreach my $dir ($self->get_dir_globbed($left.'/'.$de, $depth - 1, $r)) { + push @finalents, "$de/$dir"; + } + } else { + push @finalents, $de; + } + } + @finalents; +} + sub match_globs { my ($self, $exists, $paths, $globs, $r) = @_; sub get_dir_check { my ($self, $exists, $g, $r) = @_; - my @x = eval { $self->get_dir($g->{path}->{left}, $r) }; - return unless scalar @x == 3; - my $dirents = $x[0]; - foreach my $de (keys %$dirents) { - next if $dirents->{$de}->{kind} != $SVN::Node::dir; + + my @dirs = $self->get_dir_globbed( + $g->{path}->{left}, + $g->{path}->{depth}, + $r); + + foreach my $de (@dirs) { my $p = $g->{path}->full_path($de); next if $exists->{$p}; next if (length $g->{path}->{right} &&
@@ -4912,16 +4937,21 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = $re =~ tr/*/*/; - if ($nr > 1) { - die "Only one '*' wildcard expansion ", - "is supported (got $nr): '$glob'\n"; - } elsif ($nr == 0) { + $re =~ m!^([^*]*)(\*(?:/\*)*)([^*]*)$!; + my $temp = $re; + my ($left, $right) = ($1, $3); + $re = $2; + 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"; } - $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; - my ($left, $right) = ($1, $2); - $re = quotemeta($left) . $re . quotemeta($right); + $re =~ s!\*!\[^/\]*!g; +# $re =~ s!\?!\[^/\]!g; + $re = quotemeta($left) . "($re)" . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n"; }
@@ -4930,7 +4960,7 @@ sub new { } my $left_re = qr/^\/\Q$left\E(\/|$)/; 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 {
t/t9108-git-svn-glob.sh +5 -4
@@ -52,7 +52,8 @@ test_expect_success 'test refspec globbing' ' test "`git rev-parse refs/remotes/tags/end~1`" = \ "`git rev-parse refs/remotes/branches/start`" && 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
@@ -83,14 +84,14 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' -echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" > expect.three +echo "Only one set of wildcard directories (e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three echo "" >> expect.three -test_expect_success 'test disallow multi-globs' ' +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/*/*:refs/remotes/three/branches/*" && + "branches/*/t/*:refs/remotes/three/branches/*" && git config --add svn-remote.three.tags \ "tags/*/*:refs/remotes/three/tags/*" && cd tmp &&
t/t9108-git-svn-multi-glob.sh new file +155 -0
155 lines not on this page · raw message
t/t9125-git-svn-multi-glob-branch-names.sh new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.6.0.rc2.4.g39f8
Re: [PATCH v2 0/2] git-svn multi-glob fix and extension
In reply to Marcus GriepQuoted 9 lines · Marcus Griep
This patch series fixes and extends globs for branches and tags.
The first patch fixes the assertion that protects git-svn from allowing multi-globs in branch names, whereas the second removes that restriction altogether, allowing up to one multi-glob set in defining a branch hierarchy.
Also, patches are now under 80 chars wide except for a couple of echos in the test cases.
Thanks. At least I can apply the patches now :)
I've made couple of fixups which will be replies to this message.
Eric Wong (1):
git-svn: wrap long lines in a few places
Marcus Griep (2):
Fix multi-glob assertion in git-svn
git-svn: Allow deep branch names by supporting multi-globs
--- git-svn.perl | 67 +++++++++--- t/t9108-git-svn-glob.sh | 24 ++++- t/t9108-git-svn-multi-glob.sh | 157 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 37 +++++++ 4 files changed, 267 insertions(+), 18 deletions(-)
Signature · 1 line
Eric Wong
PATCH 1/3 Fix multi-glob assertion in git-svn
From: Marcus Griep <[email protected]>
Fixes bad regex match check for multiple globs (would always return one glob regardless of actual number).
[ew: fixed a bashism in the test and some minor line-wrapping]
--- git-svn.perl | 5 +++-- t/t9108-git-svn-glob.sh | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)
git-svn.perl +3 -2
@@ -4915,14 +4915,15 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g); - my ($left, $right) = ($1, $2); + my $nr = $re =~ tr/*/*/; if ($nr > 1) { die "Only one '*' wildcard expansion ", "is supported (got $nr): '$glob'\n"; } elsif ($nr == 0) { die "One '*' is needed for glob: '$glob'\n"; } + $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; + my ($left, $right) = ($1, $2); $re = quotemeta($left) . $re . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n";
t/t9108-git-svn-glob.sh +21 -0
@@ -83,4 +83,25 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' +echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \ + > expect.three +echo "" >> expect.three + +test_expect_success 'test disallow multi-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/*/*: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" + cd .. && + test_must_fail git-svn fetch three 2> stderr.three && + cmp expect.three stderr.three + ' + test_done
Signature · 1 line
1.6.0.rc2.4.g0643f
Re: [PATCH 1/3] Fix multi-glob assertion in git-svn
Quoted 6 lines · Eric Wong
From: Marcus Griep <[email protected]>
Fixes bad regex match check for multiple globs (would always return one glob regardless of actual number).
[ew: fixed a bashism in the test and some minor line-wrapping]
Thanks both.
t/t9108-git-svn-glob.sh test_expect_success 'test left-hand-side only globbing' ' · line 102
Quoted 7 lines
t/t9108-git-svn-glob.sh +6
-0+test_expect_success 'test disallow multi-globs' ' + cd tmp && + echo "try try" >> tags/end/src/b/readme && + poke tags/end/src/b/readme && + svn commit -m "try to try" + cd .. &&
Do you want to ignore exit code from 'svn commit -m' here?
In any case, I'd want to see "temporarily work in subdirectory" done in a subshell when applicable, so that we won't have to worry about where we are when we later add more tests, like this:
(
cd tmp &&
echo "try try" >>tags/end/src/b/readme &&
poke tags/end/src/b/readme &&
svn commit -m "try to try" &&
) &&t/t9108-git-svn-glob.sh test_expect_success 'test left-hand-side only globbing' ' · line 104
Quoted 2 lines
t/t9108-git-svn-glob.sh +2
-0+ test_must_fail git-svn fetch three 2> stderr.three && + cmp expect.three stderr.three
s/cmp/test_cmp/;
Re: [PATCH 1/3] Fix multi-glob assertion in git-svn
Quoted 11 lines · Junio C Hamano
Quoted 6 lines · Eric Wong
From: Marcus Griep <[email protected]>
Fixes bad regex match check for multiple globs (would always return one glob regardless of actual number).
[ew: fixed a bashism in the test and some minor line-wrapping]
Thanks both.
Quoted 9 lines
t/t9108-git-svn-glob.sh test_expect_success 'test left-hand-side only globbing' ' · line 102
Quoted 7 lines
t/t9108-git-svn-glob.sh +6
-0+test_expect_success 'test disallow multi-globs' ' + cd tmp && + echo "try try" >> tags/end/src/b/readme && + poke tags/end/src/b/readme && + svn commit -m "try to try" + cd .. &&Do you want to ignore exit code from 'svn commit -m' here?
Oops, no missed that.
Quoted 10 lines
In any case, I'd want to see "temporarily work in subdirectory" done in a subshell when applicable, so that we won't have to worry about where we are when we later add more tests, like this:
( cd tmp && echo "try try" >>tags/end/src/b/readme && poke tags/end/src/b/readme && svn commit -m "try to try" && ) &&
Yes, that's a good idea
Quoted 4 lines
t/t9108-git-svn-glob.sh test_expect_success 'test left-hand-side only globbing' ' · line 104
Quoted 2 lines
t/t9108-git-svn-glob.sh +2
-0+ test_must_fail git-svn fetch three 2> stderr.three && + cmp expect.three stderr.threes/cmp/test_cmp/;
Noted.
Shall I make those changes and resubmit or are they simple enough for you to do?
Signature · 1 line
Eric Wong
Re: [PATCH 1/3] Fix multi-glob assertion in git-svn
Quoted 2 lines · Eric Wong
Shall I make those changes and resubmit or are they simple enough for you to do?
I've already queued them with fixups. Thanks.
PATCH 1/3 Fix multi-glob assertion in git-svn
In reply to Eric WongFrom: Marcus Griep <[email protected]>
Date: Thu, 7 Aug 2008 11:34:01 -0400
Subject: [PATCH 1/3] Fix multi-glob assertion in git-svn
Fixes bad regex match check for multiple globs (would always return one glob regardless of actual number).
[ew: fixed a bashism in the test and some minor line-wrapping]
---
Oops, resent as I forgot to change the From: header
git-svn.perl | 5 +++-- t/t9108-git-svn-glob.sh | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)
git-svn.perl +3 -2
@@ -4915,14 +4915,15 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = ($re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g); - my ($left, $right) = ($1, $2); + my $nr = $re =~ tr/*/*/; if ($nr > 1) { die "Only one '*' wildcard expansion ", "is supported (got $nr): '$glob'\n"; } elsif ($nr == 0) { die "One '*' is needed for glob: '$glob'\n"; } + $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; + my ($left, $right) = ($1, $2); $re = quotemeta($left) . $re . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n";
t/t9108-git-svn-glob.sh +21 -0
@@ -83,4 +83,25 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' +echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \ + > expect.three +echo "" >> expect.three + +test_expect_success 'test disallow multi-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/*/*: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" + cd .. && + test_must_fail git-svn fetch three 2> stderr.three && + cmp expect.three stderr.three + ' + test_done
Signature · 1 line
1.6.0.rc2.4.g0643f
PATCH 2/3 git-svn: Allow deep branch names by supporting multi-globs
In reply to Eric WongFrom: Marcus Griep <[email protected]>
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
]
--- git-svn.perl | 61 ++++++++--- t/t9108-git-svn-glob.sh | 9 +- t/t9108-git-svn-multi-glob.sh | 157 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 37 +++++++ 4 files changed, 244 insertions(+), 20 deletions(-) create mode 100755 t/t9108-git-svn-multi-glob.sh create mode 100755 t/t9125-git-svn-multi-glob-branch-names.sh
git-svn.perl +45 -16
@@ -987,8 +987,10 @@ sub complete_url_ls_init { if (length $pfx && $pfx !~ m#/$#) { die "--prefix='$pfx' must have a trailing slash '/'\n"; } - command_noisy('config', "svn-remote.$gs->{repo_id}.$n", - "$remote_path:refs/remotes/$pfx*"); + command_noisy('config', + "svn-remote.$gs->{repo_id}.$n", + "$remote_path:refs/remotes/$pfx*" . + ('/*' x (($remote_path =~ tr/*/*/) - 1)) ); } sub verify_ref {
@@ -4124,16 +4126,38 @@ sub gs_fetch_loop_common { 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 { my ($self, $exists, $paths, $globs, $r) = @_; sub get_dir_check { my ($self, $exists, $g, $r) = @_; - my @x = eval { $self->get_dir($g->{path}->{left}, $r) }; - return unless scalar @x == 3; - my $dirents = $x[0]; - foreach my $de (keys %$dirents) { - next if $dirents->{$de}->{kind} != $SVN::Node::dir; + + my @dirs = $self->get_dir_globbed($g->{path}->{left}, + $g->{path}->{depth}, + $r); + + foreach my $de (@dirs) { my $p = $g->{path}->full_path($de); next if $exists->{$p}; next if (length $g->{path}->{right} &&
@@ -4915,16 +4939,21 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = $re =~ tr/*/*/; - if ($nr > 1) { - die "Only one '*' wildcard expansion ", - "is supported (got $nr): '$glob'\n"; - } elsif ($nr == 0) { + $re =~ m!^([^*]*)(\*(?:/\*)*)([^*]*)$!; + my $temp = $re; + my ($left, $right) = ($1, $3); + $re = $2; + 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"; } - $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; - my ($left, $right) = ($1, $2); - $re = quotemeta($left) . $re . quotemeta($right); + $re =~ s!\*!\[^/\]*!g; +# $re =~ s!\?!\[^/\]!g; + $re = quotemeta($left) . "($re)" . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n"; }
@@ -4933,7 +4962,7 @@ sub new { } my $left_re = qr/^\/\Q$left\E(\/|$)/; 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 {
t/t9108-git-svn-glob.sh +5 -4
@@ -52,7 +52,8 @@ test_expect_success 'test refspec globbing' ' test "`git rev-parse refs/remotes/tags/end~1`" = \ "`git rev-parse refs/remotes/branches/start`" && 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
@@ -83,8 +84,8 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' -echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \ - > expect.three +echo "Only one set of wildcard directories" \ + "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three echo "" >> expect.three test_expect_success 'test disallow multi-globs' '
@@ -92,7 +93,7 @@ test_expect_success 'test disallow multi-globs' ' git config --add svn-remote.three.fetch \ trunk:refs/remotes/three/trunk && 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 \ "tags/*/*:refs/remotes/three/tags/*" && cd tmp &&
t/t9108-git-svn-multi-glob.sh new file +157 -0
157 lines not on this page · raw message
t/t9125-git-svn-multi-glob-branch-names.sh new file +37 -0
@@ -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
Signature · 1 line
1.6.0.rc2.4.g0643f
PATCH 2/3 git-svn: Allow deep branch names by supporting multi-globs
In reply to Eric WongFrom: Marcus Griep <[email protected]>
Date: Thu, 7 Aug 2008 11:34:02 -0400
Subject: [PATCH 2/3] 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
]
---
Oops, resent as I forgot to change the From: header
git-svn.perl | 61 ++++++++--- t/t9108-git-svn-glob.sh | 9 +- t/t9108-git-svn-multi-glob.sh | 157 ++++++++++++++++++++++++++++ t/t9125-git-svn-multi-glob-branch-names.sh | 37 +++++++ 4 files changed, 244 insertions(+), 20 deletions(-) create mode 100755 t/t9108-git-svn-multi-glob.sh create mode 100755 t/t9125-git-svn-multi-glob-branch-names.sh
git-svn.perl +45 -16
@@ -987,8 +987,10 @@ sub complete_url_ls_init { if (length $pfx && $pfx !~ m#/$#) { die "--prefix='$pfx' must have a trailing slash '/'\n"; } - command_noisy('config', "svn-remote.$gs->{repo_id}.$n", - "$remote_path:refs/remotes/$pfx*"); + command_noisy('config', + "svn-remote.$gs->{repo_id}.$n", + "$remote_path:refs/remotes/$pfx*" . + ('/*' x (($remote_path =~ tr/*/*/) - 1)) ); } sub verify_ref {
@@ -4124,16 +4126,38 @@ sub gs_fetch_loop_common { 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 { my ($self, $exists, $paths, $globs, $r) = @_; sub get_dir_check { my ($self, $exists, $g, $r) = @_; - my @x = eval { $self->get_dir($g->{path}->{left}, $r) }; - return unless scalar @x == 3; - my $dirents = $x[0]; - foreach my $de (keys %$dirents) { - next if $dirents->{$de}->{kind} != $SVN::Node::dir; + + my @dirs = $self->get_dir_globbed($g->{path}->{left}, + $g->{path}->{depth}, + $r); + + foreach my $de (@dirs) { my $p = $g->{path}->full_path($de); next if $exists->{$p}; next if (length $g->{path}->{right} &&
@@ -4915,16 +4939,21 @@ sub new { my ($class, $glob) = @_; my $re = $glob; $re =~ s!/+$!!g; # no need for trailing slashes - my $nr = $re =~ tr/*/*/; - if ($nr > 1) { - die "Only one '*' wildcard expansion ", - "is supported (got $nr): '$glob'\n"; - } elsif ($nr == 0) { + $re =~ m!^([^*]*)(\*(?:/\*)*)([^*]*)$!; + my $temp = $re; + my ($left, $right) = ($1, $3); + $re = $2; + 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"; } - $re =~ s!^(.*)\*(.*)$!\(\[^/\]+\)!g; - my ($left, $right) = ($1, $2); - $re = quotemeta($left) . $re . quotemeta($right); + $re =~ s!\*!\[^/\]*!g; +# $re =~ s!\?!\[^/\]!g; + $re = quotemeta($left) . "($re)" . quotemeta($right); if (length $left && !($left =~ s!/+$!!g)) { die "Missing trailing '/' on left side of: '$glob' ($left)\n"; }
@@ -4933,7 +4962,7 @@ sub new { } my $left_re = qr/^\/\Q$left\E(\/|$)/; 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 {
t/t9108-git-svn-glob.sh +5 -4
@@ -52,7 +52,8 @@ test_expect_success 'test refspec globbing' ' test "`git rev-parse refs/remotes/tags/end~1`" = \ "`git rev-parse refs/remotes/branches/start`" && 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
@@ -83,8 +84,8 @@ test_expect_success 'test left-hand-side only globbing' ' cmp expect.two output.two ' -echo "Only one '*' wildcard expansion is supported (got 2): 'branches/*/*'" \ - > expect.three +echo "Only one set of wildcard directories" \ + "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three echo "" >> expect.three test_expect_success 'test disallow multi-globs' '
@@ -92,7 +93,7 @@ test_expect_success 'test disallow multi-globs' ' git config --add svn-remote.three.fetch \ trunk:refs/remotes/three/trunk && 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 \ "tags/*/*:refs/remotes/three/tags/*" && cd tmp &&
t/t9108-git-svn-multi-glob.sh new file +157 -0
157 lines not on this page · raw message
t/t9125-git-svn-multi-glob-branch-names.sh new file +37 -0
@@ -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
Signature · 1 line
1.6.0.rc2.4.g0643f
PATCH 3/3 git-svn: wrap long lines in a few places
In reply to Eric WongOops, I let a few patches slip by with long lines in them. Extracted from an unrelated patch by: Marcus Griep <[email protected]>
--- git-svn.perl | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
git-svn.perl +5 -2
@@ -171,7 +171,8 @@ my %cmd = ( 'color' => \$Git::SVN::Log::color, 'pager=s' => \$Git::SVN::Log::pager } ], - 'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish", + 'find-rev' => [ \&cmd_find_rev, + "Translate between SVN revision numbers and tree-ish", {} ], 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory", { 'merge|m|M' => \$_merge,
@@ -231,7 +232,9 @@ unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); read_repo_config(\%opts); -Getopt::Long::Configure('pass_through') if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')); +if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) { + Getopt::Long::Configure('pass_through'); +} my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version, 'minimize-connections' => \$Git::SVN::Migration::_minimize, 'id|i=s' => \$Git::SVN::default_ref_id,
Signature · 1 line
1.6.0.rc2.4.g0643f