From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 20 Nov 2010 00:49:55 +0000 (-0600)
Subject: vcs-svn: Replace = Delete + Add
X-Git-Tag: v1.7.5-rc0~3^2~20^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ee4a9be48ee714ddacf313a7073dabdd6c6ee11;p=git.git

vcs-svn: Replace = Delete + Add

Simplify by reducing the "Node-action: replace" case to "Node-action:
add".  This way, the main part of handle_node() only has to deal with
"add" and "change" nodes.

Functional change: replacing a symlink or executable without setting
properties will reset the mode.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index bc7002307..6a6aaf92b 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -166,6 +166,11 @@ static void handle_node(void)
 		return repo_delete(node_ctx.dst);
 	}
 
+	if (node_ctx.action == NODEACT_REPLACE) {
+		repo_delete(node_ctx.dst);
+		node_ctx.action = NODEACT_ADD;
+	}
+
 	if (have_props && node_ctx.propLength)
 		read_props();
 
@@ -175,12 +180,8 @@ static void handle_node(void)
 	if (mark && node_ctx.type == REPO_MODE_DIR)
 		die("invalid dump: directories cannot have text attached");
 
-	if (node_ctx.action == NODEACT_CHANGE ||
-			   node_ctx.action == NODEACT_REPLACE) {
-		if (node_ctx.action == NODEACT_REPLACE &&
-		    node_ctx.type == REPO_MODE_DIR)
-			repo_replace(node_ctx.dst, mark);
-		else if (have_props)
+	if (node_ctx.action == NODEACT_CHANGE) {
+		if (have_props)
 			repo_modify(node_ctx.dst, node_ctx.type, mark);
 		else if (mark)
 			old_mode = repo_replace(node_ctx.dst, mark);