diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-12-10 13:28:06 +0300 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-03-07 09:56:50 +0300 |
commit | 5a38b186d3ac5840d6ae78511d6dccab8367f242 (patch) | |
tree | 0da2b57e92920654ce57c5dcbae544b670b077c4 /vcs-svn/svndump.c | |
parent | 4f5de755a7931c5e15f4e7fc3d501588aa9ff88d (diff) |
vcs-svn: handle_node: use repo_read_path
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.
But we can keep less state and simplify svn-fe a great deal by
exporting the commit in one step: 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 changes in 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>
Diffstat (limited to 'vcs-svn/svndump.c')
-rw-r--r-- | 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 ee7c0bb2ea..f07376f964 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); } |