vcs-svn: rename repo functions to "svn_repo"

There were several functions in the Subversion code that started with
"repo_".  This namespace is also used by the Git struct repository code.
Rename these functions to start with "svn_repo" to avoid any future
conflicts.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index 67d27f0b6ca95ad62f95bb6c4fb38c58065dc8f0..d77cb0ada7184296f8975e376e38f21d6fd82054 100644 (file)
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -8,7 +8,7 @@
 #include "repo_tree.h"
 #include "fast_export.h"
 
 #include "repo_tree.h"
 #include "fast_export.h"
 

-const char *repo_read_path(const char *path, uint32_t *mode_out)
+const char *svn_repo_read_path(const char *path, uint32_t *mode_out)

 {
        int err;
        static struct strbuf buf = STRBUF_INIT;
 {
        int err;
        static struct strbuf buf = STRBUF_INIT;


@@ -25,7 +25,7 @@ const char *repo_read_path(const char *path, uint32_t *mode_out)
        return buf.buf;
 }
 
        return buf.buf;
 }
 

-void repo_copy(uint32_t revision, const char *src, const char *dst)
+void svn_repo_copy(uint32_t revision, const char *src, const char *dst)

 {
        int err;
        uint32_t mode;
 {
        int err;
        uint32_t mode;


@@ -42,7 +42,7 @@ void repo_copy(uint32_t revision, const char *src, const char *dst)
        fast_export_modify(dst, mode, data.buf);
 }
 
        fast_export_modify(dst, mode, data.buf);
 }
 

-void repo_delete(const char *path)
+void svn_repo_delete(const char *path)

 {
        fast_export_delete(path);
 }
 {
        fast_export_delete(path);
 }

diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
index d0f5690dca8e2732b4a9eb92b00d1b2787d74bbe..555b64bbb6bddc4c580a44834f05912a3c897635 100644 (file)
--- a/vcs-svn/repo_tree.h
+++ b/vcs-svn/repo_tree.h
@@ -9,8 +9,8 @@ struct strbuf;
 #define REPO_MODE_LNK 0120000
 
 uint32_t next_blob_mark(void);
 #define REPO_MODE_LNK 0120000
 
 uint32_t next_blob_mark(void);

-void repo_copy(uint32_t revision, const char *src, const char *dst);
-const char *repo_read_path(const char *path, uint32_t *mode_out);
-void repo_delete(const char *path);
+void svn_repo_copy(uint32_t revision, const char *src, const char *dst);
+const char *svn_repo_read_path(const char *path, uint32_t *mode_out);
+void svn_repo_delete(const char *path);

 
 #endif
 
 #endif

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index e4b395963b9457a680a369c3e1997c799f8793ab..7da84b2aab6172f0969e351fb489b45a256db521 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -225,15 +225,15 @@ static void handle_node(void)
                if (have_text || have_props || node_ctx.srcRev)
                        die("invalid dump: deletion node has "
                                "copyfrom info, text, or properties");
                if (have_text || have_props || node_ctx.srcRev)
                        die("invalid dump: deletion node has "
                                "copyfrom info, text, or properties");

-               repo_delete(node_ctx.dst.buf);
+               svn_repo_delete(node_ctx.dst.buf);

                return;
        }
        if (node_ctx.action == NODEACT_REPLACE) {
                return;
        }
        if (node_ctx.action == NODEACT_REPLACE) {

-               repo_delete(node_ctx.dst.buf);
+               svn_repo_delete(node_ctx.dst.buf);

                node_ctx.action = NODEACT_ADD;
        }
        if (node_ctx.srcRev) {
                node_ctx.action = NODEACT_ADD;
        }
        if (node_ctx.srcRev) {

-               repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
+               svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);

                if (node_ctx.action == NODEACT_ADD)
                        node_ctx.action = NODEACT_CHANGE;
        }
                if (node_ctx.action == NODEACT_ADD)
                        node_ctx.action = NODEACT_CHANGE;
        }


@@ -249,7 +249,7 @@ static void handle_node(void)
                old_data = NULL;
        } else if (node_ctx.action == NODEACT_CHANGE) {
                uint32_t mode;
                old_data = NULL;
        } else if (node_ctx.action == NODEACT_CHANGE) {
                uint32_t mode;

-               old_data = repo_read_path(node_ctx.dst.buf, &mode);
+               old_data = svn_repo_read_path(node_ctx.dst.buf, &mode);

                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)
                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)