Re: [PATCH] Make git-cvsexportcommit "status" each file in turn

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Aug 15, 2007, 19:40 UTC
Message-ID: <200708152140.36432.robin.rosenberg.lists@dewire.com>
In-Reply-To: <1187195112.13096.71.camel@murta.transitives.com>

onsdag 15 augusti 2007 skrev Alex Bennee:

Show 20 quoted lines

> On Wed, 2007-08-15 at 16:04 +0200, Peter Baumann wrote:
> > On Wed, Aug 15, 2007 at 02:27:28PM +0100, Alex Bennee wrote:
> > > Hi,
> > > 
> > > It turns out CVS doesn't always give the status output in the order
> > > requested. According to my local CVS gurus this is a known CVS issue.
> > <snip>
> > I inlined the patch for easier commenting. Please inline further
> > patches.
> 
> Will do. I assumed Evolution would do something sensible. My mistake :-(
> 
> > 
> > > ---
> > >  git-cvsexportcommit.perl |   30 ++++++++++++++++++++----------
> > >  1 files changed, 20 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
> > <snip>
> > This is extremly wastefull, because it will spawn a CVS process for each

file.

Show 20 quoted lines

> > A better fix would be to parse the filename from the output of
> > 'cvs status' and use that as input for $cvsstat.
> > 
> > (And/or you could use an hash instead of an array for 'cvsoutput', so
> > you could double check that you only get the status for those files you
> > asked for.)
> 
> I agree it's wasteful and could be done better however I'm no perl
> hacker so I just went for something that was correct and worked. 
> 
> The path that is echoed later in the status output is however the CVS
> file path which may not be directly related to the actual path in your
> source tree. For example I have one status reported as:
> 
> $ cvs status src/proj_version
> ===================================================================
> File: proj_version      Status: Up-to-date
> 
>    Working revision:    1.1.380.1
>    Repository revision:

1.1.380.1       /export/cvsroot/project/src/Attic/proj_version,v

Show 5 quoted lines

>    Sticky Tag:          ATAG (branch: 1.1.380)
>    Sticky Date:         (none)
>    Sticky Options:      (none)
> 
> This makes the matching more than a little problematic.

CVS/Root contains the first part of the path. Just use the one found at the top of the CVS checkout. Using CVS may be insane, but mixing different repos in the same checkout is absolute madness.

Then drop /Attic/ if present and the ,v at the end of the file name. Not rocket science I'd say.

> It depends on how much people that use this script care about performance?

We do although I rarely commit big patches so cvsexportcommit usually does it's job in seconds for me. I also use the -u option and don't do any work in the CVS checkout so performing status if just overhead for me. We might drop it completely with a switch.

Show 5 quoted lines

> For my part it's a fire and forget script once I've finished my hacking
> in a git tree so I don't mind it taking some time. I'm not particularly
> minded to dig further in perl to make it faster unless there is a real
> clamour - or perhaps someone with a bigger itch and more perl foo can
> tackle it.

> 
> In the meantime it does fix a bug in the script so I would say it's
> applying.
>

I suggest Junio wait a few days in case a real fix materializes.

-- robin