git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/4] fast-import: only store commit objects

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 6, 2013, 21:36 UTC
Message-ID
<CAMP44s2KHH1n0vHB0Mdv-M2xV97KA9FMc6UrPyYyxD+2jsvfTA@mail.gmail.com>
In-Reply-To
<CAMP44s1HASAuF0ECCvJr66WeqopDzLZQ12pKFsc-j5_VCDrizg@mail.gmail.com>

On Mon, May 6, 2013 at 4:19 PM, Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 36 quoted lines
> On Mon, May 6, 2013 at 10:18 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Michael Haggerty <mhagger@alum.mit.edu> 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</tt>:</p>

 <pre>
-git fast-import --export-marks=../cvs2svn-tmp/git-marks.dat &lt;
../cvs2svn-tmp/git-blob.dat
-git fast-import --import-marks=../cvs2svn-tmp/git-marks.dat &lt;
../cvs2svn-tmp/git-dump.dat
+cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
 </pre>

-    <p>On Linux/Unix this can be shortened to:</p>
+    <p>On Windows you should use type instead:</p>

 <pre>
-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
 </pre>

   </li>
Only in cvs2svn-2.4.0-mod/www: .cvs2git.html.swp
-- 
Felipe Contreras
Previous: Felipe ContrerasNext: Michael Haggerty
Message 18 of 38 in “fast-export: speed improvements”
  1. 0/4 fast-export: speed improvementsFelipe Contreras, May 3, 2013
  2. 1/4 fast-{import,export}: use get_sha1_hex() directlyFelipe Contreras, May 3, 2013
  3. Junio C HamanoMay 3, 2013
  4. 2/4 fast-export: improve speed by skipping blobsFelipe Contreras, May 3, 2013
  5. Junio C HamanoMay 3, 2013
  6. 3/4 fast-export: don't parse all the commitsFelipe Contreras, May 3, 2013
  7. Junio C HamanoMay 3, 2013
  8. Felipe ContrerasMay 4, 2013
  9. Junio C HamanoMay 4, 2013
  10. 4/4 fast-import: only store commit objectsFelipe Contreras, May 3, 2013
  11. Thomas RastMay 3, 2013
  12. Felipe ContrerasMay 3, 2013
  13. Michael HaggertyMay 6, 2013
  14. Thomas RastMay 6, 2013
  15. Michael HaggertyMay 6, 2013
  16. Junio C HamanoMay 6, 2013
  17. Felipe ContrerasMay 6, 2013
  18. Felipe ContrerasMay 6, 2013
  19. Michael HaggertyMay 7, 2013
  20. Johannes SchindelinMay 7, 2013
  21. Felipe ContrerasMay 7, 2013
  22. Michael HaggertyMay 7, 2013
  23. Felipe ContrerasMay 7, 2013
  24. Felipe ContrerasMay 6, 2013
  25. Michael HaggertyMay 7, 2013
  26. Johannes SchindelinMay 7, 2013
  27. Felipe ContrerasMay 7, 2013
  28. Felipe ContrerasMay 7, 2013
  29. Michael HaggertyMay 7, 2013
  30. Felipe ContrerasMay 7, 2013
  31. Junio C HamanoMay 7, 2013
  32. Michael HaggertyMay 7, 2013
  33. Johannes SchindelinMay 6, 2013
  34. Felipe ContrerasMay 6, 2013
  35. Junio C HamanoMay 3, 2013
  36. Felipe ContrerasMay 3, 2013
  37. Junio C HamanoMay 3, 2013
  38. Felipe ContrerasMay 4, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.