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

[PATCH db/vcs-svn-incremental] vcs-svn: avoid git-isms in fast-import stream

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Dec 11, 2010, 23:00 UTC
Message-ID
<20101211230033.GB18822@burratino>
In-Reply-To
<20101211184654.GA17464@burratino>
Jonathan Nieder wrote:
Show 9 quoted lines
> I am not totally happy with the result, since it adds another
> git-specific detail to svn-fe (the first was hardcoding the
> empty blob sha1 instead of using
> 
> 	blob
> 	mark :0
> 	data 0
> 
> ).
Maybe this would help?
-- 8< --
Subject: vcs-svn: avoid git-isms in fast-import stream

Current svn-fe is not likely to work without change with other fast-import backends, but don't let that stop us from trying:

 - instead of suppressing copies of empty trees, let the backend
   decide what to do with them;
 - use a mark instead of hard-coding git's name for the empty blob.

However, we do not include commands in the stream for new empty directories, since no syntax is documented for that yet.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 vcs-svn/fast_export.c |    8 +-------
 vcs-svn/svndump.c     |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 75d674e..85166a6 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -40,12 +40,6 @@ void fast_export_delete(uint32_t depth, const uint32_t *path)
 void fast_export_modify(uint32_t depth, const uint32_t *path, uint32_t mode,
 			const char *dataref)
 {
-	/* Git does not track empty directories. */
-	if (S_ISDIR(mode) && !strcmp(dataref, EMPTY_TREE_SHA1_HEX)) {
-		fast_export_delete(depth, path);
-		return;
-	}
-
 	/* Mode must be 100644, 100755, 120000, or 160000. */
 	printf("M %06"PRIo32" %s ", mode, dataref);
 	pool_print_seq(depth, path, '/', stdout);
@@ -255,7 +249,7 @@ void fast_export_data(uint32_t mode, uint32_t len, struct line_buffer *input)
 
 void fast_export_empty_blob(void)
 {
-	printf("blob\ndata 0\n\n");
+	printf("blob\nmark :0\ndata 0\n\n");
 }
 
 void fast_export_delta(const uint32_t *path, uint32_t mode, uint32_t old_mode,
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 68a8435..e28e762 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -244,7 +244,7 @@ static void handle_node(void)
 		if (type == REPO_MODE_DIR)
 			old_data = NULL;
 		else if (have_text)
-			old_data = EMPTY_BLOB_SHA1_HEX;
+			old_data = ":0";
 		else
 			die("invalid dump: adds node without text");
 	} else {

-- 
1.7.2.4
Previous: Jonathan Nieder
Message 37 of 37 in “vcs-svn: prepare for (implement?) incremental import”
  1. 00/10 vcs-svn: prepare for (implement?) incremental importJonathan Nieder, Dec 10, 2010
  2. 01/10 vcs-svn: use higher mark numbers for blobsJonathan Nieder, Dec 10, 2010
  3. 02/10 vcs-svn: save marks for imported commitsJonathan Nieder, Dec 10, 2010
  4. Jonathan NiederMar 6, 2011
  5. 03/10 vcs-svn: introduce cat_mark function to retrieve a marked blobJonathan Nieder, Dec 10, 2010
  6. 04/10 vcs-svn: make apply_delta caller retrieve preimageJonathan Nieder, Dec 10, 2010
  7. 05/10 vcs-svn: split off function to export result from delta applicationJonathan Nieder, Dec 10, 2010
  8. 06/10 vcs-svn: do not rely on marks for old blobsJonathan Nieder, Dec 10, 2010
  9. 07/10 vcs-svn: split off function to make 'ls' requestsJonathan Nieder, Dec 10, 2010
  10. 08/10 vcs-svn: prepare to eliminate repo_tree structureJonathan Nieder, Dec 10, 2010
  11. vcs-svn: prepare to eliminate repo_tree structureJonathan Nieder, Mar 6, 2011
  12. David BarrMar 6, 2011
  13. 09/10 vcs-svn: simplifications for repo_modify_path et alJonathan Nieder, Dec 10, 2010
  14. 10/10 vcs-svn: eliminate repo_tree structureJonathan Nieder, Dec 10, 2010
  15. 12/10 vcs-svn: quote paths correctly for ls commandDavid Michael Barr, Dec 11, 2010
  16. vcs-svn: quote all paths passed to fast-importJonathan Nieder, Dec 11, 2010
  17. 13/10 vcs-svn: use mark from previous import for parent commitDavid Michael Barr, Dec 12, 2010
  18. Jonathan NiederDec 12, 2010
  19. 00/12 vcs-svn: incremental importJonathan Nieder, Mar 6, 2011
  20. 01/12 vcs-svn: use higher mark numbers for blobsJonathan Nieder, Mar 6, 2011
  21. Junio C HamanoMar 8, 2011
  22. Jonathan NiederMar 9, 2011
  23. 02/12 vcs-svn: save marks for imported commitsJonathan Nieder, Mar 6, 2011
  24. 03/12 vcs-svn: introduce repo_read_path to check the content at a pathJonathan Nieder, Mar 6, 2011
  25. 04/12 vcs-svn: handle_node: use repo_read_pathJonathan Nieder, Mar 6, 2011
  26. 05/12 vcs-svn: simplify repo_modify_path and repo_copyJonathan Nieder, Mar 6, 2011
  27. 06/12 vcs-svn: add a comment before each commitJonathan Nieder, Mar 6, 2011
  28. 07/12 vcs-svn: allow input errors to be detected promptlyJonathan Nieder, Mar 6, 2011
  29. 08/12 vcs-svn: set up channel to read fast-import cat-blob responseJonathan Nieder, Mar 6, 2011
  30. 09/12 vcs-svn: eliminate repo_tree structureJonathan Nieder, Mar 6, 2011
  31. 10/12 vcs-svn: quote paths correctly for ls commandJonathan Nieder, Mar 6, 2011
  32. 11/12 vcs-svn: handle filenames with dq correctlyJonathan Nieder, Mar 6, 2011
  33. 12/12 vcs-svn: use mark from previous import for parent commitJonathan Nieder, Mar 6, 2011
  34. Sverre RabbelierMar 7, 2011
  35. Jonathan NiederMar 7, 2011
  36. fast-import: treat filemodify with empty tree as deleteJonathan Nieder, Dec 11, 2010
  37. vcs-svn: avoid git-isms in fast-import streamJonathan Nieder, Dec 11, 2010

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.