Re: Some ideas for StGIT

From: Shawn O. Pearce <spearce@spearce.org>
Date: Aug 4, 2007, 05:51 UTC
Message-ID: <20070804055110.GP20052@spearce.org>
In-Reply-To: <1186206085.28481.33.camel@dv>

Pavel Roskin <proski@gnu.org> wrote:

Show 10 quoted lines

> 
> On Fri, 2007-08-03 at 19:14 +0100, Andy Parkins wrote:
> > On Friday 2007, August 03, Pavel Roskin wrote:
> > 
> > > I don't suggest that StGIT gives up on the git-based storage, but this
> > > mode of operation could be implemented in two ways.
> > 
> > git's shiny new git rebase -i has removed, for me, those times when I needed 
> > stgit.  Perhaps those who've move from git to quilt would try again when 
> > 1.5.3 is out with the magic that is "rebase -i".

I agree with Andy. Aside from the performance issues that I am currently having with a 55 patch series, "rebase -i" (and its predecessor script from Dscho) have been a major part of my toolkit, to the point that I really don't need something like StGIT on my system.

(Regarding the performance, cherry-picking 55 patches is
slow, especially when many of them would apply trivially with
git-diff|git-apply --index.  Be nice to improve that in 1.5.4.)

> I don't understand how one option can replace StGIT.  I assume you were
> trying to avoid StGIT already, and "git-rebase -i" was just the last
> missing piece.

Oh, I'm sure there's features in StGIT that are useful that aren't
available via "rebase -i".  But to be honest, "rebase -i" is good
enough.  It just ain't fast enough.  Editing a patch that is 50
back in the series *sucks*.

Show 12 quoted lines

> It would be great if you could tell me how your approach would deal with
> the issue of editable patches I mentioned already.  In case I was
> unclear, here's the quote from one of the developers:
> 
> [quote]
> Sometimes, I just make patches in quilt, then I do "quilt 
> refresh", "quilt pop -a", "cd patches" and modify the patches 
> and series file manually, e.g. by moving one patch from one file 
> into the other. The "cd ..", "quilt push -a" and off I am. That 
> the "database" of quilt is in a known format and I can hack on 
> it with an editor is a plus for me :-)
> [end of quote]

Uh, the "database" of "rebase -i" is just a chain of commits in a git repository. These are a well known format and can be easily edited with "rebase -i". This is a real plus for me as the series can be edited directly in my favorite vi clone, then applied to my working directory. ;-)

-- 
Shawn.