Re: [PATCH] Add a --dry-run option to git-svn rebase

From: Eric Wong <normalperson@yhbt.net>
Date: Jun 1, 2008, 10:13 UTC
Message-ID: <20080601101304.GC16064@hand.yhbt.net>
In-Reply-To: <20080530171831.GB76080@ziti.local>

Seth Falcon <seth@userprimary.net> wrote:

Show 11 quoted lines

> Hi Eric,
> 
> I think this may have slipped by without your notice as I gather
> things have been busy for you.
> 
> Could you take a look at this patch and let me know if you like
> it/hate it/have a suggestion?
> 
> My motivation was wanting to automate some commit rewritting and
> wanting a script to be able to determine what the local upstream
> branch is...

This patch looks reasonable to me.
Acked-by: Eric Wong <normalperson@yhbt.net>

Show 13 quoted lines

> * On 2008-05-19 at 20:29 -0700 Seth Falcon wrote:
> > @@ -553,6 +554,11 @@ sub cmd_rebase {
> >  		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');

One minor nit is 'url' not being capitalized in the output.  Perhaps:

	Remote Branch: foo
	SVN URL: http://asdf/foo/trunk

Which would make it consistent with 'git svn info' using spaces:

RFC822-style headers would be alright, too.

	Remote-Branch: foo
	SVN-URL: http://asdf/foo/trunk

I do however harbor a deep dislike of camel-case (used by 'git log --pretty=fuller' and .git/config).

	RemoteBranch: foo
	SvnUrl: http://asdf/foo/trunk

Hmm, I don't think I've even _noticed_ a real bike shed in decades. Perhaps they should be painted purple with yellow polkadots and have the words "BIKE SHED" on a flashing neon sign.

-- 
Eric Wong