mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
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>
105 lines
2.6 KiB
C
105 lines
2.6 KiB
C
/*
|
|
* Licensed under a two-clause BSD-style license.
|
|
* See LICENSE for details.
|
|
*/
|
|
|
|
#include "git-compat-util.h"
|
|
#include "fast_export.h"
|
|
#include "line_buffer.h"
|
|
#include "repo_tree.h"
|
|
#include "string_pool.h"
|
|
|
|
#define MAX_GITSVN_LINE_LEN 4096
|
|
|
|
static uint32_t first_commit_done;
|
|
static struct line_buffer report_buffer = LINE_BUFFER_INIT;
|
|
|
|
void fast_export_init(int fd)
|
|
{
|
|
if (buffer_fdinit(&report_buffer, fd))
|
|
die_errno("cannot read from file descriptor %d", fd);
|
|
}
|
|
|
|
void fast_export_deinit(void)
|
|
{
|
|
if (buffer_deinit(&report_buffer))
|
|
die_errno("error closing fast-import feedback stream");
|
|
}
|
|
|
|
void fast_export_reset(void)
|
|
{
|
|
buffer_reset(&report_buffer);
|
|
}
|
|
|
|
void fast_export_delete(uint32_t depth, uint32_t *path)
|
|
{
|
|
putchar('D');
|
|
putchar(' ');
|
|
pool_print_seq(depth, path, '/', stdout);
|
|
putchar('\n');
|
|
}
|
|
|
|
void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
|
|
uint32_t mark)
|
|
{
|
|
/* Mode must be 100644, 100755, 120000, or 160000. */
|
|
printf("M %06"PRIo32" :%"PRIu32" ", mode, mark);
|
|
pool_print_seq(depth, path, '/', stdout);
|
|
putchar('\n');
|
|
}
|
|
|
|
static char gitsvnline[MAX_GITSVN_LINE_LEN];
|
|
void fast_export_commit(uint32_t revision, uint32_t author, char *log,
|
|
uint32_t uuid, uint32_t url,
|
|
unsigned long timestamp)
|
|
{
|
|
if (!log)
|
|
log = "";
|
|
if (~uuid && ~url) {
|
|
snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
|
|
"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
|
|
pool_fetch(url), revision, pool_fetch(uuid));
|
|
} else {
|
|
*gitsvnline = '\0';
|
|
}
|
|
printf("commit refs/heads/master\n");
|
|
printf("committer %s <%s@%s> %ld +0000\n",
|
|
~author ? pool_fetch(author) : "nobody",
|
|
~author ? pool_fetch(author) : "nobody",
|
|
~uuid ? pool_fetch(uuid) : "local", timestamp);
|
|
printf("data %"PRIu32"\n%s%s\n",
|
|
(uint32_t) (strlen(log) + strlen(gitsvnline)),
|
|
log, gitsvnline);
|
|
if (!first_commit_done) {
|
|
if (revision > 1)
|
|
printf("from refs/heads/master^0\n");
|
|
first_commit_done = 1;
|
|
}
|
|
repo_diff(revision - 1, revision);
|
|
fputc('\n', stdout);
|
|
|
|
printf("progress Imported commit %"PRIu32".\n\n", revision);
|
|
}
|
|
|
|
static const char *get_response_line(void)
|
|
{
|
|
const char *line = buffer_read_line(&report_buffer);
|
|
if (line)
|
|
return line;
|
|
if (buffer_ferror(&report_buffer))
|
|
die_errno("error reading from fast-import");
|
|
die("unexpected end of fast-import feedback");
|
|
}
|
|
|
|
void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len, struct line_buffer *input)
|
|
{
|
|
if (mode == REPO_MODE_LNK) {
|
|
/* svn symlink blobs start with "link " */
|
|
buffer_skip_bytes(input, 5);
|
|
len -= 5;
|
|
}
|
|
printf("blob\nmark :%"PRIu32"\ndata %"PRIu32"\n", mark, len);
|
|
buffer_copy_bytes(input, len);
|
|
fputc('\n', stdout);
|
|
}
|