vcs-svn: save marks for imported commits

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ee7c0bb2ea869c66cdbab4f4f23a0d2207e6b27d..e05a99d51f028f1cb5aa5671dcc869de51a24ad4 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -14,6 +14,8 @@
 #include "obj_pool.h"
 #include "string_pool.h"
 
+#define REPORT_FILENO 3
+
 #define NODEACT_REPLACE 4
 #define NODEACT_DELETE 3
 #define NODEACT_ADD 2
@@ -201,13 +203,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,37 +224,47 @@ 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);
-               if (!mode)
-                       die("invalid dump: path to be modified is missing");
+               uint32_t mode;
+               if (!have_text)
+                       mark = repo_read_path(node_ctx.dst);
+               mode = repo_read_mode(node_ctx.dst);
                if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
                        die("invalid dump: cannot modify a directory into a file");
                if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR)
                        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);
 }
@@ -356,6 +369,7 @@ int svndump_init(const char *filename)
        if (buffer_init(&input, filename))
                return error("cannot open %s: %s", filename, strerror(errno));
        repo_init();
+       fast_export_init(REPORT_FILENO);
        reset_dump_ctx(~0);
        reset_rev_ctx(0);
        reset_node_ctx(NULL);
@@ -366,6 +380,7 @@ int svndump_init(const char *filename)
 void svndump_deinit(void)
 {
        log_reset();
+       fast_export_deinit();
        repo_reset();
        reset_dump_ctx(~0);
        reset_rev_ctx(0);
@@ -379,6 +394,7 @@ void svndump_deinit(void)
 void svndump_reset(void)
 {
        log_reset();
+       fast_export_reset();
        buffer_reset(&input);
        repo_reset();
        reset_dump_ctx(~0);