Add git-svn branch to allow branch creation in SVN repositories

[ew: fixed a warning to stderr causing t9108 to fail]

Signed-off-by: Florian Ragwitz <rafl@debian.org>
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 82d03b4ced9cb7e34feca325d0ac7b41923de976..84c8f3cde0b781ef1579b38a17430dc405115190 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -149,6 +149,22 @@ and have no uncommitted changes.
        is very strongly discouraged.
 --
 
+'branch'::
+       Create a branch in the SVN repository.
+
+-m;;
+--message;;
+       Allows to specify the commit message.
+
+-t;;
+--tag;;
+       Create a tag by using the tags_subdir instead of the branches_subdir
+       specified during git svn init.
+
+'tag'::
+       Create a tag in the SVN repository. This is a shorthand for
+       'branch -t'.
+
 'log'::
        This should make it easy to look up svn log messages when svn
        users refer to -r/--revision numbers.
@@ -372,7 +388,8 @@ Passed directly to 'git-rebase' when using 'dcommit' if a
 -n::
 --dry-run::
 
-This can be used with the 'dcommit' and 'rebase' commands.
+This can be used with the 'dcommit', 'rebase', 'branch' and 'tag'
+commands.
 
 For 'dcommit', print out the series of git arguments that would show
 which diffs would be committed to SVN.
@@ -381,6 +398,9 @@ For 'rebase', display the local branch associated with the upstream svn
 repository associated with the current branch and the URL of svn
 repository that will be fetched from.
 
+For 'branch' and 'tag', display the urls that will be used for copying when
+creating the branch or tag.
+
 --
 
 ADVANCED OPTIONS
@@ -498,6 +518,8 @@ Tracking and contributing to an entire Subversion-managed project
        git svn clone http://svn.example.com/project -T trunk -b branches -t tags
 # View all branches and tags you have cloned:
        git branch -r
+# Create a new branch in SVN
+    git svn branch waldo
 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
        git reset --hard remotes/trunk

diff --git a/git-svn.perl b/git-svn.perl
index 7609a837419012d94109cf8b4de1b9bbdb969c83..ef6d773df1143b32f0bc421b59421f7e0eab60bd 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -66,7 +66,7 @@ my ($_stdin, $_help, $_edit,
        $_version, $_fetch_all, $_no_rebase,
        $_merge, $_strategy, $_dry_run, $_local,
        $_prefix, $_no_checkout, $_url, $_verbose,
-       $_git_format, $_commit_url);
+       $_git_format, $_commit_url, $_tag);
 $Git::SVN::_follow_parent = 1;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
                     'config-dir=s' => \$Git::SVN::Ra::config_dir,
@@ -131,6 +131,15 @@ my %cmd = (
                          'revision|r=i' => \$_revision,
                          'no-rebase' => \$_no_rebase,
                        %cmt_opts, %fc_opts } ],
+       branch => [ \&cmd_branch,
+                   'Create a branch in the SVN repository',
+                   { 'message|m=s' => \$_message,
+                     'dry-run|n' => \$_dry_run,
+                     'tag|t' => \$_tag } ],
+       tag => [ sub { $_tag = 1; cmd_branch(@_) },
+                'Create a tag in the SVN repository',
+                { 'message|m=s' => \$_message,
+                  'dry-run|n' => \$_dry_run } ],
        'set-tree' => [ \&cmd_set_tree,
                        "Set an SVN repository to a git tree-ish",
                        { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
@@ -537,6 +546,42 @@ sub cmd_dcommit {
        unlink $gs->{index};
 }
 
+sub cmd_branch {
+       my ($branch_name, $head) = @_;
+
+       unless (defined $branch_name && length $branch_name) {
+               die(($_tag ? "tag" : "branch") . " name required\n");
+       }
+       $head ||= 'HEAD';
+
+       my ($src, $rev, undef, $gs) = working_head_info($head);
+
+       my $remote = Git::SVN::read_all_remotes()->{svn};
+       my $glob = $remote->{ $_tag ? 'tags' : 'branches' };
+       my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
+       my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());
+
+       my $ctx = SVN::Client->new(
+               auth    => Git::SVN::Ra::_auth_providers(),
+               log_msg => sub {
+                       ${ $_[0] } = defined $_message
+                               ? $_message
+                               : 'Create ' . ($_tag ? 'tag ' : 'branch ' )
+                               . $branch_name;
+               },
+       );
+
+       eval {
+               $ctx->ls($dst, 'HEAD', 0);
+       } and die "branch ${branch_name} already exists\n";
+
+       print "Copying ${src} at r${rev} to ${dst}...\n";
+       $ctx->copy($src, $rev, $dst)
+               unless $_dry_run;
+
+       $gs->fetch_all;
+}
+
 sub cmd_find_rev {
        my $revision_or_hash = shift or die "SVN or git revision required ",
                                            "as a command-line argument\n";

diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
new file mode 100755 (executable)
index 0000000..47c4d4d
--- /dev/null
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# Copyright (c) 2008 Deskin Miller
+#
+
+test_description='git svn partial-rebuild tests'
+. ./lib-git-svn.sh
+
+test_expect_success 'initialize svnrepo' '
+       mkdir import &&
+       (
+               cd import &&
+               mkdir trunk branches tags &&
+               cd trunk &&
+               echo foo > foo &&
+               cd .. &&
+               svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
+               cd .. &&
+               rm -rf import &&
+               svn co "$svnrepo"/trunk trunk &&
+               cd trunk &&
+               echo bar >> foo &&
+               svn ci -m "updated trunk" &&
+               cd .. &&
+               rm -rf trunk
+       )
+'
+
+test_expect_success 'import into git' '
+       git svn init --stdlayout "$svnrepo" &&
+       git svn fetch &&
+       git checkout remotes/trunk
+'
+
+test_expect_success 'git svn branch tests' '
+       git svn branch a &&
+       base=$(git rev-parse HEAD:) &&
+       test $base = $(git rev-parse remotes/a:) &&
+       git svn branch -m "created branch b blah" b &&
+       test $base = $(git rev-parse remotes/b:) &&
+       test_must_fail git branch -m "no branchname" &&
+       git svn branch -n c &&
+       test_must_fail git rev-parse remotes/c &&
+       test_must_fail git svn branch a &&
+       git svn branch -t tag1 &&
+       test $base = $(git rev-parse remotes/tags/tag1:) &&
+       git svn branch --tag tag2 &&
+       test $base = $(git rev-parse remotes/tags/tag2:) &&
+       git svn tag tag3 &&
+       test $base = $(git rev-parse remotes/tags/tag3:) &&
+       git svn tag -m "created tag4 foo" tag4 &&
+       test $base = $(git rev-parse remotes/tags/tag4:) &&
+       test_must_fail git svn tag -m "no tagname" &&
+       git svn tag -n tag5 &&
+       test_must_fail git rev-parse remotes/tags/tag5 &&
+       test_must_fail git svn tag tag1
+'
+
+test_done