Merge branch 'db/svn-fe-code-purge' into svn-fe
* db/svn-fe-code-purge: vcs-svn: drop obj_pool vcs-svn: drop treap vcs-svn: drop string_pool vcs-svn: pass paths through to fast-import Conflicts: vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/repo_tree.h vcs-svn/string_pool.c vcs-svn/svndump.c vcs-svn/trp.txt
This commit is contained in:
@ -8,13 +8,13 @@
|
||||
#include "repo_tree.h"
|
||||
#include "fast_export.h"
|
||||
|
||||
const char *repo_read_path(const uint32_t *path, uint32_t *mode_out)
|
||||
const char *repo_read_path(const char *path, uint32_t *mode_out)
|
||||
{
|
||||
int err;
|
||||
static struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
strbuf_reset(&buf);
|
||||
err = fast_export_ls(REPO_MAX_PATH_DEPTH, path, mode_out, &buf);
|
||||
err = fast_export_ls(path, mode_out, &buf);
|
||||
if (err) {
|
||||
if (errno != ENOENT)
|
||||
die_errno("BUG: unexpected fast_export_ls error");
|
||||
@ -25,24 +25,24 @@ const char *repo_read_path(const uint32_t *path, uint32_t *mode_out)
|
||||
return buf.buf;
|
||||
}
|
||||
|
||||
void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst)
|
||||
void repo_copy(uint32_t revision, const char *src, const char *dst)
|
||||
{
|
||||
int err;
|
||||
uint32_t mode;
|
||||
static struct strbuf data = STRBUF_INIT;
|
||||
|
||||
strbuf_reset(&data);
|
||||
err = fast_export_ls_rev(revision, REPO_MAX_PATH_DEPTH, src, &mode, &data);
|
||||
err = fast_export_ls_rev(revision, src, &mode, &data);
|
||||
if (err) {
|
||||
if (errno != ENOENT)
|
||||
die_errno("BUG: unexpected fast_export_ls_rev error");
|
||||
fast_export_delete(REPO_MAX_PATH_DEPTH, dst);
|
||||
fast_export_delete(dst);
|
||||
return;
|
||||
}
|
||||
fast_export_modify(REPO_MAX_PATH_DEPTH, dst, mode, data.buf);
|
||||
fast_export_modify(dst, mode, data.buf);
|
||||
}
|
||||
|
||||
void repo_delete(uint32_t *path)
|
||||
void repo_delete(const char *path)
|
||||
{
|
||||
fast_export_delete(REPO_MAX_PATH_DEPTH, path);
|
||||
fast_export_delete(path);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user