Merge branch 'bc/vcs-svn-cleanup' into maint
Code clean-up. * bc/vcs-svn-cleanup: vcs-svn: rename repo functions to "svn_repo" vcs-svn: remove unused prototypes
This commit is contained in:
commit
044aa0eb7f
@ -8,7 +8,7 @@
|
|||||||
#include "repo_tree.h"
|
#include "repo_tree.h"
|
||||||
#include "fast_export.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;
|
int err;
|
||||||
static struct strbuf buf = STRBUF_INIT;
|
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;
|
int err;
|
||||||
uint32_t mode;
|
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);
|
||||||
}
|
}
|
||||||
|
@ -9,15 +9,8 @@ struct strbuf;
|
|||||||
#define REPO_MODE_LNK 0120000
|
#define REPO_MODE_LNK 0120000
|
||||||
|
|
||||||
uint32_t next_blob_mark(void);
|
uint32_t next_blob_mark(void);
|
||||||
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);
|
||||||
void repo_add(const char *path, uint32_t mode, uint32_t blob_mark);
|
const char *svn_repo_read_path(const char *path, uint32_t *mode_out);
|
||||||
const char *repo_read_path(const char *path, uint32_t *mode_out);
|
void svn_repo_delete(const char *path);
|
||||||
void repo_delete(const char *path);
|
|
||||||
void repo_commit(uint32_t revision, const char *author,
|
|
||||||
const struct strbuf *log, const char *uuid, const char *url,
|
|
||||||
long unsigned timestamp);
|
|
||||||
void repo_diff(uint32_t r1, uint32_t r2);
|
|
||||||
void repo_init(void);
|
|
||||||
void repo_reset(void);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -225,15 +225,15 @@ static void handle_node(void)
|
|||||||
if (have_text || have_props || node_ctx.srcRev)
|
if (have_text || have_props || node_ctx.srcRev)
|
||||||
die("invalid dump: deletion node has "
|
die("invalid dump: deletion node has "
|
||||||
"copyfrom info, text, or properties");
|
"copyfrom info, text, or properties");
|
||||||
repo_delete(node_ctx.dst.buf);
|
svn_repo_delete(node_ctx.dst.buf);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (node_ctx.action == NODEACT_REPLACE) {
|
if (node_ctx.action == NODEACT_REPLACE) {
|
||||||
repo_delete(node_ctx.dst.buf);
|
svn_repo_delete(node_ctx.dst.buf);
|
||||||
node_ctx.action = NODEACT_ADD;
|
node_ctx.action = NODEACT_ADD;
|
||||||
}
|
}
|
||||||
if (node_ctx.srcRev) {
|
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)
|
if (node_ctx.action == NODEACT_ADD)
|
||||||
node_ctx.action = NODEACT_CHANGE;
|
node_ctx.action = NODEACT_CHANGE;
|
||||||
}
|
}
|
||||||
@ -249,7 +249,7 @@ static void handle_node(void)
|
|||||||
old_data = NULL;
|
old_data = NULL;
|
||||||
} else if (node_ctx.action == NODEACT_CHANGE) {
|
} else if (node_ctx.action == NODEACT_CHANGE) {
|
||||||
uint32_t mode;
|
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)
|
if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
|
||||||
die("invalid dump: cannot modify a directory into a file");
|
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user