Skip to content

Commit 15d1d09

Browse files
bk2204gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 36f63b5 commit 15d1d09

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

vcs-svn/repo_tree.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "repo_tree.h"
99
#include "fast_export.h"
1010

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)
1212
{
1313
int err;
1414
static struct strbuf buf = STRBUF_INIT;
@@ -25,7 +25,7 @@ const char *repo_read_path(const char *path, uint32_t *mode_out)
2525
return buf.buf;
2626
}
2727

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)
2929
{
3030
int err;
3131
uint32_t mode;
@@ -42,7 +42,7 @@ void repo_copy(uint32_t revision, const char *src, const char *dst)
4242
fast_export_modify(dst, mode, data.buf);
4343
}
4444

45-
void repo_delete(const char *path)
45+
void svn_repo_delete(const char *path)
4646
{
4747
fast_export_delete(path);
4848
}

vcs-svn/repo_tree.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ struct strbuf;
99
#define REPO_MODE_LNK 0120000
1010

1111
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);
1515

1616
#endif

vcs-svn/svndump.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,15 @@ static void handle_node(void)
225225
if (have_text || have_props || node_ctx.srcRev)
226226
die("invalid dump: deletion node has "
227227
"copyfrom info, text, or properties");
228-
repo_delete(node_ctx.dst.buf);
228+
svn_repo_delete(node_ctx.dst.buf);
229229
return;
230230
}
231231
if (node_ctx.action == NODEACT_REPLACE) {
232-
repo_delete(node_ctx.dst.buf);
232+
svn_repo_delete(node_ctx.dst.buf);
233233
node_ctx.action = NODEACT_ADD;
234234
}
235235
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);
237237
if (node_ctx.action == NODEACT_ADD)
238238
node_ctx.action = NODEACT_CHANGE;
239239
}
@@ -249,7 +249,7 @@ static void handle_node(void)
249249
old_data = NULL;
250250
} else if (node_ctx.action == NODEACT_CHANGE) {
251251
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);
253253
if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
254254
die("invalid dump: cannot modify a directory into a file");
255255
if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR)

0 commit comments

Comments
 (0)