git-svn: several graft-branches improvements
The 'graft-branches' command can now analyze tree matches for merge detection after commits are done, when --branch or --branch-all-refs options are used. We ensure that tree joins (--branch and --branch-all-refs options) during commit time only add SVN parents that occurred before the commit we're importing Also fixed branch detection via merge messages, this manner of merge detection (a la git-svnimport) is really all fuzzy, but at least it actually works now :) Add some new tests to go along with these fixes, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Jun 27, 2006 at 19:39 UTC
c1927a8554284d0dc5bb7fcf8e79d3877e4a497c
2 files changed
+230
-13
contrib/git-svn/git-svn.perl
+167
-13
@@ -34,6 +34,8 @@ use POSIX qw/strftime/;
34
use IPC::Open3;
35
use Memoize;
36
memoize('revisions_eq');
37
+memoize('cmt_metadata');
38
+memoize('get_commit_time');
39
40
my ($SVN_PATH, $SVN, $SVN_LOG, $_use_lib);
41
$_use_lib = 1 unless $ENV{GIT_SVN_NO_LIB};
@@ -91,6 +93,8 @@ my %cmd = (
93
'graft-branches' => [ \&graft_branches,
94
'Detect merges/branches from already imported history',
95
{ 'merge-rx|m' => \@_opt_m,
96
+ 'branch|b=s' => \@_branch_from,
97
+ 'branch-all-refs|B' => \$_branch_all_refs,
98
'no-default-regex' => \$_no_default_regex,
99
'no-graft-copy' => \$_no_graft_copy } ],
100
'multi-init' => [ \&multi_init,
@@ -590,13 +594,14 @@ sub graft_branches {
594
my $l_map = read_url_paths();
595
my @re = map { qr/$_/is } @_opt_m if @_opt_m;
596
unless ($_no_default_regex) {
593
- push @re, ( qr/\b(?:merge|merging|merged)\s+(\S.+)/is,
594
- qr/\b(?:from|of)\s+(\S.+)/is );
597
+ push @re, (qr/\b(?:merge|merging|merged)\s+with\s+([\w\.\-]+)/i,
598
+ qr/\b(?:merge|merging|merged)\s+([\w\.\-]+)/i,
599
+ qr/\b(?:from|of)\s+([\w\.\-]+)/i );
600
}
601
foreach my $u (keys %$l_map) {
602
if (@re) {
603
foreach my $p (keys %{$l_map->{$u}}) {
599
- graft_merge_msg($grafts,$l_map,$u,$p);
604
+ graft_merge_msg($grafts,$l_map,$u,$p,@re);
605
}
606
}
607
unless ($_no_graft_copy) {
@@ -607,6 +612,7 @@ sub graft_branches {
612
}
613
}
614
}
615
+ graft_tree_joins($grafts);
616
617
write_grafts($grafts, $comments, $gr_file);
618
unlink "$gr_file~$gr_sha1" if $gr_sha1;
@@ -879,6 +885,77 @@ sub common_prefix {
885
return '';
886
}
887
888
+# grafts set here are 'stronger' in that they're based on actual tree
889
+# matches, and won't be deleted from merge-base checking in write_grafts()
890
+sub graft_tree_joins {
891
+ my $grafts = shift;
892
+ map_tree_joins() if (@_branch_from && !%tree_map);
893
+ return unless %tree_map;
894
+
895
+ git_svn_each(sub {
896
+ my $i = shift;
897
+ defined(my $pid = open my $fh, '-|') or croak $!;
898
+ if (!$pid) {
899
+ exec qw/git-rev-list --pretty=raw/,
900
+ "refs/remotes/$i" or croak $!;
901
+ }
902
+ while (<$fh>) {
903
+ next unless /^commit ($sha1)$/o;
904
+ my $c = $1;
905
+ my ($t) = (<$fh> =~ /^tree ($sha1)$/o);
906
+ next unless $tree_map{$t};
907
+
908
+ my $l;
909
+ do {
910
+ $l = readline $fh;
911
+ } until ($l =~ /^committer (?:.+) (\d+) ([\-\+]?\d+)$/);
912
+
913
+ my ($s, $tz) = ($1, $2);
914
+ if ($tz =~ s/^\+//) {
915
+ $s += tz_to_s_offset($tz);
916
+ } elsif ($tz =~ s/^\-//) {
917
+ $s -= tz_to_s_offset($tz);
918
+ }
919
+
920
+ my ($url_a, $r_a, $uuid_a) = cmt_metadata($c);
921
+
922
+ foreach my $p (@{$tree_map{$t}}) {
923
+ next if $p eq $c;
924
+ my $mb = eval {
925
+ safe_qx('git-merge-base', $c, $p)
926
+ };
927
+ next unless ($@ || $?);
928
+ if (defined $r_a) {
929
+ # see if SVN says it's a relative
930
+ my ($url_b, $r_b, $uuid_b) =
931
+ cmt_metadata($p);
932
+ next if (defined $url_b &&
933
+ defined $url_a &&
934
+ ($url_a eq $url_b) &&
935
+ ($uuid_a eq $uuid_b));
936
+ if ($uuid_a eq $uuid_b) {
937
+ if ($r_b < $r_a) {
938
+ $grafts->{$c}->{$p} = 2;
939
+ next;
940
+ } elsif ($r_b > $r_a) {
941
+ $grafts->{$p}->{$c} = 2;
942
+ next;
943
+ }
944
+ }
945
+ }
946
+ my $ct = get_commit_time($p);
947
+ if ($ct < $s) {
948
+ $grafts->{$c}->{$p} = 2;
949
+ } elsif ($ct > $s) {
950
+ $grafts->{$p}->{$c} = 2;
951
+ }
952
+ # what should we do when $ct == $s ?
953
+ }
954
+ }
955
+ close $fh or croak $?;
956
+ });
957
+}
958
+
959
# this isn't funky-filename safe, but good enough for now...
960
sub graft_file_copy_cmd {
961
my ($grafts, $l_map, $u) = @_;
@@ -957,7 +1034,7 @@ sub process_merge_msg_matches {
1034
my $re = qr/\Q$w\E/i;
1035
foreach (keys %{$l_map->{$u}}) {
1036
if (/$re/) {
960
- push @strong, $_;
1037
+ push @strong, $l_map->{$u}->{$_};
1038
last;
1039
}
1040
}
@@ -966,7 +1043,7 @@ sub process_merge_msg_matches {
1043
$re = qr/\Q$w\E/i;
1044
foreach (keys %{$l_map->{$u}}) {
1045
if (/$re/) {
969
- push @strong, $_;
1046
+ push @strong, $l_map->{$u}->{$_};
1047
last;
1048
}
1049
}
@@ -979,7 +1056,7 @@ sub process_merge_msg_matches {
1056
return unless defined $rev;
1057
}
1058
foreach my $m (@strong) {
982
- my ($r0, $s0) = find_rev_before($rev, $m);
1059
+ my ($r0, $s0) = find_rev_before($rev, $m, 1);
1060
$grafts->{$c->{c}}->{$s0} = 1 if defined $s0;
1061
}
1062
}
@@ -1791,7 +1868,26 @@ sub git_commit {
1868
restore_index($index);
1869
}
1870
if (exists $tree_map{$tree}) {
1794
- push @tmp_parents, @{$tree_map{$tree}};
1871
+ foreach my $p (@{$tree_map{$tree}}) {
1872
+ my $skip;
1873
+ foreach (@tmp_parents) {
1874
+ # see if a common parent is found
1875
+ my $mb = eval {
1876
+ safe_qx('git-merge-base', $_, $p)
1877
+ };
1878
+ next if ($@ || $?);
1879
+ $skip = 1;
1880
+ last;
1881
+ }
1882
+ next if $skip;
1883
+ my ($url_p, $r_p, $uuid_p) = cmt_metadata($p);
1884
+ next if (($SVN_UUID eq $uuid_p) &&
1885
+ ($log_msg->{revision} > $r_p));
1886
+ next if (defined $url_p && defined $SVN_URL &&
1887
+ ($SVN_UUID eq $uuid_p) &&
1888
+ ($url_p eq $SVN_URL));
1889
+ push @tmp_parents, $p;
1890
+ }
1891
}
1892
foreach (@tmp_parents) {
1893
next if $seen_parent{$_};
@@ -2119,6 +2215,7 @@ sub init_vars {
2215
$GIT_SVN_INDEX = "$GIT_SVN_DIR/index";
2216
$SVN_URL = undef;
2217
$SVN_WC = "$GIT_SVN_DIR/tree";
2218
+ %tree_map = ();
2219
}
2220
2221
# convert GetOpt::Long specs for use by git-repo-config
@@ -2186,6 +2283,7 @@ sub write_grafts {
2283
print $fh $_ foreach @{$comments->{$c}};
2284
}
2285
my $p = $grafts->{$c};
2286
+ my %x; # real parents
2287
delete $p->{$c}; # commits are not self-reproducing...
2288
my $pid = open my $ch, '-|';
2289
defined $pid or croak $!;
@@ -2193,13 +2291,41 @@ sub write_grafts {
2291
exec(qw/git-cat-file commit/, $c) or croak $!;
2292
}
2293
while (<$ch>) {
2196
- if (/^parent ([a-f\d]{40})/) {
2197
- $p->{$1} = 1;
2294
+ if (/^parent ($sha1)/) {
2295
+ $x{$1} = $p->{$1} = 1;
2296
} else {
2199
- last unless /^\S/i;
2297
+ last unless /^\S/;
2298
}
2299
}
2300
close $ch; # breaking the pipe
2301
+
2302
+ # if real parents are the only ones in the grafts, drop it
2303
+ next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
2304
+
2305
+ my (@ip, @jp, $mb);
2306
+ my %del = %x;
2307
+ @ip = @jp = keys %$p;
2308
+ foreach my $i (@ip) {
2309
+ next if $del{$i} || $p->{$i} == 2;
2310
+ foreach my $j (@jp) {
2311
+ next if $i eq $j || $del{$j} || $p->{$j} == 2;
2312
+ $mb = eval { safe_qx('git-merge-base',$i,$j) };
2313
+ next unless $mb;
2314
+ chomp $mb;
2315
+ next if $x{$mb};
2316
+ if ($mb eq $j) {
2317
+ delete $p->{$i};
2318
+ $del{$i} = 1;
2319
+ } elsif ($mb eq $i) {
2320
+ delete $p->{$j};
2321
+ $del{$j} = 1;
2322
+ }
2323
+ }
2324
+ }
2325
+
2326
+ # if real parents are the only ones in the grafts, drop it
2327
+ next if join(' ',sort keys %$p) eq join(' ',sort keys %x);
2328
+
2329
print $fh $c, ' ', join(' ', sort keys %$p),"\n";
2330
}
2331
if ($comments->{'END'}) {
@@ -2219,7 +2345,7 @@ sub read_url_paths {
2345
}
2346
2347
sub extract_metadata {
2222
- my $id = shift;
2348
+ my $id = shift or return (undef, undef, undef);
2349
my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+)
2350
\s([a-f\d\-]+)$/x);
2351
if (!$rev || !$uuid || !$url) {
@@ -2230,6 +2356,31 @@ sub extract_metadata {
2356
return ($url, $rev, $uuid);
2357
}
2358
2359
+sub cmt_metadata {
2360
+ return extract_metadata((grep(/^git-svn-id: /,
2361
+ safe_qx(qw/git-cat-file commit/, shift)))[-1]);
2362
+}
2363
+
2364
+sub get_commit_time {
2365
+ my $cmt = shift;
2366
+ defined(my $pid = open my $fh, '-|') or croak $!;
2367
+ if (!$pid) {
2368
+ exec qw/git-rev-list --pretty=raw -n1/, $cmt or croak $!;
2369
+ }
2370
+ while (<$fh>) {
2371
+ /^committer\s(?:.+) (\d+) ([\-\+]?\d+)$/ or next;
2372
+ my ($s, $tz) = ($1, $2);
2373
+ if ($tz =~ s/^\+//) {
2374
+ $s += tz_to_s_offset($tz);
2375
+ } elsif ($tz =~ s/^\-//) {
2376
+ $s -= tz_to_s_offset($tz);
2377
+ }
2378
+ close $fh;
2379
+ return $s;
2380
+ }
2381
+ die "Can't get commit time for commit: $cmt\n";
2382
+}
2383
+
2384
sub tz_to_s_offset {
2385
my ($tz) = @_;
2386
$tz =~ s/(\d\d)$//;
@@ -2498,8 +2649,7 @@ sub svn_grab_base_rev {
2649
chomp(my $c = do { local $/; <$fh> });
2650
close $fh;
2651
if (defined $c && length $c) {
2501
- my ($url, $rev, $uuid) = extract_metadata((grep(/^git-svn-id: /,
2502
- safe_qx(qw/git-cat-file commit/, $c)))[-1]);
2652
+ my ($url, $rev, $uuid) = cmt_metadata($c);
2653
return ($rev, $c);
2654
}
2655
return (undef, undef);
@@ -2655,6 +2805,10 @@ sub find_graft_path_parents {
2805
my $i = $tree_paths->{$x};
2806
my ($r, $parent) = find_rev_before($r0, $i, 1);
2807
if (defined $r && defined $parent && revisions_eq($x,$r,$r0)) {
2808
+ my ($url_b, undef, $uuid_b) = cmt_metadata($c);
2809
+ my ($url_a, undef, $uuid_a) = cmt_metadata($parent);
2810
+ next if ($url_a && $url_b && $url_a eq $url_b &&
2811
+ $uuid_b eq $uuid_a);
2812
$grafts->{$c}->{$parent} = 1;
2813
}
2814
}
contrib/git-svn/t/t0003-graft-branches.sh
new
+63
@@ -0,0 +1,63 @@
1
+test_description='git-svn graft-branches'
2
+. ./lib-git-svn.sh
3
+
4
+test_expect_success 'initialize repo' "
5
+ mkdir import &&
6
+ cd import &&
7
+ mkdir -p trunk branches tags &&
8
+ echo hello > trunk/readme &&
9
+ svn import -m 'import for git-svn' . $svnrepo &&
10
+ cd .. &&
11
+ svn cp -m 'tag a' $svnrepo/trunk $svnrepo/tags/a &&
12
+ svn cp -m 'branch a' $svnrepo/trunk $svnrepo/branches/a &&
13
+ svn co $svnrepo wc &&
14
+ cd wc &&
15
+ echo feedme >> branches/a/readme &&
16
+ svn commit -m hungry &&
17
+ svn up &&
18
+ cd trunk &&
19
+ svn merge -r3:4 $svnrepo/branches/a &&
20
+ svn commit -m 'merge with a' &&
21
+ cd ../.. &&
22
+ svn log -v $svnrepo &&
23
+ git-svn init -i trunk $svnrepo/trunk &&
24
+ git-svn init -i a $svnrepo/branches/a &&
25
+ git-svn init -i tags/a $svnrepo/tags/a &&
26
+ git-svn fetch -i tags/a &&
27
+ git-svn fetch -i a &&
28
+ git-svn fetch -i trunk
29
+ "
30
+
31
+r1=`git-rev-list remotes/trunk | tail -n1`
32
+r2=`git-rev-list remotes/tags/a | tail -n1`
33
+r3=`git-rev-list remotes/a | tail -n1`
34
+r4=`git-rev-list remotes/a | head -n1`
35
+r5=`git-rev-list remotes/trunk | head -n1`
36
+
37
+test_expect_success 'test graft-branches regexes and copies' "
38
+ test -n "$r1" &&
39
+ test -n "$r2" &&
40
+ test -n "$r3" &&
41
+ test -n "$r4" &&
42
+ test -n "$r5" &&
43
+ git-svn graft-branches &&
44
+ grep '^$r2 $r1' $GIT_DIR/info/grafts &&
45
+ grep '^$r3 $r1' $GIT_DIR/info/grafts &&
46
+ grep '^$r5 ' $GIT_DIR/info/grafts | grep '$r4' | grep '$r1'
47
+ "
48
+
49
+test_debug 'gitk --all & sleep 1'
50
+
51
+test_expect_success 'test graft-branches with tree-joins' "
52
+ rm $GIT_DIR/info/grafts &&
53
+ git-svn graft-branches --no-default-regex --no-graft-copy -B &&
54
+ grep '^$r3 ' $GIT_DIR/info/grafts | grep '$r1' | grep '$r2' &&
55
+ grep '^$r2 $r1' $GIT_DIR/info/grafts &&
56
+ grep '^$r5 ' $GIT_DIR/info/grafts | grep '$r1' | grep '$r4'
57
+ "
58
+
59
+# the result of this is kinda funky, we have a strange history and
60
+# this is just a test :)
61
+test_debug 'gitk --all &'
62
+
63
+test_done