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

[PATCH 04/12] vcs-svn: handle_node: use repo_read_path

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Mar 6, 2011, 23:08 UTC
Message-ID
<20110306230851.GF24327@elie>
In-Reply-To
<20110306225419.GA24327@elie>
Date: Fri, 10 Dec 2010 04:28:06 -0600

svn-fe processes each commit in two stages: first decide on the correct content for all paths and export the relevant blobs, then export a commit with the result.

We can keep less state and simplify svn-fe a great deal by doing exporting the commit in one stage: use 'inline' blobs for each path and remember nothing. This way, the repo_tree structure could be eliminated, and we would get support for incremental imports 'for free'.

Reorganize handle_node() along these lines. This is just a code cleanup; the functional changes to repo_tree and handle_revision will come later.

[db: backported to apply without text delta support]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 vcs-svn/svndump.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ee7c0bb..f07376f 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -201,13 +201,14 @@ static void handle_node(void)
 	uint32_t mark = 0;
 	const uint32_t type = node_ctx.type;
 	const int have_props = node_ctx.propLength != LENGTH_UNKNOWN;
+	const int have_text = node_ctx.textLength != LENGTH_UNKNOWN;
 
 	if (node_ctx.text_delta)
 		die("text deltas not supported");
-	if (node_ctx.textLength != LENGTH_UNKNOWN)
+	if (have_text)
 		mark = next_blob_mark();
 	if (node_ctx.action == NODEACT_DELETE) {
-		if (mark || have_props || node_ctx.srcRev)
+		if (have_text || have_props || node_ctx.srcRev)
 			die("invalid dump: deletion node has "
 				"copyfrom info, text, or properties");
 		return repo_delete(node_ctx.dst);
@@ -221,13 +222,20 @@ static void handle_node(void)
 		if (node_ctx.action == NODEACT_ADD)
 			node_ctx.action = NODEACT_CHANGE;
 	}
-	if (mark && type == REPO_MODE_DIR)
+	if (have_text && type == REPO_MODE_DIR)
 		die("invalid dump: directories cannot have text attached");
+
+	/*
+	 * Decide on the new content (mark) and mode (node_ctx.type).
+	 */
 	if (node_ctx.action == NODEACT_CHANGE && !~*node_ctx.dst) {
 		if (type != REPO_MODE_DIR)
 			die("invalid dump: root of tree is not a regular file");
 	} else if (node_ctx.action == NODEACT_CHANGE) {
-		uint32_t mode = repo_modify_path(node_ctx.dst, 0, mark);
+		uint32_t mode;
+		if (!have_text)
+			mark = repo_read_path(node_ctx.dst);
+		mode = repo_modify_path(node_ctx.dst, 0, 0);
 		if (!mode)
 			die("invalid dump: path to be modified is missing");
 		if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
@@ -236,22 +244,27 @@ static void handle_node(void)
 			die("invalid dump: cannot modify a file into a directory");
 		node_ctx.type = mode;
 	} else if (node_ctx.action == NODEACT_ADD) {
-		if (!mark && type != REPO_MODE_DIR)
+		if (!have_text && type != REPO_MODE_DIR)
 			die("invalid dump: adds node without text");
-		repo_add(node_ctx.dst, type, mark);
 	} else {
 		die("invalid dump: Node-path block lacks Node-action");
 	}
+
+	/*
+	 * Adjust mode to reflect properties.
+	 */
 	if (have_props) {
-		const uint32_t old_mode = node_ctx.type;
 		if (!node_ctx.prop_delta)
 			node_ctx.type = type;
 		if (node_ctx.propLength)
 			read_props();
-		if (node_ctx.type != old_mode)
-			repo_modify_path(node_ctx.dst, node_ctx.type, mark);
 	}
-	if (mark)
+
+	/*
+	 * Save the result.
+	 */
+	repo_add(node_ctx.dst, node_ctx.type, mark);
+	if (have_text)
 		fast_export_blob(node_ctx.type, mark,
 				 node_ctx.textLength, &input);
 }

-- 
1.7.4.1
Previous: Jonathan NiederNext: Jonathan Nieder
Message 25 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.