From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: Re: [PATCH 4/4] fast-import: only store commit objects Date: Mon, 6 May 2013 16:36:18 -0500 Message-ID: References: <1367555502-4706-1-git-send-email-felipe.contreras@gmail.com> <1367555502-4706-5-git-send-email-felipe.contreras@gmail.com> <87y5bw3q1s.fsf@hexa.v.cablecom.net> <518785B3.3050606@alum.mit.edu> <87ip2wflg0.fsf@linux-k42r.v.cablecom.net> <518789D1.4010905@alum.mit.edu> <7v38u0t9va.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Michael Haggerty , Thomas Rast , git@vger.kernel.org, Antoine Pelisse , Johannes Schindelin To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon May 06 23:36:25 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UZT56-0007Fm-Mq for gcvg-git-2@plane.gmane.org; Mon, 06 May 2013 23:36:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757961Ab3EFVgU (ORCPT ); Mon, 6 May 2013 17:36:20 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:33991 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757883Ab3EFVgT (ORCPT ); Mon, 6 May 2013 17:36:19 -0400 Received: by mail-la0-f51.google.com with SMTP id ep20so3772631lab.38 for ; Mon, 06 May 2013 14:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=htE7j6oEoBJlOUOxYsOG/8f6uxtYldlRixLZ+Qlvt60=; b=uvNwlRjunxXZbRLaK1UH0QH8LQpApT5JnE75D9hgveJT7cF8MtK1rnGgx9MGDW+/yv lwJGjbrUw7IfYiek/nQLB/AjXW1cABxOsBG4Xs1S6OQChF6mhGMDOV+pIJ7wdS/QWFT4 rn47tWifXyoz3NoC7w11N8gEZicjJm4PdJhkHha18Di96pEkVBktaM1HvVcPFWKsUeDN 4yhLv6+/b/GaHUsflMyLbG8Gxtbqm4N31R2oUvtebM25ODzq7grElj6q5JBb+ZeOsCHl ZLsJPNRNo7ffwz16DbEKy3dilj57oQGwTWOoRNv3kZvxG8WpgfXixWusYDQdhBdpy/FH QFaw== X-Received: by 10.112.146.133 with SMTP id tc5mr8676541lbb.88.1367876178364; Mon, 06 May 2013 14:36:18 -0700 (PDT) Received: by 10.114.184.3 with HTTP; Mon, 6 May 2013 14:36:18 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, May 6, 2013 at 4:19 PM, Felipe Contreras wrote: > On Mon, May 6, 2013 at 10:18 AM, Junio C Hamano wrote: >> Michael Haggerty writes: >> >>> Yes, it can be handy to start loading the first "blobfile" in parallel >>> with the later stages of the conversion, before the second "dumpfile" is >>> ready. In that case the user needs to pass --export-marks to the first >>> fast-import process to export marks on blobs so that the marks can be >>> passed to the second fast-import via --import-marks. >>> >>> So the proposed change would break a documented use of cvs2git. >>> >>> Making the export of blob marks optional would of course be OK, as long >>> as the default is to export them. >> >> Thanks for a concise summary. Your use case fits exactly what >> Felipe conjectured as the nonexistent minority. > > Not true. cvs2git does *not* rely on the blobs being stored in a marks > file, because cvs2git does not rely on mark files at all. > >> An option that lets the caller say "I only care about marks on these >> types of objects to be written to (and read from) the exported marks >> file" would help Felipe's use case without harming your use case, >> and would be a sane and safe way to go. > > His case is not harmed at all. It's only the unfortunate command that > is mentioned in the documentation that didn't need to be mentioned at > all in the first place. > > It should be the other way around, if it's only this documentation > that is affected, we could add a switch for that particular command, > and the documentation should be updated, but it's overkill to add a > switch for one odd command in some documentation somewhere, it would > be much better to update the odd command to avoid using marks at all, > which is what the more appropriate command does, right below in the > same documentation. This would simplify the documentation, and obliterate the need to use mark files at all: diff -ur cvs2svn-2.4.0/www/cvs2git.html cvs2svn-2.4.0-mod/www/cvs2git.html --- cvs2svn-2.4.0/www/cvs2git.html 2012-09-22 01:49:55.000000000 -0500 +++ cvs2svn-2.4.0-mod/www/cvs2git.html 2013-05-06 16:33:12.070189985 -0500 @@ -355,14 +355,13 @@ fast-import:

-git fast-import --export-marks=../cvs2svn-tmp/git-marks.dat <
../cvs2svn-tmp/git-blob.dat
-git fast-import --import-marks=../cvs2svn-tmp/git-marks.dat <
../cvs2svn-tmp/git-dump.dat
+cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
-

On Linux/Unix this can be shortened to:

+

On Windows you should use type instead:

-cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
+type ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
Only in cvs2svn-2.4.0-mod/www: .cvs2git.html.swp -- Felipe Contreras