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>
brian m. carlson committed
Aug 21, 2017 at 00:00 UTC
15d1d0951e60903263f90af912738ad60ac43bb5
3 files changed
+10
-10
vcs-svn/repo_tree.c
+3
-3
@@ -8,7 +8,7 @@
8
#include "repo_tree.h"
9
#include "fast_export.h"
10
11
-const char *repo_read_path(const char *path, uint32_t *mode_out)
11
+const char *svn_repo_read_path(const char *path, uint32_t *mode_out)
12
{
13
int err;
14
static struct strbuf buf = STRBUF_INIT;
@@ -25,7 +25,7 @@ const char *repo_read_path(const char *path, uint32_t *mode_out)
25
return buf.buf;
26
}
27
28
-void repo_copy(uint32_t revision, const char *src, const char *dst)
28
+void svn_repo_copy(uint32_t revision, const char *src, const char *dst)
29
{
30
int err;
31
uint32_t mode;
@@ -42,7 +42,7 @@ void repo_copy(uint32_t revision, const char *src, const char *dst)
42
fast_export_modify(dst, mode, data.buf);
43
}
44
45
-void repo_delete(const char *path)
45
+void svn_repo_delete(const char *path)
46
{
47
fast_export_delete(path);
48
}
vcs-svn/repo_tree.h
+3
-3
@@ -9,8 +9,8 @@ struct strbuf;
9
#define REPO_MODE_LNK 0120000
10
11
uint32_t next_blob_mark(void);
12
-void repo_copy(uint32_t revision, const char *src, const char *dst);
13
-const char *repo_read_path(const char *path, uint32_t *mode_out);
14
-void repo_delete(const char *path);
12
+void svn_repo_copy(uint32_t revision, const char *src, const char *dst);
13
+const char *svn_repo_read_path(const char *path, uint32_t *mode_out);
14
+void svn_repo_delete(const char *path);
15
16
#endif
vcs-svn/svndump.c
+4
-4
@@ -225,15 +225,15 @@ static void handle_node(void)
225
if (have_text || have_props || node_ctx.srcRev)
226
die("invalid dump: deletion node has "
227
"copyfrom info, text, or properties");
228
- repo_delete(node_ctx.dst.buf);
228
+ svn_repo_delete(node_ctx.dst.buf);
229
return;
230
}
231
if (node_ctx.action == NODEACT_REPLACE) {
232
- repo_delete(node_ctx.dst.buf);
232
+ svn_repo_delete(node_ctx.dst.buf);
233
node_ctx.action = NODEACT_ADD;
234
}
235
if (node_ctx.srcRev) {
236
- repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
236
+ svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
237
if (node_ctx.action == NODEACT_ADD)
238
node_ctx.action = NODEACT_CHANGE;
239
}
@@ -249,7 +249,7 @@ static void handle_node(void)
249
old_data = NULL;
250
} else if (node_ctx.action == NODEACT_CHANGE) {
251
uint32_t mode;
252
- old_data = repo_read_path(node_ctx.dst.buf, &mode);
252
+ old_data = svn_repo_read_path(node_ctx.dst.buf, &mode);
253
if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
254
die("invalid dump: cannot modify a directory into a file");
255
if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR)