Add a --dry-run option to git-svn rebase

When working with multiple branches in an svn repository, it can be
useful to verify the svn repository and local tracking branch that will
be used for the rebase operation.

Signed-off-by: Seth Falcon <seth@userprimary.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index c9e4efe7f4678ecc0beb87b387c71a7ebd0efc71..f4cbd2f212e544f0a17c761a4c870a925db5802b 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -365,11 +365,15 @@ Passed directly to git-rebase when using 'dcommit' if a
 -n::
 --dry-run::
 
 -n::
 --dry-run::
 

-This is only used with the 'dcommit' command.
+This can be used with the 'dcommit' and 'rebase' commands.

 
 

-Print out the series of git arguments that would show
+For 'dcommit', print out the series of git arguments that would show

 which diffs would be committed to SVN.
 
 which diffs would be committed to SVN.
 

+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.
+

 --
 
 ADVANCED OPTIONS
 --
 
 ADVANCED OPTIONS

diff --git a/git-svn.perl b/git-svn.perl
index ff8335879961bdb65be9dd4cce89d6aada3aeaf0..dcb8b779c8c97df8197185d614a11568ed84cbe8 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -177,6 +177,7 @@ BEGIN
                          'strategy|s=s' => \$_strategy,
                          'local|l' => \$_local,
                          'fetch-all|all' => \$_fetch_all,
                          'strategy|s=s' => \$_strategy,
                          'local|l' => \$_local,
                          'fetch-all|all' => \$_fetch_all,

+                         'dry-run|n' => \$_dry_run,

                          %fc_opts } ],
        'commit-diff' => [ \&cmd_commit_diff,
                           'Commit a diff between two trees',
                          %fc_opts } ],
        'commit-diff' => [ \&cmd_commit_diff,
                           'Commit a diff between two trees',


@@ -557,6 +558,11 @@ sub cmd_rebase {
                die "Unable to determine upstream SVN information from ",
                    "working tree history\n";
        }
                die "Unable to determine upstream SVN information from ",
                    "working tree history\n";
        }

+       if ($_dry_run) {
+               print "Remote Branch: " . $gs->refname . "\n";
+               print "SVN URL: " . $url . "\n";
+               return;
+       }

        if (command(qw/diff-index HEAD --/)) {
                print STDERR "Cannot rebase with uncommited changes:\n";
                command_noisy('status');
        if (command(qw/diff-index HEAD --/)) {
                print STDERR "Cannot rebase with uncommited changes:\n";
                command_noisy('status');