mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
8cc299daf2
gcc -m32 correctly warns: vcs-svn/fast_export.c: In function 'fast_export_commit': vcs-svn/fast_export.c:54:2: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'unsigned int' [-Wformat] Fix it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
88 lines
2.2 KiB
C
88 lines
2.2 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;
|
|
|
|
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, const char *author,
|
|
const struct strbuf *log,
|
|
const char *uuid, const char *url,
|
|
unsigned long timestamp)
|
|
{
|
|
static const struct strbuf empty = STRBUF_INIT;
|
|
if (!log)
|
|
log = ∅
|
|
if (*uuid && *url) {
|
|
snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
|
|
"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
|
|
url, revision, uuid);
|
|
} else {
|
|
*gitsvnline = '\0';
|
|
}
|
|
printf("commit refs/heads/master\n");
|
|
printf("committer %s <%s@%s> %ld +0000\n",
|
|
*author ? author : "nobody",
|
|
*author ? author : "nobody",
|
|
*uuid ? uuid : "local", timestamp);
|
|
printf("data %"PRIuMAX"\n",
|
|
(uintmax_t) (log->len + strlen(gitsvnline)));
|
|
fwrite(log->buf, log->len, 1, stdout);
|
|
printf("%s\n", 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 void die_short_read(struct line_buffer *input)
|
|
{
|
|
if (buffer_ferror(input))
|
|
die_errno("error reading dump file");
|
|
die("invalid dump: unexpected end of file");
|
|
}
|
|
|
|
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 " */
|
|
len -= 5;
|
|
if (buffer_skip_bytes(input, 5) != 5)
|
|
die_short_read(input);
|
|
}
|
|
printf("blob\nmark :%"PRIu32"\ndata %"PRIu32"\n", mark, len);
|
|
if (buffer_copy_bytes(input, len) != len)
|
|
die_short_read(input);
|
|
fputc('\n', stdout);
|
|
}
|