Re: [RFC PATCH] git-svn does not support intermediate directories?

[Eric Wong <normalperson@yhbt.net>]

Michael Lai <myllai@gmail.com> wrote:
> > Your patch was whitespace damaged and lacked a proposed commit message.
> > Please read Documentation/SubmittingPatches next time.
> Hey Eric,
> 
> Sorry, I didn't notice that; I've read through it and hopefully my
> patches should conform from now on.
> 
> >
> > Anyhow, I fixed your patch up a bit.  Can you sign-off on it
> > if its right to you or let me know if it's broken?  Thanks.
> 
> I looked through the patch and that would work, but at the same time I
> had another idea which may be a little cleaner.  Let me know what you
> think.

Thanks Michael, looks good to me,

Acked and pushed out to git://git.bogomips.org/git-svn

> From ae38acf85cfc86c075578c1c3f3c204d91d1d1f4 Mon Sep 17 00:00:00 2001
> From: Michael Lai <myllai@gmail.com>
> Date: Mon, 9 Mar 2009 11:45:47 -0700
> Subject: [PATCH] git-svn: support intermediate paths when matching tags/branches
> 
> For repositories laid out like the following:
> 
> [svn-remote "svn"]
>       url = http://foo.com/svn/repos/bar
>       fetch = myproject/trunk:refs/remotes/trunk
>       branches = bar/myproject/branches/*:refs/remotes/*
>       tags = bar/myproject/tags/*:refs/remotes/tags/*
> 
> The "bar" component above is considered the intermediate path
> and was not handled correctly.
> 
> Signed-off-by: Michael Lai <myllai@gmail.com>
> ---
>  git-svn.perl |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/git-svn.perl b/git-svn.perl
> index 959eb52..8be6be0 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -2351,7 +2351,10 @@ sub match_paths {
>  	if (my $path = $paths->{"/$self->{path}"}) {
>  		return ($path->{action} eq 'D') ? 0 : 1;
>  	}
> -	$self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
> +	my $repos_root = $self->ra->{repos_root};
> +	my $extended_path = $self->{url} . '/' . $self->{path};
> +	$extended_path =~ s#^\Q$repos_root\E(/|$)##;
> +	$self->{path_regex} ||= qr/^\/\Q$extended_path\E\//;
>  	if (grep /$self->{path_regex}/, keys %$paths) {
>  		return 1;
>  	}
> -- 
> 1.6.2