[PATCH 2/2] git svn: the branch command no longer needs the full path

From

EWEric Wong <normalperson@yhbt.net>

Date

Jul 25, 2009, 11:10 UTC

Message-ID

<20090725111044.GA7969@dcvr.yhbt.net>

In-Reply-To

<20090725103821.GA13534@dcvr.yhbt.net>

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

  Also pushed out to git://git.bogomips.org/git-svn along with some
  other changes:

  # I removed the "-" in "git svn" in the pushed out version of
  # "git svn: revert default behavior for --minimize-url"
  Eric Wong (4):
        git svn: revert default behavior for --minimize-url
        git svn: the branch command no longer needs the full path
        t9142: remember to stop httpd if it was used
        git svn: avoid escaping '/' when renaming/copying files

  # I thought I had pushed this out earlier:
  Robert Allan Zeh (1):
        git svn: add gc command

 git-svn.perl                         |   19 ++++++++++++++++---
 t/t9141-git-svn-multiple-branches.sh |    8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 10b77ad..9808597 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -666,9 +666,22 @@ sub cmd_branch {
 			}
 		}
 		unless (defined $glob) {
-			die "Unknown ",
-			    $_tag ? "tag" : "branch",
-			    " destination $_branch_dest\n";
+			my $dest_re = qr/\b\Q$_branch_dest\E\b/;
+			foreach my $g (@{$allglobs}) {
+				$g->{path}->{left} =~ /$dest_re/ or next;
+				if (defined $glob) {
+					die "Ambiguous destination: ",
+					    $_branch_dest, "\nmatches both '",
+					    $glob->{path}->{left}, "' and '",
+					    $g->{path}->{left}, "'\n";
+				}
+				$glob = $g;
+			}
+			unless (defined $glob) {
+				die "Unknown ",
+				    $_tag ? "tag" : "branch",
+				    " destination $_branch_dest\n";
+			}
 		}
 	}
 	my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
diff --git a/t/t9141-git-svn-multiple-branches.sh b/t/t9141-git-svn-multiple-branches.sh
index cb9a6d2..3cd0671 100755
--- a/t/t9141-git-svn-multiple-branches.sh
+++ b/t/t9141-git-svn-multiple-branches.sh
@@ -99,22 +99,22 @@ test_expect_success 'Multiple branch or tag paths require -d' '
 
 test_expect_success 'create new branches and tags' '
 	( cd git_project &&
-		git svn branch -m "New branch 1" -d project/b_one New1 ) &&
+		git svn branch -m "New branch 1" -d b_one New1 ) &&
 	( cd svn_project &&
 		svn_cmd up && test -e b_one/New1/a.file ) &&
 
 	( cd git_project &&
-		git svn branch -m "New branch 2" -d project/b_two New2 ) &&
+		git svn branch -m "New branch 2" -d b_two New2 ) &&
 	( cd svn_project &&
 		svn_cmd up && test -e b_two/New2/a.file ) &&
 
 	( cd git_project &&
-		git svn branch -t -m "New tag 1" -d project/tags_A Tag1 ) &&
+		git svn branch -t -m "New tag 1" -d tags_A Tag1 ) &&
 	( cd svn_project &&
 		svn_cmd up && test -e tags_A/Tag1/a.file ) &&
 
 	( cd git_project &&
-		git svn tag -m "New tag 2" -d project/tags_B Tag2 ) &&
+		git svn tag -m "New tag 2" -d tags_B Tag2 ) &&
 	( cd svn_project &&
 		svn_cmd up && test -e tags_B/Tag2/a.file )
 '

-- 
Eric Wong