41529bbce4
Set up some plumbing: teach the svndump lib to pass a file descriptor number to the fast_export lib, representing where cat-blob/ls responses can be read from, and add a get_response_line helper function to the fast_export lib to read a line from that file. Unfortunately this means that svn-fe needs file descriptor 3 to be redirected from somewhere (preferrably the cat-blob stream of a fast-import backend); otherwise it will fail: $ svndump <path> | svn-fe fatal: cannot read from file descriptor 3: Bad file descriptor For the moment, "svn-fe 3</dev/null" works as a workaround but it will not work for very long. A fast-import backend that can retrieve old commits is needed in order to be able to fulfill svn "Node-copyfrom-rev" requests that refer to revs from a previous run. [jn: with new change description] Based-on-patch-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
404 lines
10 KiB
C
404 lines
10 KiB
C
/*
|
|
* Parse and rearrange a svnadmin dump.
|
|
* Create the dump with:
|
|
* svnadmin dump --incremental -r<startrev>:<endrev> <repository> >outfile
|
|
*
|
|
* Licensed under a two-clause BSD-style license.
|
|
* See LICENSE for details.
|
|
*/
|
|
|
|
#include "cache.h"
|
|
#include "repo_tree.h"
|
|
#include "fast_export.h"
|
|
#include "line_buffer.h"
|
|
#include "obj_pool.h"
|
|
#include "string_pool.h"
|
|
|
|
#define REPORT_FILENO 3
|
|
|
|
#define NODEACT_REPLACE 4
|
|
#define NODEACT_DELETE 3
|
|
#define NODEACT_ADD 2
|
|
#define NODEACT_CHANGE 1
|
|
#define NODEACT_UNKNOWN 0
|
|
|
|
#define DUMP_CTX 0
|
|
#define REV_CTX 1
|
|
#define NODE_CTX 2
|
|
|
|
#define LENGTH_UNKNOWN (~0)
|
|
#define DATE_RFC2822_LEN 31
|
|
|
|
/* Create memory pool for log messages */
|
|
obj_pool_gen(log, char, 4096)
|
|
|
|
static struct line_buffer input = LINE_BUFFER_INIT;
|
|
|
|
static char *log_copy(uint32_t length, const char *log)
|
|
{
|
|
char *buffer;
|
|
log_free(log_pool.size);
|
|
buffer = log_pointer(log_alloc(length));
|
|
strncpy(buffer, log, length);
|
|
return buffer;
|
|
}
|
|
|
|
static struct {
|
|
uint32_t action, propLength, textLength, srcRev, type;
|
|
uint32_t src[REPO_MAX_PATH_DEPTH], dst[REPO_MAX_PATH_DEPTH];
|
|
uint32_t text_delta, prop_delta;
|
|
} node_ctx;
|
|
|
|
static struct {
|
|
uint32_t revision, author;
|
|
unsigned long timestamp;
|
|
char *log;
|
|
} rev_ctx;
|
|
|
|
static struct {
|
|
uint32_t version, uuid, url;
|
|
} dump_ctx;
|
|
|
|
static struct {
|
|
uint32_t svn_log, svn_author, svn_date, svn_executable, svn_special, uuid,
|
|
revision_number, node_path, node_kind, node_action,
|
|
node_copyfrom_path, node_copyfrom_rev, text_content_length,
|
|
prop_content_length, content_length, svn_fs_dump_format_version,
|
|
/* version 3 format */
|
|
text_delta, prop_delta;
|
|
} keys;
|
|
|
|
static void reset_node_ctx(char *fname)
|
|
{
|
|
node_ctx.type = 0;
|
|
node_ctx.action = NODEACT_UNKNOWN;
|
|
node_ctx.propLength = LENGTH_UNKNOWN;
|
|
node_ctx.textLength = LENGTH_UNKNOWN;
|
|
node_ctx.src[0] = ~0;
|
|
node_ctx.srcRev = 0;
|
|
pool_tok_seq(REPO_MAX_PATH_DEPTH, node_ctx.dst, "/", fname);
|
|
node_ctx.text_delta = 0;
|
|
node_ctx.prop_delta = 0;
|
|
}
|
|
|
|
static void reset_rev_ctx(uint32_t revision)
|
|
{
|
|
rev_ctx.revision = revision;
|
|
rev_ctx.timestamp = 0;
|
|
rev_ctx.log = NULL;
|
|
rev_ctx.author = ~0;
|
|
}
|
|
|
|
static void reset_dump_ctx(uint32_t url)
|
|
{
|
|
dump_ctx.url = url;
|
|
dump_ctx.version = 1;
|
|
dump_ctx.uuid = ~0;
|
|
}
|
|
|
|
static void init_keys(void)
|
|
{
|
|
keys.svn_log = pool_intern("svn:log");
|
|
keys.svn_author = pool_intern("svn:author");
|
|
keys.svn_date = pool_intern("svn:date");
|
|
keys.svn_executable = pool_intern("svn:executable");
|
|
keys.svn_special = pool_intern("svn:special");
|
|
keys.uuid = pool_intern("UUID");
|
|
keys.revision_number = pool_intern("Revision-number");
|
|
keys.node_path = pool_intern("Node-path");
|
|
keys.node_kind = pool_intern("Node-kind");
|
|
keys.node_action = pool_intern("Node-action");
|
|
keys.node_copyfrom_path = pool_intern("Node-copyfrom-path");
|
|
keys.node_copyfrom_rev = pool_intern("Node-copyfrom-rev");
|
|
keys.text_content_length = pool_intern("Text-content-length");
|
|
keys.prop_content_length = pool_intern("Prop-content-length");
|
|
keys.content_length = pool_intern("Content-length");
|
|
keys.svn_fs_dump_format_version = pool_intern("SVN-fs-dump-format-version");
|
|
/* version 3 format (Subversion 1.1.0) */
|
|
keys.text_delta = pool_intern("Text-delta");
|
|
keys.prop_delta = pool_intern("Prop-delta");
|
|
}
|
|
|
|
static void handle_property(uint32_t key, const char *val, uint32_t len,
|
|
uint32_t *type_set)
|
|
{
|
|
if (key == keys.svn_log) {
|
|
if (!val)
|
|
die("invalid dump: unsets svn:log");
|
|
/* Value length excludes terminating nul. */
|
|
rev_ctx.log = log_copy(len + 1, val);
|
|
} else if (key == keys.svn_author) {
|
|
rev_ctx.author = pool_intern(val);
|
|
} else if (key == keys.svn_date) {
|
|
if (!val)
|
|
die("invalid dump: unsets svn:date");
|
|
if (parse_date_basic(val, &rev_ctx.timestamp, NULL))
|
|
warning("invalid timestamp: %s", val);
|
|
} else if (key == keys.svn_executable || key == keys.svn_special) {
|
|
if (*type_set) {
|
|
if (!val)
|
|
return;
|
|
die("invalid dump: sets type twice");
|
|
}
|
|
if (!val) {
|
|
node_ctx.type = REPO_MODE_BLB;
|
|
return;
|
|
}
|
|
*type_set = 1;
|
|
node_ctx.type = key == keys.svn_executable ?
|
|
REPO_MODE_EXE :
|
|
REPO_MODE_LNK;
|
|
}
|
|
}
|
|
|
|
static void read_props(void)
|
|
{
|
|
uint32_t key = ~0;
|
|
const char *t;
|
|
/*
|
|
* NEEDSWORK: to support simple mode changes like
|
|
* K 11
|
|
* svn:special
|
|
* V 1
|
|
* *
|
|
* D 14
|
|
* svn:executable
|
|
* we keep track of whether a mode has been set and reset to
|
|
* plain file only if not. We should be keeping track of the
|
|
* symlink and executable bits separately instead.
|
|
*/
|
|
uint32_t type_set = 0;
|
|
while ((t = buffer_read_line(&input)) && strcmp(t, "PROPS-END")) {
|
|
uint32_t len;
|
|
const char *val;
|
|
const char type = t[0];
|
|
|
|
if (!type || t[1] != ' ')
|
|
die("invalid property line: %s\n", t);
|
|
len = atoi(&t[2]);
|
|
val = buffer_read_string(&input, len);
|
|
buffer_skip_bytes(&input, 1); /* Discard trailing newline. */
|
|
|
|
switch (type) {
|
|
case 'K':
|
|
key = pool_intern(val);
|
|
continue;
|
|
case 'D':
|
|
key = pool_intern(val);
|
|
val = NULL;
|
|
len = 0;
|
|
/* fall through */
|
|
case 'V':
|
|
handle_property(key, val, len, &type_set);
|
|
key = ~0;
|
|
continue;
|
|
default:
|
|
die("invalid property line: %s\n", t);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void handle_node(void)
|
|
{
|
|
uint32_t mark = 0;
|
|
const uint32_t type = node_ctx.type;
|
|
const int have_props = node_ctx.propLength != LENGTH_UNKNOWN;
|
|
const int have_text = node_ctx.textLength != LENGTH_UNKNOWN;
|
|
|
|
if (node_ctx.text_delta)
|
|
die("text deltas not supported");
|
|
if (have_text)
|
|
mark = next_blob_mark();
|
|
if (node_ctx.action == NODEACT_DELETE) {
|
|
if (have_text || have_props || node_ctx.srcRev)
|
|
die("invalid dump: deletion node has "
|
|
"copyfrom info, text, or properties");
|
|
return repo_delete(node_ctx.dst);
|
|
}
|
|
if (node_ctx.action == NODEACT_REPLACE) {
|
|
repo_delete(node_ctx.dst);
|
|
node_ctx.action = NODEACT_ADD;
|
|
}
|
|
if (node_ctx.srcRev) {
|
|
repo_copy(node_ctx.srcRev, node_ctx.src, node_ctx.dst);
|
|
if (node_ctx.action == NODEACT_ADD)
|
|
node_ctx.action = NODEACT_CHANGE;
|
|
}
|
|
if (have_text && type == REPO_MODE_DIR)
|
|
die("invalid dump: directories cannot have text attached");
|
|
|
|
/*
|
|
* Decide on the new content (mark) and mode (node_ctx.type).
|
|
*/
|
|
if (node_ctx.action == NODEACT_CHANGE && !~*node_ctx.dst) {
|
|
if (type != REPO_MODE_DIR)
|
|
die("invalid dump: root of tree is not a regular file");
|
|
} else if (node_ctx.action == NODEACT_CHANGE) {
|
|
uint32_t mode;
|
|
if (!have_text)
|
|
mark = repo_read_path(node_ctx.dst);
|
|
mode = repo_read_mode(node_ctx.dst);
|
|
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)
|
|
die("invalid dump: cannot modify a file into a directory");
|
|
node_ctx.type = mode;
|
|
} else if (node_ctx.action == NODEACT_ADD) {
|
|
if (!have_text && type != REPO_MODE_DIR)
|
|
die("invalid dump: adds node without text");
|
|
} else {
|
|
die("invalid dump: Node-path block lacks Node-action");
|
|
}
|
|
|
|
/*
|
|
* Adjust mode to reflect properties.
|
|
*/
|
|
if (have_props) {
|
|
if (!node_ctx.prop_delta)
|
|
node_ctx.type = type;
|
|
if (node_ctx.propLength)
|
|
read_props();
|
|
}
|
|
|
|
/*
|
|
* Save the result.
|
|
*/
|
|
repo_add(node_ctx.dst, node_ctx.type, mark);
|
|
if (have_text)
|
|
fast_export_blob(node_ctx.type, mark,
|
|
node_ctx.textLength, &input);
|
|
}
|
|
|
|
static void handle_revision(void)
|
|
{
|
|
if (rev_ctx.revision)
|
|
repo_commit(rev_ctx.revision, rev_ctx.author, rev_ctx.log,
|
|
dump_ctx.uuid, dump_ctx.url, rev_ctx.timestamp);
|
|
}
|
|
|
|
void svndump_read(const char *url)
|
|
{
|
|
char *val;
|
|
char *t;
|
|
uint32_t active_ctx = DUMP_CTX;
|
|
uint32_t len;
|
|
uint32_t key;
|
|
|
|
reset_dump_ctx(pool_intern(url));
|
|
while ((t = buffer_read_line(&input))) {
|
|
val = strstr(t, ": ");
|
|
if (!val)
|
|
continue;
|
|
*val++ = '\0';
|
|
*val++ = '\0';
|
|
key = pool_intern(t);
|
|
|
|
if (key == keys.svn_fs_dump_format_version) {
|
|
dump_ctx.version = atoi(val);
|
|
if (dump_ctx.version > 3)
|
|
die("expected svn dump format version <= 3, found %"PRIu32,
|
|
dump_ctx.version);
|
|
} else if (key == keys.uuid) {
|
|
dump_ctx.uuid = pool_intern(val);
|
|
} else if (key == keys.revision_number) {
|
|
if (active_ctx == NODE_CTX)
|
|
handle_node();
|
|
if (active_ctx != DUMP_CTX)
|
|
handle_revision();
|
|
active_ctx = REV_CTX;
|
|
reset_rev_ctx(atoi(val));
|
|
} else if (key == keys.node_path) {
|
|
if (active_ctx == NODE_CTX)
|
|
handle_node();
|
|
active_ctx = NODE_CTX;
|
|
reset_node_ctx(val);
|
|
} else if (key == keys.node_kind) {
|
|
if (!strcmp(val, "dir"))
|
|
node_ctx.type = REPO_MODE_DIR;
|
|
else if (!strcmp(val, "file"))
|
|
node_ctx.type = REPO_MODE_BLB;
|
|
else
|
|
fprintf(stderr, "Unknown node-kind: %s\n", val);
|
|
} else if (key == keys.node_action) {
|
|
if (!strcmp(val, "delete")) {
|
|
node_ctx.action = NODEACT_DELETE;
|
|
} else if (!strcmp(val, "add")) {
|
|
node_ctx.action = NODEACT_ADD;
|
|
} else if (!strcmp(val, "change")) {
|
|
node_ctx.action = NODEACT_CHANGE;
|
|
} else if (!strcmp(val, "replace")) {
|
|
node_ctx.action = NODEACT_REPLACE;
|
|
} else {
|
|
fprintf(stderr, "Unknown node-action: %s\n", val);
|
|
node_ctx.action = NODEACT_UNKNOWN;
|
|
}
|
|
} else if (key == keys.node_copyfrom_path) {
|
|
pool_tok_seq(REPO_MAX_PATH_DEPTH, node_ctx.src, "/", val);
|
|
} else if (key == keys.node_copyfrom_rev) {
|
|
node_ctx.srcRev = atoi(val);
|
|
} else if (key == keys.text_content_length) {
|
|
node_ctx.textLength = atoi(val);
|
|
} else if (key == keys.prop_content_length) {
|
|
node_ctx.propLength = atoi(val);
|
|
} else if (key == keys.text_delta) {
|
|
node_ctx.text_delta = !strcmp(val, "true");
|
|
} else if (key == keys.prop_delta) {
|
|
node_ctx.prop_delta = !strcmp(val, "true");
|
|
} else if (key == keys.content_length) {
|
|
len = atoi(val);
|
|
buffer_read_line(&input);
|
|
if (active_ctx == REV_CTX) {
|
|
read_props();
|
|
} else if (active_ctx == NODE_CTX) {
|
|
handle_node();
|
|
active_ctx = REV_CTX;
|
|
} else {
|
|
fprintf(stderr, "Unexpected content length header: %"PRIu32"\n", len);
|
|
buffer_skip_bytes(&input, len);
|
|
}
|
|
}
|
|
}
|
|
if (active_ctx == NODE_CTX)
|
|
handle_node();
|
|
if (active_ctx != DUMP_CTX)
|
|
handle_revision();
|
|
}
|
|
|
|
int svndump_init(const char *filename)
|
|
{
|
|
if (buffer_init(&input, filename))
|
|
return error("cannot open %s: %s", filename, strerror(errno));
|
|
repo_init();
|
|
fast_export_init(REPORT_FILENO);
|
|
reset_dump_ctx(~0);
|
|
reset_rev_ctx(0);
|
|
reset_node_ctx(NULL);
|
|
init_keys();
|
|
return 0;
|
|
}
|
|
|
|
void svndump_deinit(void)
|
|
{
|
|
log_reset();
|
|
fast_export_deinit();
|
|
repo_reset();
|
|
reset_dump_ctx(~0);
|
|
reset_rev_ctx(0);
|
|
reset_node_ctx(NULL);
|
|
if (buffer_deinit(&input))
|
|
fprintf(stderr, "Input error\n");
|
|
if (ferror(stdout))
|
|
fprintf(stderr, "Output error\n");
|
|
}
|
|
|
|
void svndump_reset(void)
|
|
{
|
|
log_reset();
|
|
fast_export_reset();
|
|
buffer_reset(&input);
|
|
repo_reset();
|
|
reset_dump_ctx(~0);
|
|
reset_rev_ctx(0);
|
|
reset_node_ctx(NULL);
|
|
}
|