@matheusbsbs / matheus-bagliano / commits / 42d328701d
Fork 0

git-svn: make the $GIT_DIR/svn/*/revs directory obsolete

This is a very intrusive change, so I've beefed up the tests significantly. Added 'full-test' a target to the Makefile, to test different possible configurations. This is intended for maintainers only. Users should only be concerned with 'test' succeeding. We now have a very simple custom database format for handling mapping of svn revisions => git commits. Of course, we're not really using it yet, either. Also disabled automatic branch-finding on new trees for now. It's too easily broken. revisions_eq() function should be helpful for branch detection. Also removed an extra assertion in fetch_cmd() that wasn't correctly done. This bug was found by full-test. Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Jun 13, 2006 at 04:02 UTC 42d328701dbdbc02c3361673629a44df478e69d7
4 files changed +224 -132
contrib/git-svn/Makefile
+10 -2
@@ -29,8 +29,16 @@ git-svn.html : git-svn.txt
29 asciidoc -b xhtml11 -d manpage \
30 -f ../../Documentation/asciidoc.conf $<
31 test: git-svn
32 - cd t && $(SHELL) ./t0000-contrib-git-svn.sh
33 - cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh
32 + cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS)
33 + cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS)
34 +
35 +full-test:
36 + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1
37 + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1
38 + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
39 + LC_ALL=en_US.UTF-8
40 + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
41 + LC_ALL=en_US.UTF-8
42
43 clean:
44 rm -f git-svn *.xml *.html *.1
contrib/git-svn/git-svn.perl
+158 -87
@@ -6,9 +6,9 @@ use strict;
6 use vars qw/ $AUTHOR $VERSION
7 $SVN_URL $SVN_INFO $SVN_WC $SVN_UUID
8 $GIT_SVN_INDEX $GIT_SVN
9 - $GIT_DIR $REV_DIR $GIT_SVN_DIR/;
9 + $GIT_DIR $GIT_SVN_DIR $REVDB/;
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 -$VERSION = '1.1.0-pre';
11 +$VERSION = '1.1.1-broken';
12
13 use Cwd qw/abs_path/;
14 $GIT_DIR = abs_path($ENV{GIT_DIR} || '.git');
@@ -31,10 +31,13 @@ use File::Path qw/mkpath/;
31 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev pass_through/;
32 use File::Spec qw//;
33 use POSIX qw/strftime/;
34 +use Memoize;
35 +memoize('revisions_eq');
36
37 my ($SVN_PATH, $SVN, $SVN_LOG, $_use_lib);
38 $_use_lib = 1 unless $ENV{GIT_SVN_NO_LIB};
39 libsvn_load();
40 +my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
41 my $sha1 = qr/[a-f\d]{40}/;
42 my $sha1_short = qr/[a-f\d]{4,40}/;
43 my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
@@ -43,7 +46,7 @@ my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
46 $_template, $_shared, $_no_default_regex, $_no_graft_copy,
47 $_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit,
48 $_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m);
46 -my (@_branch_from, %tree_map, %users, %rusers);
49 +my (@_branch_from, %tree_map, %users, %rusers, %equiv);
50 my ($_svn_co_url_revs, $_svn_pg_peg_revs);
51 my @repo_path_split_cache;
52
@@ -201,7 +204,6 @@ sub rebuild {
204 next if (defined $SVN_UUID && ($uuid ne $SVN_UUID));
205 next if (defined $SVN_URL && defined $url && ($url ne $SVN_URL));
206
204 - print "r$rev = $c\n";
207 unless (defined $latest) {
208 if (!$SVN_URL && !$url) {
209 croak "SVN repository location required: $url\n";
@@ -211,8 +213,8 @@ sub rebuild {
213 setup_git_svn();
214 $latest = $rev;
215 }
214 - assert_revision_eq_or_unknown($rev, $c);
215 - sys('git-update-ref',"svn/$GIT_SVN/revs/$rev",$c);
216 + revdb_set($REVDB, $rev, $c);
217 + print "r$rev = $c\n";
218 $newest_rev = $rev if ($rev > $newest_rev);
219 }
220 close $rev_list or croak $?;
@@ -280,7 +282,11 @@ sub fetch_cmd {
282 my $svn_log = svn_log_raw(@log_args);
283
284 my $base = next_log_entry($svn_log) or croak "No base revision!\n";
283 - my $last_commit = undef;
285 + # don't need last_revision from grab_base_rev() because
286 + # user could've specified a different revision to skip (they
287 + # didn't want to import certain revisions into git for whatever
288 + # reason, so trust $base->{revision} instead.
289 + my (undef, $last_commit) = svn_grab_base_rev();
290 unless (-d $SVN_WC) {
291 svn_cmd_checkout($SVN_URL,$base->{revision},$SVN_WC);
292 chdir $SVN_WC or croak $!;
@@ -290,7 +296,6 @@ sub fetch_cmd {
296 } else {
297 chdir $SVN_WC or croak $!;
298 read_uuid();
293 - eval { $last_commit = file_to_s("$REV_DIR/$base->{revision}") };
299 # looks like a user manually cp'd and svn switch'ed
300 unless ($last_commit) {
301 sys(qw/svn revert -R ./);
@@ -303,7 +308,6 @@ sub fetch_cmd {
308 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
309 my $last = $base;
310 while (my $log_msg = next_log_entry($svn_log)) {
306 - assert_tree($last_commit);
311 if ($last->{revision} >= $log_msg->{revision}) {
312 croak "Out of order: last >= current: ",
313 "$last->{revision} >= $log_msg->{revision}\n";
@@ -444,14 +448,14 @@ sub commit_cmd {
448 }
449 $info = svn_info('.');
450 read_uuid($info);
447 - my $svn_current_rev = $info->{'Last Changed Rev'};
451 + my $last = $fetched;
452 foreach my $c (@revs) {
449 - my $mods = svn_checkout_tree($svn_current_rev, $c);
453 + my $mods = svn_checkout_tree($last, $c);
454 if (scalar @$mods == 0) {
455 print "Skipping, no changes detected\n";
456 next;
457 }
454 - $svn_current_rev = svn_commit_tree($svn_current_rev, $c);
458 + $last = svn_commit_tree($last, $c);
459 }
460 }
461
@@ -500,7 +504,7 @@ sub commit_lib {
504 },
505 @lock)
506 );
503 - my $mods = libsvn_checkout_tree($r_last, $c, $ed);
507 + my $mods = libsvn_checkout_tree($cmt_last, $c, $ed);
508 if (@$mods == 0) {
509 print "No changes\nr$r_last = $cmt_last\n";
510 $ed->abort_edit;
@@ -814,7 +818,7 @@ sub graft_file_copy_cmd {
818 my ($grafts, $l_map, $u) = @_;
819 my $paths = $l_map->{$u};
820 my $pfx = common_prefix([keys %$paths]);
817 -
821 + $SVN_URL ||= $u.$pfx;
822 my $pid = open my $fh, '-|';
823 defined $pid or croak $!;
824 unless ($pid) {
@@ -851,6 +855,8 @@ sub graft_file_copy_lib {
855 my ($base, $head) = libsvn_parse_revision();
856 my $inc = 1000;
857 my ($min, $max) = ($base, $head < $base+$inc ? $head : $base+$inc);
858 + my $eh = $SVN::Error::handler;
859 + $SVN::Error::handler = \&libsvn_skip_unknown_revs;
860 while (1) {
861 my $pool = SVN::Pool->new;
862 $SVN_LOG->get_log( "/$path", $min, $max, 0, 1, 1,
@@ -864,6 +870,7 @@ sub graft_file_copy_lib {
870 $max += $inc;
871 $max = $head if ($max > $head);
872 }
873 + $SVN::Error::handler = $eh;
874 }
875
876 sub process_merge_msg_matches {
@@ -994,7 +1001,8 @@ sub setup_git_svn {
1001 }
1002 mkpath([$GIT_SVN_DIR]);
1003 mkpath(["$GIT_SVN_DIR/info"]);
997 - mkpath([$REV_DIR]);
1004 + open my $fh, '>>',$REVDB or croak $!;
1005 + close $fh;
1006 s_to_file($SVN_URL,"$GIT_SVN_DIR/info/url");
1007
1008 open my $fd, '>>', "$GIT_SVN_DIR/info/exclude" or croak $!;
@@ -1201,8 +1209,7 @@ sub precommit_check {
1209
1210
1211 sub get_diff {
1204 - my ($svn_rev, $treeish) = @_;
1205 - my $from = file_to_s("$REV_DIR/$svn_rev");
1212 + my ($from, $treeish) = @_;
1213 assert_tree($from);
1214 print "diff-tree $from $treeish\n";
1215 my $pid = open my $diff_fh, '-|';
@@ -1222,8 +1229,8 @@ sub get_diff {
1229 }
1230
1231 sub svn_checkout_tree {
1225 - my ($svn_rev, $treeish) = @_;
1226 - my $mods = get_diff($svn_rev, $treeish);
1232 + my ($from, $treeish) = @_;
1233 + my $mods = get_diff($from->{commit}, $treeish);
1234 return $mods unless (scalar @$mods);
1235 my ($rm, $add) = precommit_check($mods);
1236
@@ -1268,8 +1275,8 @@ sub svn_checkout_tree {
1275 }
1276
1277 sub libsvn_checkout_tree {
1271 - my ($svn_rev, $treeish, $ed) = @_;
1272 - my $mods = get_diff($svn_rev, $treeish);
1278 + my ($from, $treeish, $ed) = @_;
1279 + my $mods = get_diff($from, $treeish);
1280 return $mods unless (scalar @$mods);
1281 my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
1282 foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
@@ -1365,7 +1372,7 @@ sub get_commit_message {
1372 }
1373
1374 sub svn_commit_tree {
1368 - my ($svn_rev, $commit) = @_;
1375 + my ($last, $commit) = @_;
1376 my $commit_msg = "$GIT_SVN_DIR/.svn-commit.tmp.$$";
1377 my $log_msg = get_commit_message($commit, $commit_msg);
1378 my ($oneline) = ($log_msg->{msg} =~ /([^\n\r]+)/);
@@ -1392,7 +1399,7 @@ sub svn_commit_tree {
1399
1400 my @svn_up = qw(svn up);
1401 push @svn_up, '--ignore-externals' unless $_no_ignore_ext;
1395 - if ($committed == ($svn_rev + 1)) {
1402 + if ($_optimize_commits && ($committed == ($last->{revision} + 1))) {
1403 push @svn_up, "-r$committed";
1404 sys(@svn_up);
1405 my $info = svn_info('.');
@@ -1408,14 +1415,14 @@ sub svn_commit_tree {
1415 $log_msg->{author} = $info->{'Last Changed Author'};
1416 $log_msg->{revision} = $committed;
1417 $log_msg->{msg} .= "\n";
1411 - my $parent = file_to_s("$REV_DIR/$svn_rev");
1412 - git_commit($log_msg, $parent, $commit);
1413 - return $committed;
1418 + $log_msg->{parents} = [ $last->{commit} ];
1419 + $log_msg->{commit} = git_commit($log_msg, $commit);
1420 + return $log_msg;
1421 }
1422 # resync immediately
1416 - push @svn_up, "-r$svn_rev";
1423 + push @svn_up, "-r$last->{revision}";
1424 sys(@svn_up);
1418 - return fetch("$committed=$commit")->{revision};
1425 + return fetch("$committed=$commit");
1426 }
1427
1428 sub rev_list_raw {
@@ -1671,10 +1678,9 @@ sub file_to_s {
1678 }
1679
1680 sub assert_revision_unknown {
1674 - my $revno = shift;
1675 - if (-f "$REV_DIR/$revno") {
1676 - croak "$REV_DIR/$revno already exists! ",
1677 - "Why are we refetching it?";
1681 + my $r = shift;
1682 + if (my $c = revdb_get($REVDB, $r)) {
1683 + croak "$r = $c already exists! Why are we refetching it?";
1684 }
1685 }
1686
@@ -1690,18 +1696,6 @@ sub trees_eq {
1696 return 1;
1697 }
1698
1693 -sub assert_revision_eq_or_unknown {
1694 - my ($revno, $commit) = @_;
1695 - if (-f "$REV_DIR/$revno") {
1696 - my $current = file_to_s("$REV_DIR/$revno");
1697 - if (($commit ne $current) && !trees_eq($commit, $current)) {
1698 - croak "$REV_DIR/$revno already exists!\n",
1699 - "current: $current\nexpected: $commit\n";
1700 - }
1701 - return;
1702 - }
1703 -}
1704 -
1699 sub git_commit {
1700 my ($log_msg, @parents) = @_;
1701 assert_revision_unknown($log_msg->{revision});
@@ -1763,19 +1757,12 @@ sub git_commit {
1757 }
1758 my @update_ref = ('git-update-ref',"refs/remotes/$GIT_SVN",$commit);
1759 if (my $primary_parent = shift @exec_parents) {
1766 - $pid = fork;
1767 - defined $pid or croak $!;
1768 - if (!$pid) {
1769 - close STDERR;
1770 - close STDOUT;
1771 - exec 'git-rev-parse','--verify',
1772 - "refs/remotes/$GIT_SVN^0" or croak $!;
1773 - }
1774 - waitpid $pid, 0;
1760 + quiet_run(qw/git-rev-parse --verify/,"refs/remotes/$GIT_SVN^0");
1761 push @update_ref, $primary_parent unless $?;
1762 }
1763 sys(@update_ref);
1778 - sys('git-update-ref',"svn/$GIT_SVN/revs/$log_msg->{revision}",$commit);
1764 + revdb_set($REVDB, $log_msg->{revision}, $commit);
1765 +
1766 # this output is read via pipe, do not change:
1767 print "r$log_msg->{revision} = $commit\n";
1768 if ($_repack && (--$_repack_nr == 0)) {
@@ -1990,7 +1977,29 @@ sub git_svn_each {
1977 }
1978 }
1979
1980 +sub migrate_revdb {
1981 + git_svn_each(sub {
1982 + my $id = shift;
1983 + defined(my $pid = fork) or croak $!;
1984 + if (!$pid) {
1985 + $GIT_SVN = $ENV{GIT_SVN_ID} = $id;
1986 + init_vars();
1987 + exit 0 if -r $REVDB;
1988 + print "Upgrading svn => git mapping...\n";
1989 + open my $fh, '>>',$REVDB or croak $!;
1990 + close $fh;
1991 + rebuild();
1992 + print "Done upgrading. You may now delete the ",
1993 + "deprecated $GIT_SVN_DIR/revs directory\n";
1994 + exit 0;
1995 + }
1996 + waitpid $pid, 0;
1997 + croak $? if $?;
1998 + });
1999 +}
2000 +
2001 sub migration_check {
2002 + migrate_revdb() unless (-e $REVDB);
2003 return if (-d "$GIT_DIR/svn" || !-d $GIT_DIR);
2004 print "Upgrading repository...\n";
2005 unless (-d "$GIT_DIR/svn") {
@@ -2013,15 +2022,19 @@ sub migration_check {
2022 s_to_file($url, "$GIT_DIR/svn/$x/info/repo_url");
2023 s_to_file($path, "$GIT_DIR/svn/$x/info/repo_path");
2024 }
2025 + migrate_revdb() if (-d $GIT_SVN_DIR && !-w $REVDB);
2026 print "Done upgrading.\n";
2027 }
2028
2029 sub find_rev_before {
2020 - my ($r, $git_svn_id) = @_;
2021 - my @revs = map { basename $_ } <$GIT_DIR/svn/$git_svn_id/revs/*>;
2022 - foreach my $r0 (sort { $b <=> $a } @revs) {
2023 - next if $r0 >= $r;
2024 - return ($r0, file_to_s("$GIT_DIR/svn/$git_svn_id/revs/$r0"));
2030 + my ($r, $id, $eq_ok) = @_;
2031 + my $f = "$GIT_DIR/svn/$id/.rev_db";
2032 + # --$r unless $eq_ok;
2033 + while ($r > 0) {
2034 + if (my $c = revdb_get($f, $r)) {
2035 + return ($r, $c);
2036 + }
2037 + --$r;
2038 }
2039 return (undef, undef);
2040 }
@@ -2029,9 +2042,9 @@ sub find_rev_before {
2042 sub init_vars {
2043 $GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
2044 $GIT_SVN_DIR = "$GIT_DIR/svn/$GIT_SVN";
2045 + $REVDB = "$GIT_SVN_DIR/.rev_db";
2046 $GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
2047 $SVN_URL = undef;
2034 - $REV_DIR = "$GIT_SVN_DIR/revs";
2048 $SVN_WC = "$GIT_SVN_DIR/tree";
2049 }
2050
@@ -2491,7 +2504,27 @@ sub libsvn_traverse_ignore {
2504 $pool->clear;
2505 }
2506
2494 -sub libsvn_new_tree {
2507 +sub revisions_eq {
2508 + my ($path, $r0, $r1) = @_;
2509 + return 1 if $r0 == $r1;
2510 + my $nr = 0;
2511 + if ($_use_lib) {
2512 + # should be OK to use Pool here (r1 - r0) should be small
2513 + my $pool = SVN::Pool->new;
2514 + $SVN->get_log("/$path", $r0, $r1, 0, 1, 1, sub {$nr++},$pool);
2515 + $pool->clear;
2516 + } else {
2517 + my ($url, undef) = repo_path_split($SVN_URL);
2518 + my $svn_log = svn_log_raw("$url/$path","-r$r0:$r1");
2519 + while (next_log_entry($svn_log)) { $nr++ }
2520 + close $svn_log->{fh};
2521 + }
2522 + return 0 if ($nr > 1);
2523 + return 1;
2524 +}
2525 +
2526 +sub libsvn_find_parent_branch {
2527 + return undef; # XXX this function is disabled atm (not tested enough)
2528 my ($paths, $rev, $author, $date, $msg) = @_;
2529 my $svn_path = '/'.$SVN_PATH;
2530
@@ -2502,27 +2535,33 @@ sub libsvn_new_tree {
2535 my $branch_from = $i->copyfrom_path or next;
2536 my $r = $i->copyfrom_rev;
2537 print STDERR "Found possible branch point: ",
2505 - "$branch_from => $svn_path, $r\n";
2538 + "$branch_from => $svn_path, $r\n";
2539 $branch_from =~ s#^/##;
2540 my $l_map = read_url_paths();
2541 my $url = $SVN->{url};
2542 defined $l_map->{$url} or next;
2543 my $id = $l_map->{$url}->{$branch_from} or next;
2511 - my $f = "$GIT_DIR/svn/$id/revs/$r";
2512 - while ($r && !-r $f) {
2513 - $r--;
2514 - $f = "$GIT_DIR/svn/$id/revs/$r";
2515 - }
2516 - if (-r $f) {
2517 - my $parent = file_to_s($f);
2544 + my ($r0, $parent) = find_rev_before($r,$id,1);
2545 + if (defined $r0 && defined $parent &&
2546 + revisions_eq($branch_from, $r0, $r)) {
2547 unlink $GIT_SVN_INDEX;
2548 print STDERR "Found branch parent: $parent\n";
2549 sys(qw/git-read-tree/, $parent);
2550 return libsvn_fetch($parent, $paths, $rev,
2551 $author, $date, $msg);
2552 + } else {
2553 + print STDERR
2554 + "Nope, branch point not imported or unknown\n";
2555 }
2524 - print STDERR "Nope, branch point not imported or unknown\n";
2556 }
2557 + return undef;
2558 +}
2559 +
2560 +sub libsvn_new_tree {
2561 + if (my $log_entry = libsvn_find_parent_branch(@_)) {
2562 + return $log_entry;
2563 + }
2564 + my ($paths, $rev, $author, $date, $msg) = @_;
2565 open my $gui, '| git-update-index -z --index-info' or croak $!;
2566 my $pool = SVN::Pool->new;
2567 libsvn_traverse($gui, '', $SVN_PATH, $rev, $pool);
@@ -2536,10 +2575,8 @@ sub find_graft_path_commit {
2575 foreach my $x (keys %$tree_paths) {
2576 next unless ($p1 =~ /^\Q$x\E/);
2577 my $i = $tree_paths->{$x};
2539 - my $f = "$GIT_DIR/svn/$i/revs/$r1";
2540 -
2541 - return file_to_s($f) if (-r $f);
2542 -
2578 + my ($r0, $parent) = find_rev_before($r1,$i,1);
2579 + return $parent if (defined $r0 && $r0 == $r1);
2580 print STDERR "r$r1 of $i not imported\n";
2581 next;
2582 }
@@ -2551,18 +2588,10 @@ sub find_graft_path_parents {
2588 foreach my $x (keys %$tree_paths) {
2589 next unless ($p0 =~ /^\Q$x\E/);
2590 my $i = $tree_paths->{$x};
2554 - my $f = "$GIT_DIR/svn/$i/revs/$r0";
2555 - while ($r0 && !-r $f) {
2556 - # could be an older revision, too...
2557 - $r0--;
2558 - $f = "$GIT_DIR/svn/$i/revs/$r0";
2559 - }
2560 - unless (-r $f) {
2561 - print STDERR "r$r0 of $i not imported\n";
2562 - next;
2591 + my ($r, $parent) = find_rev_before($r0, $i, 1);
2592 + if (defined $r && defined $parent && revisions_eq($x,$r,$r0)) {
2593 + $grafts->{$c}->{$parent} = 1;
2594 }
2564 - my $parent = file_to_s($f);
2565 - $grafts->{$c}->{$parent} = 1;
2595 }
2596 }
2597
@@ -2600,8 +2629,7 @@ sub restore_index {
2629
2630 sub libsvn_commit_cb {
2631 my ($rev, $date, $committer, $c, $msg, $r_last, $cmt_last) = @_;
2603 - if ($rev == ($r_last + 1)) {
2604 - # optimized (avoid fetch)
2632 + if ($_optimize_commits && $rev == ($r_last + 1)) {
2633 my $log = libsvn_log_entry($rev,$committer,$date,$msg);
2634 $log->{tree} = get_tree_from_treeish($c);
2635 my $cmt = git_commit($log, $cmt_last, $c);
@@ -2652,6 +2680,49 @@ sub libsvn_skip_unknown_revs {
2680 croak "Error from SVN, ($errno): ", $err->expanded_message,"\n";
2681 };
2682
2683 +# Tie::File seems to be prone to offset errors if revisions get sparse,
2684 +# it's not that fast, either. Tie::File is also not in Perl 5.6. So
2685 +# one of my favorite modules is out :< Next up would be one of the DBM
2686 +# modules, but I'm not sure which is most portable... So I'll just
2687 +# go with something that's plain-text, but still capable of
2688 +# being randomly accessed. So here's my ultra-simple fixed-width
2689 +# database. All records are 40 characters + "\n", so it's easy to seek
2690 +# to a revision: (41 * rev) is the byte offset.
2691 +# A record of 40 0s denotes an empty revision.
2692 +# And yes, it's still pretty fast (faster than Tie::File).
2693 +sub revdb_set {
2694 + my ($file, $rev, $commit) = @_;
2695 + length $commit == 40 or croak "arg3 must be a full SHA1 hexsum\n";
2696 + open my $fh, '+<', $file or croak $!;
2697 + my $offset = $rev * 41;
2698 + # assume that append is the common case:
2699 + seek $fh, 0, 2 or croak $!;
2700 + my $pos = tell $fh;
2701 + if ($pos < $offset) {
2702 + print $fh (('0' x 40),"\n") x (($offset - $pos) / 41);
2703 + }
2704 + seek $fh, $offset, 0 or croak $!;
2705 + print $fh $commit,"\n";
2706 + close $fh or croak $!;
2707 +}
2708 +
2709 +sub revdb_get {
2710 + my ($file, $rev) = @_;
2711 + my $ret;
2712 + my $offset = $rev * 41;
2713 + open my $fh, '<', $file or croak $!;
2714 + seek $fh, $offset, 0;
2715 + if (tell $fh == $offset) {
2716 + $ret = readline $fh;
2717 + if (defined $ret) {
2718 + chomp $ret;
2719 + $ret = undef if ($ret =~ /^0{40}$/);
2720 + }
2721 + }
2722 + close $fh or croak $!;
2723 + return $ret;
2724 +}
2725 +
2726 package SVN::Git::Editor;
2727 use vars qw/@ISA/;
2728 use strict;
contrib/git-svn/t/t0000-contrib-git-svn.sh
+13
@@ -193,5 +193,18 @@ test_expect_success "$name" \
193 git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
194 diff -u a b"
195
196 +name='check imported tree checksums expected tree checksums'
197 +cat > expected <<\EOF
198 +tree f735671b89a7eb30cab1d8597de35bd4271ab813
199 +tree 4b9af72bb861eaed053854ec502cf7df72618f0f
200 +tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1
201 +tree 0b094cbff17168f24c302e297f55bfac65eb8bd3
202 +tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
203 +tree 56a30b966619b863674f5978696f4a3594f2fca9
204 +tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
205 +tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
206 +EOF
207 +test_expect_success "$name" "diff -u a expected"
208 +
209 test_done
210
contrib/git-svn/t/t0001-contrib-git-svn-props.sh
+43 -43
@@ -52,49 +52,49 @@ EOF
52 cd ..
53
54 rm -rf import
55 -svn co "$svnrepo" test_wc
55 +test_expect_success 'checkout working copy from svn' "svn co $svnrepo test_wc"
56 +test_expect_success 'setup some commits to svn' \
57 + 'cd test_wc &&
58 + echo Greetings >> kw.c &&
59 + svn commit -m "Not yet an Id" &&
60 + svn up &&
61 + echo Hello world >> kw.c &&
62 + svn commit -m "Modified file, but still not yet an Id" &&
63 + svn up &&
64 + svn propset svn:keywords Id kw.c &&
65 + svn commit -m "Propset Id" &&
66 + svn up &&
67 + cd ..'
68 +
69 +test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
70 +test_expect_success 'fetch revisions from svn' 'git-svn fetch'
71
57 -cd test_wc
58 - echo 'Greetings' >> kw.c
59 - svn commit -m 'Not yet an $Id$'
60 - svn up
61 -
62 - echo 'Hello world' >> kw.c
63 - svn commit -m 'Modified file, but still not yet an $Id$'
64 - svn up
65 -
66 - svn propset svn:keywords Id kw.c
67 - svn commit -m 'Propset $Id$'
68 - svn up
69 -cd ..
70 -
71 -git-svn init "$svnrepo"
72 -git-svn fetch
73 -
74 -git checkout -b mybranch remotes/git-svn
75 -echo 'Hi again' >> kw.c
72 name='test svn:keywords ignoring'
77 -
78 -git commit -a -m "$name"
79 -git-svn commit remotes/git-svn..mybranch
80 -git pull . remotes/git-svn
73 +test_expect_success "$name" \
74 + 'git checkout -b mybranch remotes/git-svn &&
75 + echo Hi again >> kw.c &&
76 + git commit -a -m "test keywoards ignoring" &&
77 + git-svn commit remotes/git-svn..mybranch &&
78 + git pull . remotes/git-svn'
79
80 expect='/* $Id$ */'
81 got="`sed -ne 2p kw.c`"
82 test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'"
83
86 -cd test_wc
87 - svn propset svn:eol-style CR empty
88 - svn propset svn:eol-style CR crlf
89 - svn propset svn:eol-style CR ne_crlf
90 - svn commit -m 'propset CR on crlf files'
91 - svn up
92 -cd ..
84 +test_expect_success "propset CR on crlf files" \
85 + 'cd test_wc &&
86 + svn propset svn:eol-style CR empty &&
87 + svn propset svn:eol-style CR crlf &&
88 + svn propset svn:eol-style CR ne_crlf &&
89 + svn commit -m "propset CR on crlf files" &&
90 + svn up &&
91 + cd ..'
92
94 -git-svn fetch
95 -git pull . remotes/git-svn
93 +test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
94 + "git-svn fetch &&
95 + git pull . remotes/git-svn &&
96 + svn co $svnrepo new_wc"
97
97 -svn co "$svnrepo" new_wc
98 for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
99 do
100 test_expect_success "Comparing $i" "cmp $i new_wc/$i"
@@ -106,16 +106,16 @@ cd test_wc
106 printf '$Id$\rHello\rWorld' > ne_cr
107 a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git-hash-object --stdin`
108 a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git-hash-object --stdin`
109 - svn propset svn:eol-style CRLF cr
110 - svn propset svn:eol-style CRLF ne_cr
111 - svn propset svn:keywords Id cr
112 - svn propset svn:keywords Id ne_cr
113 - svn commit -m 'propset CRLF on cr files'
114 - svn up
109 + test_expect_success 'Set CRLF on cr files' \
110 + 'svn propset svn:eol-style CRLF cr &&
111 + svn propset svn:eol-style CRLF ne_cr &&
112 + svn propset svn:keywords Id cr &&
113 + svn propset svn:keywords Id ne_cr &&
114 + svn commit -m "propset CRLF on cr files" &&
115 + svn up'
116 cd ..
116 -
117 -git-svn fetch
118 -git pull . remotes/git-svn
117 +test_expect_success 'fetch and pull latest from svn' \
118 + 'git-svn fetch && git pull . remotes/git-svn'
119
120 b_cr="`git-hash-object cr`"
121 b_ne_cr="`git-hash-object ne_cr`"