# parsecvs tool now creates git repositories 22 messages from 2006-04-02 to 2006-04-04. Participants: Keith Packard, Jan-Benedict Glaw, Linus Torvalds, Erik Mouw, Jakub Narebski, Jeff King, Martin Langhoff, Anand Kumria, Junio C Hamano. Thread: https://gitlist.dev/t/3770 ## Keith Packard, 2006-04-02 05:36 Subject: parsecvs tool now creates git repositories Message-ID: <1143956188.2303.39.camel@neko.keithp.com> URL: https://gitlist.dev/e/1143956188.2303.39.camel%40neko.keithp.com ``` I've hacked in cheesy system(3) calls to invoke various git tools to create a git repository from a parsed cvs repository. It's about the same speed as git-cvsimport now. The UI is a total disaster, sufficient for testing. You must create an Authors file in the current directory which looks like the git-cvsimport authors file. You must also have a edit-change-log program in your path which edits the commit message in place. /bin/true will work if you don't need to edit the messages. I should clearly steal the existing git-cvsimport command line arguments and use those. This tool successfully, and usefully, imports the X.org xserver CVS repository, along with correctly importing several other repositories I've tried. It doesn't quite manage to compute correct branch points for the postgresql CVS repository, so there is clearly work remaining to be done. CVS - your code's worst nightmare. -- keith.packard@intel.com ``` ## Jan-Benedict Glaw, 2006-04-02 09:39 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060402093906.GH1259@lug-owl.de> URL: https://gitlist.dev/e/20060402093906.GH1259%40lug-owl.de In-Reply-To: <1143956188.2303.39.camel@neko.keithp.com> ``` On Sat, 2006-04-01 21:36:28 -0800, Keith Packard wrote: > The UI is a total disaster, sufficient for testing. You must create an > Authors file in the current directory which looks like the git-cvsimport > authors file. You must also have a edit-change-log program in your path > which edits the commit message in place. /bin/true will work if you > don't need to edit the messages. Well, at least this sounds quite promising. I'll give it a run once I've arrived back home on the Binutils repository. MfG, JBG -- Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); ``` ## Jan-Benedict Glaw, 2006-04-02 19:31 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060402193144.GK1259@lug-owl.de> URL: https://gitlist.dev/e/20060402193144.GK1259%40lug-owl.de In-Reply-To: <20060402093906.GH1259@lug-owl.de> ``` On Sun, 2006-04-02 11:39:06 +0200, Jan-Benedict Glaw wrote: > On Sat, 2006-04-01 21:36:28 -0800, Keith Packard wrote: > > The UI is a total disaster, sufficient for testing. You must create an > > Authors file in the current directory which looks like the git-cvsimport > > authors file. You must also have a edit-change-log program in your path > > which edits the commit message in place. /bin/true will work if you > > don't need to edit the messages. > > Well, at least this sounds quite promising. I'll give it a run once > I've arrived back home on the Binutils repository. Doesn't build for me: jbglaw@bixie:~/vax/gittish/parsecvs$ make clean rm -f gram.o lex.o parsecvs.o cvsutil.o revlist.o atom.o revcvs.o git.o y.tab.h gram.c parsecvs jbglaw@bixie:~/vax/gittish/parsecvs$ make yacc -d gram.y mv -f y.tab.c gram.c cc -O0 -g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -c -o gram.o gram.c cc -O0 -g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -c -o lex.o lex.c lex.l: In function ‘yylex’: lex.l:69: warning: implicit declaration of function ‘yyget_lineno’ lex.l:69: warning: nested extern declaration of ‘yyget_lineno’ : At top level: :1747: warning: no previous prototype for ‘yyget_lineno’ :1756: warning: no previous prototype for ‘yyget_in’ :1764: warning: no previous prototype for ‘yyget_out’ :1772: warning: no previous prototype for ‘yyget_leng’ :1781: warning: no previous prototype for ‘yyget_text’ :1790: warning: no previous prototype for ‘yyset_lineno’ :1802: warning: no previous prototype for ‘yyset_in’ :1807: warning: no previous prototype for ‘yyset_out’ :1812: warning: no previous prototype for ‘yyget_debug’ :1817: warning: no previous prototype for ‘yyset_debug’ :1823: warning: no previous prototype for ‘yylex_destroy’ lex.l: In function ‘parse_data’: lex.l:90: error: ‘yytext_ptr’ undeclared (first use in this function) lex.l:90: error: (Each undeclared identifier is reported only once lex.l:90: error: for each function it appears in.) make: *** [lex.o] Error 1 MfG, JBG -- Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); ``` ## Keith Packard, 2006-04-03 04:10 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144037456.2303.92.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144037456.2303.92.camel%40neko.keithp.com In-Reply-To: <20060402193144.GK1259@lug-owl.de> ``` On Sun, 2006-04-02 at 21:31 +0200, Jan-Benedict Glaw wrote: > lex.l: In function ‘parse_data’: > lex.l:90: error: ‘yytext_ptr’ undeclared (first use in this function) > lex.l:90: error: (Each undeclared identifier is reported only once > lex.l:90: error: for each function it appears in.) > make: *** [lex.o] Error 1 I think this is a bug in your version of flex; I'm using standard lex conventions here. I don't know how to make it work for you. -- keith.packard@intel.com ``` ## Linus Torvalds, 2006-04-03 04:38 Subject: Re: parsecvs tool now creates git repositories Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0604022122430.3781%40g5.osdl.org In-Reply-To: <1144037456.2303.92.camel@neko.keithp.com> ``` On Sun, 2 Apr 2006, Keith Packard wrote: > On Sun, 2006-04-02 at 21:31 +0200, Jan-Benedict Glaw wrote: > > > lex.l: In function ÿÿparse_dataÿÿ: > > lex.l:90: error: ÿÿyytext_ptrÿÿ undeclared (first use in this function) > > lex.l:90: error: (Each undeclared identifier is reported only once > > lex.l:90: error: for each function it appears in.) > > make: *** [lex.o] Error 1 > > I think this is a bug in your version of flex; I'm using standard lex > conventions here. I don't know how to make it work for you. I need something like this to make it work with flex/lex.. The "-l" tells flex to be more traditional. The "clean" rule is obvious. And the "yylineno" is a lot more traditional than yyget_lineno(), which doesn't work for me at all. I think that's some issue with flex' support for re-entrant parsers. Whether it works after this, I dunno. But at least it compiles. Linus --- diff --git a/Makefile b/Makefile index 639353a..c7e04a5 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ GCC_WARNINGS3=-Wnested-externs -fno-stri GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3) CFLAGS=-O0 -g $(GCC_WARNINGS) YFLAGS=-d +LFLAGS=-l SRCS=gram.y lex.l cvs.h parsecvs.c cvsutil.c revlist.c atom.c revcvs.c git.c @@ -20,4 +21,4 @@ lex.o: lex.c y.tab.h: gram.c clean: - rm -f $(OBJS) y.tab.h gram.c parsecvs + rm -f $(OBJS) y.tab.h gram.c parsecvs lex.c diff --git a/lex.l b/lex.l index 39cafb0..c7833a4 100644 --- a/lex.l +++ b/lex.l @@ -65,8 +65,7 @@ parse_data (int save); \t ; \n ; . { - fprintf (stderr, "%s: (%d) ignoring %c\n", - yyfilename, yyget_lineno (), + fprintf (stderr, "%s: (%d) ignoring %c\n", yyfilename, yylineno, yytext[0]); } %% @@ -146,8 +145,7 @@ lex_date (cvs_number *n) d = mktime (&tm); if (d == 0) { int i; - fprintf (stderr, "%s: (%d) unparsable date: ", yyfilename, - yyget_lineno ()); + fprintf (stderr, "%s: (%d) unparsable date: ", yyfilename, yylineno); for (i = 0; i < n->c; i++) { if (i) fprintf (stderr, "."); fprintf (stderr, "%d", n->n[i]); ``` ## Jan-Benedict Glaw, 2006-04-03 07:25 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060403072554.GN1259@lug-owl.de> URL: https://gitlist.dev/e/20060403072554.GN1259%40lug-owl.de In-Reply-To: <1144037456.2303.92.camel@neko.keithp.com> ``` On Sun, 2006-04-02 21:10:56 -0700, Keith Packard wrote: > On Sun, 2006-04-02 at 21:31 +0200, Jan-Benedict Glaw wrote: > > lex.l: In function ‘parse_data’: > > lex.l:90: error: ‘yytext_ptr’ undeclared (first use in this function) > > lex.l:90: error: (Each undeclared identifier is reported only once > > lex.l:90: error: for each function it appears in.) > > make: *** [lex.o] Error 1 > > I think this is a bug in your version of flex; I'm using standard lex > conventions here. I don't know how to make it work for you. It compiles for me with this patch (thanks to Linus for the hint): diff --git a/Makefile b/Makefile index 639353a..b8f5014 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ GCC_WARNINGS2=-Wmissing-prototypes -Wmis GCC_WARNINGS3=-Wnested-externs -fno-strict-aliasing GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3) CFLAGS=-O0 -g $(GCC_WARNINGS) -YFLAGS=-d +YFLAGS=-d -l +LFLAGS=-l SRCS=gram.y lex.l cvs.h parsecvs.c cvsutil.c revlist.c atom.c revcvs.c git.c Would you please verify that it doesn't break things for you? Thanks, JBG -- Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); ``` ## Erik Mouw, 2006-04-03 13:58 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060403135834.GD16823@harddisk-recovery.com> URL: https://gitlist.dev/e/20060403135834.GD16823%40harddisk-recovery.com In-Reply-To: <20060403072554.GN1259@lug-owl.de> ``` On Mon, Apr 03, 2006 at 09:25:54AM +0200, Jan-Benedict Glaw wrote: > On Sun, 2006-04-02 21:10:56 -0700, Keith Packard wrote: > > I think this is a bug in your version of flex; I'm using standard lex > > conventions here. I don't know how to make it work for you. > > It compiles for me with this patch (thanks to Linus for the hint): > > diff --git a/Makefile b/Makefile [...] > Would you please verify that it doesn't break things for you? Almost there. I applied your patch and ran "make clean", but the Makefile forgets to remove lex.c. Here's an updated patch: diff --git a/Makefile b/Makefile index 639353a..5651e70 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ GCC_WARNINGS2=-Wmissing-prototypes -Wmis GCC_WARNINGS3=-Wnested-externs -fno-strict-aliasing GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3) CFLAGS=-O0 -g $(GCC_WARNINGS) -YFLAGS=-d +YFLAGS=-d -l +LFLAGS=-l SRCS=gram.y lex.l cvs.h parsecvs.c cvsutil.c revlist.c atom.c revcvs.c git.c @@ -20,4 +21,4 @@ lex.o: lex.c y.tab.h: gram.c clean: - rm -f $(OBJS) y.tab.h gram.c parsecvs + rm -f $(OBJS) y.tab.h gram.c lex.c parsecvs It compiles! Ship it! ;-) Erik -- +-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 -- | Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands ``` ## Erik Mouw, 2006-04-03 14:03 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060403140348.GE16823@harddisk-recovery.com> URL: https://gitlist.dev/e/20060403140348.GE16823%40harddisk-recovery.com In-Reply-To: <1143956188.2303.39.camel@neko.keithp.com> ``` On Sat, Apr 01, 2006 at 09:36:28PM -0800, Keith Packard wrote: > The UI is a total disaster, sufficient for testing. You must create an > Authors file in the current directory which looks like the git-cvsimport > authors file. You must also have a edit-change-log program in your path > which edits the commit message in place. /bin/true will work if you > don't need to edit the messages. > > I should clearly steal the existing git-cvsimport command line arguments > and use those. What is the current way to use it? I get the impression it reads raw ,v files, but how do I get along with a remote CVS repository? Erik -- +-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 -- | Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands ``` ## Jakub Narebski, 2006-04-03 14:21 Subject: Re: parsecvs tool now creates git repositories Message-ID: URL: https://gitlist.dev/e/e0rb0j%24ml9%241%40sea.gmane.org In-Reply-To: <20060403140348.GE16823@harddisk-recovery.com> ``` Erik Mouw wrote: > On Sat, Apr 01, 2006 at 09:36:28PM -0800, Keith Packard wrote: >> The UI is a total disaster, sufficient for testing. You must create an >> Authors file in the current directory which looks like the git-cvsimport >> authors file. You must also have a edit-change-log program in your path >> which edits the commit message in place. /bin/true will work if you >> don't need to edit the messages. >> >> I should clearly steal the existing git-cvsimport command line arguments >> and use those. > > What is the current way to use it? I get the impression it reads raw ,v > files, but how do I get along with a remote CVS repository? >From the comments on #git, parsecvs reads raw ,v files for creating history tree, then uses 'cvs co ...' for getting the contents. If you have access to remote CVS repository, it was suggested to use either cvsclone or cvsup. -- Jakub Narebski Warsaw, Poland ``` ## Keith Packard, 2006-04-03 14:37 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144075047.2303.97.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144075047.2303.97.camel%40neko.keithp.com In-Reply-To: <20060403140348.GE16823@harddisk-recovery.com> ``` On Mon, 2006-04-03 at 16:03 +0200, Erik Mouw wrote: > On Sat, Apr 01, 2006 at 09:36:28PM -0800, Keith Packard wrote: > > The UI is a total disaster, sufficient for testing. You must create an > > Authors file in the current directory which looks like the git-cvsimport > > authors file. You must also have a edit-change-log program in your path > > which edits the commit message in place. /bin/true will work if you > > don't need to edit the messages. > > > > I should clearly steal the existing git-cvsimport command line arguments > > and use those. > > What is the current way to use it? I get the impression it reads raw ,v > files, but how do I get along with a remote CVS repository? You can't. You need to create a local copy of the repository. There is a tool which can do that using the cvs protocol, but I don't recall the name. It turns out that parsing the ,v files directly is both faster and more accurate than attempting to interpret the output of cvs log. -- keith.packard@intel.com ``` ## Keith Packard, 2006-04-03 14:39 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144075148.2303.100.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144075148.2303.100.camel%40neko.keithp.com In-Reply-To: ``` On Mon, 2006-04-03 at 16:21 +0200, Jakub Narebski wrote: > From the comments on #git, parsecvs reads raw ,v files for creating history > tree, then uses 'cvs co ...' for getting the contents. It's not using cvs co, it's using the rcs 'co' command. I will probably fix it to just generate the files directly as that will be a lot faster. If there was a git command to create blobs directly from file contents, it would be faster still as I could create all of the blobs for a particular file in one pass and then just build trees in the index out of those. -- keith.packard@intel.com ``` ## Jeff King, 2006-04-03 15:32 Subject: Re: parsecvs tool now creates git repositories Message-ID: <20060403153233.GA6631@sigio.intra.peff.net> URL: https://gitlist.dev/e/20060403153233.GA6631%40sigio.intra.peff.net In-Reply-To: <1144075047.2303.97.camel@neko.keithp.com> ``` On Mon, Apr 03, 2006 at 07:37:27AM -0700, Keith Packard wrote: > You can't. You need to create a local copy of the repository. There is a > tool which can do that using the cvs protocol, but I don't recall the > name. I believe you're thinking of CVSSuck: http://cvs.m17n.org/~akr/cvssuck/ -Peff ``` ## Keith Packard, 2006-04-03 16:54 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144083282.2303.102.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144083282.2303.102.camel%40neko.keithp.com In-Reply-To: <20060403072554.GN1259@lug-owl.de> ``` On Mon, 2006-04-03 at 09:25 +0200, Jan-Benedict Glaw wrote: > -YFLAGS=-d > +YFLAGS=-d -l > +LFLAGS=-l Works for me too; thanks for the fix. -- keith.packard@intel.com ``` ## Keith Packard, 2006-04-03 22:19 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144102753.2303.121.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144102753.2303.121.camel%40neko.keithp.com In-Reply-To: <1144083282.2303.102.camel@neko.keithp.com> ``` On Mon, 2006-04-03 at 09:54 -0700, Keith Packard wrote: > On Mon, 2006-04-03 at 09:25 +0200, Jan-Benedict Glaw wrote: > > > -YFLAGS=-d > > +YFLAGS=-d -l > > +LFLAGS=-l > > Works for me too; thanks for the fix. Well, -l *kinda* works; it places a limit on the maximum token size. And, unlike 'lex', 'flex' places all input into the token buffer, even if handled outside the usual lexer loop. So, my external function that sucked up file contents was losing. I switched it over to doing one-at-a-time reads from the input file, now the external data function can directly use stdio. This eliminates all calls to 'input' and 'unput' which should make it work for everyone now. flex -- it's like lex, except less flexible. -- keith.packard@intel.com ``` ## Martin Langhoff, 2006-04-03 22:38 Subject: Re: parsecvs tool now creates git repositories Message-ID: <46a038f90604031538x3c94d86ap9f1400427513a3a7@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90604031538x3c94d86ap9f1400427513a3a7%40mail.gmail.com In-Reply-To: <1143956188.2303.39.camel@neko.keithp.com> ``` Keith, Looks nifty. Though I thought you'd go for writing a smarter cvsps, so that git-cvsimport could take advantage of it. Looks like I'll have to brush up on my C to get to play... :-( m ``` ## Anand Kumria, 2006-04-04 00:55 Subject: Re: parsecvs tool now creates git repositories Message-ID: URL: https://gitlist.dev/e/pan.2006.04.04.00.55.35.724626%40progsoc.org In-Reply-To: <20060403140348.GE16823@harddisk-recovery.com> ``` On Mon, 03 Apr 2006 16:03:48 +0200, Erik Mouw wrote: > On Sat, Apr 01, 2006 at 09:36:28PM -0800, Keith Packard wrote: >> The UI is a total disaster, sufficient for testing. You must create an >> Authors file in the current directory which looks like the git-cvsimport >> authors file. You must also have a edit-change-log program in your path >> which edits the commit message in place. /bin/true will work if you >> don't need to edit the messages. >> >> I should clearly steal the existing git-cvsimport command line arguments >> and use those. > > What is the current way to use it? I get the impression it reads raw ,v > files, but how do I get along with a remote CVS repository? cvsclone, recently released, might be what you are after. I've only used it on my own CVS repositories so I've no idea just how hard it hits the remote side. Anand ``` ## Keith Packard, 2006-04-04 02:07 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144116459.2303.129.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144116459.2303.129.camel%40neko.keithp.com In-Reply-To: <46a038f90604031538x3c94d86ap9f1400427513a3a7@mail.gmail.com> ``` On Tue, 2006-04-04 at 10:38 +1200, Martin Langhoff wrote: > Looks nifty. Though I thought you'd go for writing a smarter cvsps, so > that git-cvsimport could take advantage of it. Once I had the change set information sitting in memory, it was far easier to just generate the appropriate git commands than attempt to recreate the cvsps output format... > Looks like I'll have to brush up on my C to get to play... :-( Trust me, it wasn't because I wanted to replace git-cvsimport; it's solely that cvsps was generating complete garbage for most of my repositories. My new tool isn't perfect yet; it isn't getting exactly the expected answers for the postgresql repository, but it's working perfectly for my X server one. -- keith.packard@intel.com ``` ## Martin Langhoff, 2006-04-04 02:16 Subject: Re: parsecvs tool now creates git repositories Message-ID: <46a038f90604031916r4651b572lb9bae4c5a3d47bc9@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90604031916r4651b572lb9bae4c5a3d47bc9%40mail.gmail.com In-Reply-To: <1144116459.2303.129.camel@neko.keithp.com> ``` On 4/4/06, Keith Packard wrote: > Trust me, it wasn't because I wanted to replace git-cvsimport; it's > solely that cvsps was generating complete garbage for most of my > repositories. Oh, I don't mind -- we may as well bury cvsimport but I can't do C like I can do Perl, and I surely want to help on this one. > My new tool isn't perfect yet; it isn't getting exactly the expected > answers for the postgresql repository, but it's working perfectly for my > X server one. Meh, had you done it in Perl, I'd be helping you with the Pg repo, attic files and ensuring that files created on a branch and then put into HEAD are handled gracefully. (But you'll get Linus' and Junio's attention. Smarty cookie.) Does it run incrementally? Can it discover non-binary files and pass -kk? cheers, martin ``` ## Keith Packard, 2006-04-04 02:24 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144117473.2303.132.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144117473.2303.132.camel%40neko.keithp.com In-Reply-To: <46a038f90604031916r4651b572lb9bae4c5a3d47bc9@mail.gmail.com> ``` On Tue, 2006-04-04 at 14:16 +1200, Martin Langhoff wrote: > Meh, had you done it in Perl, I'd be helping you with the Pg repo, > attic files and ensuring that files created on a branch and then put > into HEAD are handled gracefully. (But you'll get Linus' and Junio's > attention. Smarty cookie.) I think those parts are working correctly, I've had plenty of examples of that kind of adventure. > Does it run incrementally? Can it discover non-binary files and pass -kk? It doesn't run incrementally, and it unconditionally passes -kk. It's currently using rcs to check out versions of the files, so it should deal with binary content as well as rcs does. Is there something magic I need to do here? Like for DOS? -- keith.packard@intel.com ``` ## Martin Langhoff, 2006-04-04 02:42 Subject: Re: parsecvs tool now creates git repositories Message-ID: <46a038f90604031942w779894b8p5ef221482a70a301@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90604031942w779894b8p5ef221482a70a301%40mail.gmail.com In-Reply-To: <1144117473.2303.132.camel@neko.keithp.com> ``` On 4/4/06, Keith Packard wrote: > On Tue, 2006-04-04 at 14:16 +1200, Martin Langhoff wrote: > > > Meh, had you done it in Perl, I'd be helping you with the Pg repo, > > attic files and ensuring that files created on a branch and then put > > into HEAD are handled gracefully. (But you'll get Linus' and Junio's > > attention. Smarty cookie.) > > I think those parts are working correctly, I've had plenty of examples > of that kind of adventure. Cool. What's the matter with the Pg repo? (Where can I get hold of that repo?) > > Does it run incrementally? Can it discover non-binary files and pass -kk? > > It doesn't run incrementally, and it unconditionally passes -kk. It's I thought that the .git-cvs directory it created was to be able to run incrementally (btw, I think it's fair game to create subdirs inside .git for this kind of status-tracking). And passing -kk uncoditionally is destructive in some cases (I know... git-cvsimport does it, and I want to fix that). If you can ask rcs about the mode if the file and not pass -kk for binary files... > currently using rcs to check out versions of the files, so it should > deal with binary content as well as rcs does. Is there something magic I > need to do here? Like for DOS? We'll let DOS take care of itself ;) m ``` ## Keith Packard, 2006-04-04 03:51 Subject: Re: parsecvs tool now creates git repositories Message-ID: <1144122709.2303.153.camel@neko.keithp.com> URL: https://gitlist.dev/e/1144122709.2303.153.camel%40neko.keithp.com In-Reply-To: <46a038f90604031942w779894b8p5ef221482a70a301@mail.gmail.com> ``` On Tue, 2006-04-04 at 14:42 +1200, Martin Langhoff wrote: > Cool. What's the matter with the Pg repo? (Where can I get hold of that repo?) As usual, the detection of branch locations is messed up. The postgresql CVS tree is available at: rsync anoncvs.postgresql.org::pgsql-cvs/* postgresql.cvs It's a fairly hefty 300M. > > > Does it run incrementally? Can it discover non-binary files and pass -kk? > > > > It doesn't run incrementally, and it unconditionally passes -kk. It's > > I thought that the .git-cvs directory it created was to be able to run > incrementally (btw, I think it's fair game to create subdirs inside > .git for this kind of status-tracking). And passing -kk uncoditionally > is destructive in some cases (I know... git-cvsimport does it, and I > want to fix that). If you can ask rcs about the mode if the file and > not pass -kk for binary files... nah, the .git-cvs directory is purely for debugging; I leave the various command outputs there so I can see what went wrong. I don't really have a good idea of how we'd do this process incrementally; that's not something I am personally interested in either, I want to run screaming from CVS as fast as I can at this point. > > currently using rcs to check out versions of the files, so it should > > deal with binary content as well as rcs does. Is there something magic I > > need to do here? Like for DOS? > > We'll let DOS take care of itself ;) I did discover that rcs has less sophisticated keyword substitution than cvs; not having any ability to customize stuff. I guess we need to figure out when to pass -ko and when to pass -kk. The other alternative I'd like to get around to trying is to directly generate all of the revision contents from the ,v file. I've just changed parsecvs to generate blobs for every revision in each ,v file right after they're read in; putting the necessary code right into parsecvs should be reasonably straightforward; we don't need the multi-patch logic as we do want to compute each intermediate version of the file. With the blobs all generated, the rest of the operation is a simple matter of building suitable indices and creating commits out of them. That's a reasonably fast operation now as it doesn't manipulate any file contents. Plus, I can do all of the index operations using a single git-update-index command, so I eliminate a pile of forking. Doing the file revision generation in-line would allow us to eliminate most of the remaining forks; we'd run one git-hash-object per file (or so), then a git-update-index, git-write-tree and git-commit-tree per resulting commit. -- keith.packard@intel.com ``` ## Junio C Hamano, 2006-04-04 06:09 Subject: Re: parsecvs tool now creates git repositories Message-ID: <7vodzhc1oh.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vodzhc1oh.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <1144122709.2303.153.camel@neko.keithp.com> ``` Keith Packard writes: > I've just changed parsecvs to generate blobs for every revision in > each ,v file right after they're read in; putting the necessary code > right into parsecvs should be reasonably straightforward; we don't need > the multi-patch logic as we do want to compute each intermediate version > of the file. If you want to go really fast without extra fork, are writing it in C, and have the data for blob in core, you could link with libgit.a and call write_sha1_file() yourself: unsigned char sha1[20]; void *buf; unsigned long len; write_sha1_file(buf, len, "blob", sha1); instead of forking "hash-object -w". You feed your blob data in buf, with its length in len, and you will get the blob object name back in sha1[]. buf is owned by you and after write_sha1_file() returns it is safe for you to scribble over it or free() it. sha1[] stores binary object name (20 bytes, not 40-byte hexadecimal), and you can use the helper function sha1_to_hex() if you need a hex representation: char *sha1_to_hex(sha1) which returns a pointer to a static buffer that is valid until next call to sha1_to_hex(), so you need to strdup it if you want to retain it. ```