[PATCH 06/15] vcs-svn: handle_node: Handle deletion case early
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Nov 20, 2010, 00:49 UTC
- Message-ID
- <20101120004917.GG17445@burratino>
- In-Reply-To
- <20101120004525.GA17445@burratino>
Take care of "Node-action: delete" as soon as possible, so we can stop worrying about that case in the rest of the function.
Functional change: catch deletion nodes with features that would not apply to them (text, properties, or origin data) and error out for those cases.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- vcs-svn/svndump.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index 844076b..bc70023 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -159,6 +159,13 @@ static void handle_node(void) if (node_ctx.textLength != LENGTH_UNKNOWN) mark = next_blob_mark(); + if (node_ctx.action == NODEACT_DELETE) { + if (mark || have_props || node_ctx.srcRev) + die("invalid dump: deletion node has " + "copyfrom info, text, or properties"); + return repo_delete(node_ctx.dst); + } + if (have_props && node_ctx.propLength) read_props(); @@ -168,9 +175,7 @@ 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_DELETE) { - repo_delete(node_ctx.dst); - } else if (node_ctx.action == NODEACT_CHANGE || + if (node_ctx.action == NODEACT_CHANGE || node_ctx.action == NODEACT_REPLACE) { if (node_ctx.action == NODEACT_REPLACE && node_ctx.type == REPO_MODE_DIR)
-- 1.7.2.3