Re: RCS Keywords in Git done right

2014-12-02 Thread Derek Moore
PPS: Sounds like I need Peff's git-blame-tree from here: https://github.com/peff/git/compare/jk/faster-blame-tree -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htm

Re: RCS Keywords in Git done right

2014-12-02 Thread Derek Moore
> My current approach is: > 1) find files common between @ & @{-1}, "ls-tree --full-tree > --name-only -r" both branches, take the intersection > 2) find current branch's commits for common files, for each file in > intersection "log -1 --format=%H $current_branch -- $file" > 3) find common files w

Re: RCS Keywords in Git done right

2014-12-02 Thread Derek Moore
I've finished testing this work in larger repositories. While the approach is performant and works nicely in small repos, but in larger repos one of the requirements for the "correctness" of substitutions slows things down (1 or 2 minutes to perform checkouts between branches with 10,000+ files).

Re: RCS Keywords in Git done right

2014-11-26 Thread Stefan Beller
do? >> Not getting the big picture may be related to me having not worked with RCS >> yet. > > Stefan, > > RCS Keywords, while originating from RCS, are commonly used in CVS and > SVN. A lot of LaTeX workflows in the scientific community, for > example, use these k

Re: RCS Keywords in Git done right

2014-11-26 Thread Derek Moore
g not worked with RCS > yet. Stefan, RCS Keywords, while originating from RCS, are commonly used in CVS and SVN. A lot of LaTeX workflows in the scientific community, for example, use these keyword substitutions, trapping scientists in legacy SCMSes. In my environment, we do builds and dep

Re: RCS Keywords in Git done right

2014-11-26 Thread Stefan Beller
On Wed, Nov 26, 2014 at 8:44 AM, Derek Moore wrote: > Junio, et al., > > I've completed my first pass at RCS Keywords in Git. I believe I've > come up with a solution that is accurate, performant and complete (but > I have not tested it on big repos yet, I'm d

RCS Keywords in Git done right

2014-11-26 Thread Derek Moore
Junio, et al., I've completed my first pass at RCS Keywords in Git. I believe I've come up with a solution that is accurate, performant and complete (but I have not tested it on big repos yet, I'm doing that today...). https://github.com/derekm/git-keywords This work basically

[PATCHv2 08/11] git p4: handle files with wildcards when doing RCS scrubbing

2014-01-22 Thread Pete Wyckoff
Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29) fixed problems with handling files that had p4 wildcard characters, like "@" and "*". But it missed one case, that of RCS keyword scrubbing, which uses "p4 fstat" to extract type information. Fix it b

[PATCH 08/11] git p4: handle files with wildcards when doing RCS scrubbing

2014-01-21 Thread Pete Wyckoff
Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29) fixed problems with handling files that had p4 wildcard characters, like "@" and "*". But it missed one case, that of RCS keyword scrubbing, which uses "p4 fstat" to extract type information. Fix it b

Re: rcs

2013-11-06 Thread Junio C Hamano
attempt to import a git database into Razor which is >>>> linux rcs based. Does the linux version of git use rcs ? >>> >>> No, the formats are completely different, and you will have to translate. >>> We don't usually get requests to go from git to rcs; it usu

Re: rcs

2013-11-05 Thread Jakub Narębski
Finnerty, James M Mr CTR USA USASOC-SOAR wrote Jeff King [mailto:p...@peff.net]wrote: On Tue, Oct 29, 2013 at 11:35:21AM -0500, Finnerty, James M Mr CTR USA USASOC-SOAR wrote: Hi. I'm going to attempt to import a git database into Razor which is linux rcs based. Does the linux version o

RE: rcs

2013-10-29 Thread Finnerty, James M Mr CTR USA USASOC-SOAR
Jeff, Thanks. We have several systems using Razor right now. So we are trying to get all the systems into one CM system. Razor is just a gui that uses rcs commands. Once we get everything synced we will explore our options for a complete development CM system. Jim -Original Message

Re: rcs

2013-10-29 Thread Jeff King
On Tue, Oct 29, 2013 at 11:35:21AM -0500, Finnerty, James M Mr CTR USA USASOC-SOAR wrote: > Hi. I'm going to attempt to import a git database into Razor which is > linux rcs based. Does the linux version of git use rcs ? No, the formats are completely different, and you will have t

Re: rcs

2013-10-29 Thread Keshav Kini
"Finnerty, James M Mr CTR USA USASOC-SOAR" writes: > Hi. I'm going to attempt to import a git database into Razor which is > linux rcs based. Does the linux version of git use rcs ? If you're talking about the GNU rcs program, no, it does not. -Keshav -- To unsubscrib

rcs

2013-10-29 Thread Finnerty, James M Mr CTR USA USASOC-SOAR
Hi. I'm going to attempt to import a git database into Razor which is linux rcs based. Does the linux version of git use rcs ? Thanks Jim Jim Finnerty ECS, Inc. Comm: (270) 798-1386, Fax: (270)798-7724 Cell: (570) 498-8499 CAUTION: This message may contain competitive, sensitive or othe

Re: [PATCH] git p4: RCS expansion should not span newlines

2012-11-08 Thread Jeff King
On Sun, Nov 04, 2012 at 05:04:02PM -0500, Pete Wyckoff wrote: > This bug was introduced in cb585a9 (git-p4: keyword > flattening fixes, 2011-10-16). The newline character > is indeed special, and $File$ expansions should not try > to match across multiple lines. > > Based-on-patch-by: Chris Goar

[PATCH] git p4: RCS expansion should not span newlines

2012-11-04 Thread Pete Wyckoff
2012 12:49 -0700: > Hi. Noticed an apparent bug in git-p4 related to RCS keyword > expansion. Some files in our Perforce repository have malformed RCS > keywords, e.g. "$Revision:" without a closing $. Perforce doesn't > expand these, obviously, but when a change to this