kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2017-08-21 00:00:18 +00:00 committed by Junio C Hamano
parent 36f63b50e6
commit 15d1d0951e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcs-svn/repo_tree.c
View File

@ -8,7 +8,7 @@
#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;
@ -25,7 +25,7 @@ const char *repo_read_path(const char *path, uint32_t *mode_out)
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;
@ -42,7 +42,7 @@ void repo_copy(uint32_t revision, const char *src, const char *dst)
fast_export_modify(dst, mode, data.buf);
}

void repo_delete(const char *path)
void svn_repo_delete(const char *path)
{
fast_export_delete(path);
}

6
vcs-svn/repo_tree.h
View File

@ -9,8 +9,8 @@ struct strbuf;
#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

8
vcs-svn/svndump.c
View File

@ -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");
repo_delete(node_ctx.dst.buf);
svn_repo_delete(node_ctx.dst.buf);
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) {
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;
}
@ -249,7 +249,7 @@ static void handle_node(void)
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)