mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/svn-fe' (early part)

Browse Source 
* 'jn/svn-fe' (early part):
  vcs-svn: Error out for v3 dumps

Conflicts:
	t/t9010-svn-fe.sh
This commit is contained in:
Junio C Hamano
2011-01-05 13:34:43 -08:00
parent d3cae60efc b3e5bce1aa
commit bf9b46c16d
2 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
t/t9010-svn-fe.sh
View File

@ -20,29 +20,44 @@ svn_cmd () {
svn "$subcommand" --config-dir "$svnconf" "$@" svn "$subcommand" --config-dir "$svnconf" "$@"
} }
test_dump () { reinit_git () {
label=$1 rm -fr .git &&
dump=$2 git init
test_expect_success "$dump" ' }
svnadmin create "$label-svn" &&
svnadmin load "$label-svn" < "$TEST_DIRECTORY/$dump" && >empty
svn_cmd export "file://$PWD/$label-svn" "$label-svnco" &&
git init "$label-git" && test_expect_success 'empty dump' '
test-svn-fe "$TEST_DIRECTORY/$dump" >"$label.fe" && reinit_git &&
echo "SVN-fs-dump-format-version: 2" >input &&
test-svn-fe input >stream &&
git fast-import <stream
'
test_expect_success 'v3 dumps not supported' '
reinit_git &&
echo "SVN-fs-dump-format-version: 3" >input &&
test_must_fail test-svn-fe input >stream &&
test_cmp empty stream
'
test_expect_success 't9135/svn.dump' '
svnadmin create simple-svn &&
svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
git init simple-git &&
test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
( (
cd "$label-git" && cd simple-git &&
git fast-import < ../"$label.fe" git fast-import <../simple.fe
) && ) &&
( (
cd "$label-svnco" && cd simple-svnco &&
git init && git init &&
git add . && git add . &&
git fetch "../$label-git" master && git fetch ../simple-git master &&
git diff --exit-code FETCH_HEAD git diff --exit-code FETCH_HEAD
) )
' '
}
test_dump simple t9135/svn.dump
test_done test_done

13
vcs-svn/svndump.c
View File

@ -51,14 +51,14 @@ static struct {
} rev_ctx; } rev_ctx;
static struct { static struct {
uint32_t uuid, url; uint32_t version, uuid, url;
} dump_ctx; } dump_ctx;
static struct { static struct {
uint32_t svn_log, svn_author, svn_date, svn_executable, svn_special, uuid, uint32_t svn_log, svn_author, svn_date, svn_executable, svn_special, uuid,
revision_number, node_path, node_kind, node_action, revision_number, node_path, node_kind, node_action,
node_copyfrom_path, node_copyfrom_rev, text_content_length, node_copyfrom_path, node_copyfrom_rev, text_content_length,
prop_content_length, content_length; prop_content_length, content_length, svn_fs_dump_format_version;
} keys; } keys;
static void reset_node_ctx(char *fname) static void reset_node_ctx(char *fname)
@ -85,6 +85,7 @@ static void reset_rev_ctx(uint32_t revision)
static void reset_dump_ctx(uint32_t url) static void reset_dump_ctx(uint32_t url)
{ {
dump_ctx.url = url; dump_ctx.url = url;
dump_ctx.version = 1;
dump_ctx.uuid = ~0; dump_ctx.uuid = ~0;
} }
@ -105,6 +106,7 @@ static void init_keys(void)
keys.text_content_length = pool_intern("Text-content-length"); keys.text_content_length = pool_intern("Text-content-length");
keys.prop_content_length = pool_intern("Prop-content-length"); keys.prop_content_length = pool_intern("Prop-content-length");
keys.content_length = pool_intern("Content-length"); keys.content_length = pool_intern("Content-length");
keys.svn_fs_dump_format_version = pool_intern("SVN-fs-dump-format-version");
} }
static void read_props(void) static void read_props(void)
@ -206,7 +208,12 @@ void svndump_read(const char *url)
*val++ = '\0'; *val++ = '\0';
key = pool_intern(t); key = pool_intern(t);
if (key == keys.uuid) { if (key == keys.svn_fs_dump_format_version) {
dump_ctx.version = atoi(val);
if (dump_ctx.version > 2)
die("expected svn dump format version <= 2, found %d",
dump_ctx.version);
} else if (key == keys.uuid) {
dump_ctx.uuid = pool_intern(val); dump_ctx.uuid = pool_intern(val);
} else if (key == keys.revision_number) { } else if (key == keys.revision_number) {
if (active_ctx == NODE_CTX) if (active_ctx == NODE_CTX)