git-svn: convert the 'commit-diff' command to Git::SVN
Also, convert all usage of 'log_msg' to 'log_entry' for consistency's sake SVN::Git::Editor::apply_diff now drives the rest of the editor. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
Jan 13, 2007 at 22:35 UTC
44320b9e0e279cd1f549e259d00753a02c86c21b
1 file changed
+233
-133
git-svn.perl
+233
-133
@@ -8,7 +8,8 @@ use vars qw/ $AUTHOR $VERSION
8
$GIT_SVN_INDEX $GIT_SVN
9
$GIT_DIR $GIT_SVN_DIR $REVDB
10
$_follow_parent $sha1 $sha1_short $_revision
11
- $_cp_remote $_upgrade/;
11
+ $_cp_remote $_upgrade $_rmdir $_q $_cp_similarity
12
+ $_find_copies_harder $_l/;
13
$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
14
$VERSION = '@@GIT_VERSION@@';
15
@@ -70,9 +71,8 @@ my ($SVN);
71
my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
72
$sha1 = qr/[a-f\d]{40}/;
73
$sha1_short = qr/[a-f\d]{4,40}/;
73
-my ($_stdin,$_help,$_rmdir,$_edit,
74
- $_find_copies_harder, $_l, $_cp_similarity,
75
- $_repack, $_repack_nr, $_repack_flags, $_q,
74
+my ($_stdin, $_help, $_edit,
75
+ $_repack, $_repack_nr, $_repack_flags,
76
$_message, $_file, $_no_metadata,
77
$_template, $_shared, $_no_default_regex, $_no_graft_copy,
78
$_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
@@ -154,7 +154,8 @@ my %cmd = (
154
'color' => \$Git::SVN::Log::color,
155
'pager=s' => \$Git::SVN::Log::pager,
156
} ],
157
- 'commit-diff' => [ \&commit_diff, 'Commit a diff between two trees',
157
+ 'commit-diff' => [ \&cmd_commit_diff,
158
+ 'Commit a diff between two trees',
159
{ 'message|m=s' => \$_message,
160
'file|F=s' => \$_file,
161
'revision|r=s' => \$_revision,
@@ -354,18 +355,18 @@ sub fetch_lib {
355
# on the limiter.
356
$SVN->dup->get_log([''], $min, $max, 0, 1, 1,
357
sub {
357
- my $log_msg;
358
+ my $log_entry;
359
if ($last_commit) {
359
- $log_msg = libsvn_fetch(
360
+ $log_entry = libsvn_fetch(
361
$last_commit, @_);
362
$last_commit = git_commit(
362
- $log_msg,
363
+ $log_entry,
364
$last_commit,
365
@parents);
366
} else {
366
- $log_msg = libsvn_new_tree(@_);
367
+ $log_entry = libsvn_new_tree(@_);
368
$last_commit = git_commit(
368
- $log_msg, @parents);
369
+ $log_entry, @parents);
370
}
371
});
372
exit 0;
@@ -428,7 +429,7 @@ sub commit_lib {
429
my $repo;
430
set_svn_commit_env();
431
foreach my $c (@revs) {
431
- my $log_msg = get_commit_message($c, $commit_msg);
432
+ my $log_entry = get_commit_entry($c, $commit_msg);
433
434
# fork for each commit because there's a memory leak I
435
# can't track down... (it's probably in the SVN code)
@@ -438,25 +439,21 @@ sub commit_lib {
439
my $ed = SVN::Git::Editor->new(
440
{ r => $r_last,
441
ra => $SVN->dup,
441
- c => $c,
442
svn_path => $SVN->{svn_path},
443
},
444
$SVN->get_commit_editor(
445
- $log_msg->{msg},
445
+ $log_entry->{log},
446
sub {
447
libsvn_commit_cb(
448
@_, $c,
449
- $log_msg->{msg},
449
+ $log_entry->{log},
450
$r_last,
451
$cmt_last)
452
}, $pool)
453
);
454
- my $mods = libsvn_checkout_tree($cmt_last, $c, $ed);
454
+ my $mods = $ed->apply_diff($cmt_last, $c);
455
if (@$mods == 0) {
456
print "No changes\nr$r_last = $cmt_last\n";
457
- $ed->abort_edit;
458
- } else {
459
- $ed->close_edit;
457
}
458
$pool->clear;
459
exit 0;
@@ -599,6 +596,55 @@ sub multi_fetch {
596
rec_fetch('', "$GIT_DIR/svn", @_);
597
}
598
599
+# this command is special because it requires no metadata
600
+sub cmd_commit_diff {
601
+ my ($ta, $tb, $url) = @_;
602
+ my $usage = "Usage: $0 commit-diff -r<revision> ".
603
+ "<tree-ish> <tree-ish> [<URL>]\n";
604
+ fatal($usage) if (!defined $ta || !defined $tb);
605
+ if (!defined $url) {
606
+ my $gs = eval { Git::SVN->new };
607
+ if (!$gs) {
608
+ fatal("Needed URL or usable git-svn --id in ",
609
+ "the command-line\n", $usage);
610
+ }
611
+ $url = $gs->{url};
612
+ }
613
+ unless (defined $_revision) {
614
+ fatal("-r|--revision is a required argument\n", $usage);
615
+ }
616
+ if (defined $_message && defined $_file) {
617
+ fatal("Both --message/-m and --file/-F specified ",
618
+ "for the commit message.\n",
619
+ "I have no idea what you mean\n");
620
+ }
621
+ if (defined $_file) {
622
+ $_message = file_to_s($_file);
623
+ } else {
624
+ $_message ||= get_commit_entry($tb)->{log};
625
+ }
626
+ my $ra ||= Git::SVN::Ra->new($url);
627
+ my $r = $_revision;
628
+ if ($r eq 'HEAD') {
629
+ $r = $ra->get_latest_revnum;
630
+ } elsif ($r !~ /^\d+$/) {
631
+ die "revision argument: $r not understood by git-svn\n";
632
+ }
633
+ my $pool = SVN::Pool->new;
634
+ my %ed_opts = ( r => $r,
635
+ ra => $ra->dup,
636
+ svn_path => $ra->{svn_path} );
637
+ my $ed = SVN::Git::Editor->new(\%ed_opts,
638
+ $ra->get_commit_editor($_message,
639
+ sub { print "Committed r$_[0]\n" }),
640
+ $pool);
641
+ my $mods = $ed->apply_diff($ta, $tb);
642
+ if (@$mods == 0) {
643
+ print "No changes\n$ta == $tb\n";
644
+ }
645
+ $pool->clear;
646
+}
647
+
648
sub commit_diff_usage {
649
print STDERR "Usage: $0 commit-diff <tree-ish> <tree-ish> [<URL>]\n";
650
exit 1
@@ -628,8 +674,8 @@ sub commit_diff {
674
if (defined $_file) {
675
$_message = file_to_s($_file);
676
} else {
631
- $_message ||= get_commit_message($tb,
632
- "$GIT_DIR/.svn-commit.tmp.$$")->{msg};
677
+ $_message ||= get_commit_entry($tb,
678
+ "$GIT_DIR/.svn-commit.tmp.$$")->{log};
679
}
680
$SVN ||= Git::SVN::Ra->new($SVN_URL);
681
if ($r eq 'HEAD') {
@@ -641,7 +687,6 @@ sub commit_diff {
687
my $pool = SVN::Pool->new;
688
my $ed = SVN::Git::Editor->new({ r => $r,
689
ra => $SVN->dup,
644
- c => $tb,
690
svn_path => $SVN->{svn_path}
691
},
692
$SVN->get_commit_editor($_message,
@@ -652,12 +697,9 @@ sub commit_diff {
697
$pool)
698
);
699
eval {
655
- my $mods = libsvn_checkout_tree($ta, $tb, $ed);
700
+ my $mods = $ed->apply_diff($ta, $tb);
701
if (@$mods == 0) {
702
print "No changes\n$ta == $tb\n";
658
- $ed->abort_edit;
659
- } else {
660
- $ed->close_edit;
703
}
704
};
705
$pool->clear;
@@ -963,7 +1005,7 @@ sub setup_git_svn {
1005
1006
sub get_tree_from_treeish {
1007
my ($treeish) = @_;
966
- croak "Not a sha1: $treeish\n" unless $treeish =~ /^$sha1$/o;
1008
+ # $treeish can be a symbolic ref, too:
1009
my $type = command_oneline(qw/cat-file -t/, $treeish);
1010
my $expected;
1011
while ($type eq 'tag') {
@@ -972,7 +1014,7 @@ sub get_tree_from_treeish {
1014
if ($type eq 'commit') {
1015
$expected = (grep /^tree /, command(qw/cat-file commit/,
1016
$treeish))[0];
975
- ($expected) = ($expected =~ /^tree ($sha1)$/);
1017
+ ($expected) = ($expected =~ /^tree ($sha1)$/o);
1018
die "Unable to get tree from $treeish\n" unless $expected;
1019
} elsif ($type eq 'tree') {
1020
$expected = $treeish;
@@ -1034,58 +1076,44 @@ sub get_diff {
1076
return \@mods;
1077
}
1078
1037
-sub libsvn_checkout_tree {
1038
- my ($from, $treeish, $ed) = @_;
1039
- my $mods = get_diff($from, $treeish);
1040
- return $mods unless (scalar @$mods);
1041
- my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
1042
- foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) {
1043
- my $f = $m->{chg};
1044
- if (defined $o{$f}) {
1045
- $ed->$f($m, $_q);
1046
- } else {
1047
- croak "Invalid change type: $f\n";
1048
- }
1049
- }
1050
- $ed->rmdirs($_q) if $_rmdir;
1051
- return $mods;
1052
-}
1053
-
1054
-sub get_commit_message {
1055
- my ($commit, $commit_msg) = (@_);
1056
- my %log_msg = ( msg => '' );
1057
- open my $msg, '>', $commit_msg or croak $!;
1079
+sub get_commit_entry {
1080
+ my ($treeish) = shift;
1081
+ my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
1082
+ my $commit_editmsg = "$ENV{GIT_DIR}/COMMIT_EDITMSG";
1083
+ my $commit_msg = "$ENV{GIT_DIR}/COMMIT_MSG";
1084
+ open my $log_fh, '>', $commit_editmsg or croak $!;
1085
1059
- my $type = command_oneline(qw/cat-file -t/, $commit);
1086
+ my $type = command_oneline(qw/cat-file -t/, $treeish);
1087
if ($type eq 'commit' || $type eq 'tag') {
1088
my ($msg_fh, $ctx) = command_output_pipe('cat-file',
1062
- $type, $commit);
1089
+ $type, $treeish);
1090
my $in_msg = 0;
1091
while (<$msg_fh>) {
1092
if (!$in_msg) {
1093
$in_msg = 1 if (/^\s*$/);
1094
} elsif (/^git-svn-id: /) {
1068
- # skip this, we regenerate the correct one
1069
- # on re-fetch anyways
1095
+ # skip this for now, we regenerate the
1096
+ # correct one on re-fetch anyways
1097
+ # TODO: set *:merge properties or like...
1098
} else {
1071
- print $msg $_ or croak $!;
1099
+ print $log_fh $_ or croak $!;
1100
}
1101
}
1102
command_close_pipe($msg_fh, $ctx);
1103
}
1076
- close $msg or croak $!;
1104
+ close $log_fh or croak $!;
1105
1106
if ($_edit || ($type eq 'tree')) {
1107
my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
1080
- system($editor, $commit_msg);
1108
+ # TODO: strip out spaces, comments, like git-commit.sh
1109
+ system($editor, $commit_editmsg);
1110
}
1082
-
1083
- # file_to_s removes all trailing newlines, so just use chomp() here:
1084
- open $msg, '<', $commit_msg or croak $!;
1085
- { local $/; chomp($log_msg{msg} = <$msg>); }
1086
- close $msg or croak $!;
1087
-
1088
- return \%log_msg;
1111
+ rename $commit_editmsg, $commit_msg or croak $!;
1112
+ open $log_fh, '<', $commit_msg or croak $!;
1113
+ { local $/; chomp($log_entry{log} = <$log_fh>); }
1114
+ close $log_fh or croak $!;
1115
+ unlink $commit_msg;
1116
+ \%log_entry;
1117
}
1118
1119
sub set_svn_commit_env {
@@ -1150,12 +1178,12 @@ sub assert_revision_unknown {
1178
}
1179
1180
sub git_commit {
1153
- my ($log_msg, @parents) = @_;
1154
- assert_revision_unknown($log_msg->{revision});
1181
+ my ($log_entry, @parents) = @_;
1182
+ assert_revision_unknown($log_entry->{revision});
1183
map_tree_joins() if (@_branch_from && !%tree_map);
1184
1185
my (@tmp_parents, @exec_parents, %seen_parent);
1158
- if (my $lparents = $log_msg->{parents}) {
1186
+ if (my $lparents = $log_entry->{parents}) {
1187
@tmp_parents = @$lparents
1188
}
1189
# commit parents can be conditionally bound to a particular
@@ -1163,14 +1191,14 @@ sub git_commit {
1191
foreach my $p (@parents) {
1192
next unless defined $p;
1193
if ($p =~ /^(\d+)=($sha1_short)$/o) {
1166
- if ($1 == $log_msg->{revision}) {
1194
+ if ($1 == $log_entry->{revision}) {
1195
push @tmp_parents, $2;
1196
}
1197
} else {
1198
push @tmp_parents, $p if $p =~ /$sha1_short/o;
1199
}
1200
}
1173
- my $tree = $log_msg->{tree};
1201
+ my $tree = $log_entry->{tree};
1202
if (!defined $tree) {
1203
my $index = set_index($GIT_SVN_INDEX);
1204
$tree = command_oneline('write-tree');
@@ -1197,7 +1225,7 @@ sub git_commit {
1225
next if $skip;
1226
my ($url_p, $r_p, $uuid_p) = cmt_metadata($p);
1227
next if (($SVN->uuid eq $uuid_p) &&
1200
- ($log_msg->{revision} > $r_p));
1228
+ ($log_entry->{revision} > $r_p));
1229
next if (defined $url_p && defined $SVN_URL &&
1230
($SVN->uuid eq $uuid_p) &&
1231
($url_p eq $SVN_URL));
@@ -1212,14 +1240,14 @@ sub git_commit {
1240
last if @exec_parents > 16;
1241
}
1242
1215
- set_commit_env($log_msg);
1243
+ set_commit_env($log_entry);
1244
my @exec = ('git-commit-tree', $tree);
1245
push @exec, '-p', $_ foreach @exec_parents;
1246
defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1247
or croak $!;
1220
- print $msg_fh $log_msg->{msg} or croak $!;
1248
+ print $msg_fh $log_entry->{log} or croak $!;
1249
unless ($_no_metadata) {
1222
- print $msg_fh "\ngit-svn-id: $SVN_URL\@$log_msg->{revision} ",
1250
+ print $msg_fh "\ngit-svn-id: $SVN_URL\@$log_entry->{revision} ",
1251
$SVN->uuid,"\n" or croak $!;
1252
}
1253
$msg_fh->flush == 0 or croak $!;
@@ -1232,10 +1260,10 @@ sub git_commit {
1260
die "Failed to commit, invalid sha1: $commit\n";
1261
}
1262
command_noisy('update-ref',"refs/remotes/$GIT_SVN",$commit);
1235
- revdb_set($REVDB, $log_msg->{revision}, $commit);
1263
+ revdb_set($REVDB, $log_entry->{revision}, $commit);
1264
1265
# this output is read via pipe, do not change:
1238
- print "r$log_msg->{revision} = $commit\n";
1266
+ print "r$log_entry->{revision} = $commit\n";
1267
return $commit;
1268
}
1269
@@ -1248,8 +1276,8 @@ sub check_repack {
1276
}
1277
1278
sub set_commit_env {
1251
- my ($log_msg) = @_;
1252
- my $author = $log_msg->{author};
1279
+ my ($log_entry) = @_;
1280
+ my $author = $log_entry->{author};
1281
if (!defined $author || length $author == 0) {
1282
$author = '(no author)';
1283
}
@@ -1257,7 +1285,7 @@ sub set_commit_env {
1285
: ($author,$author . '@' . $SVN->uuid);
1286
$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
1287
$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
1260
- $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_msg->{date};
1288
+ $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
1289
}
1290
1291
sub check_upgrade_needed {
@@ -1767,14 +1795,14 @@ sub assert_index_clean {
1795
}
1796
1797
sub get_commit_parents {
1770
- my ($self, $log_msg, @parents) = @_;
1798
+ my ($self, $log_entry, @parents) = @_;
1799
my (%seen, @ret, @tmp);
1800
# commit parents can be conditionally bound to a particular
1801
# svn revision via: "svn_revno=commit_sha1", filter them out here:
1802
foreach my $p (@parents) {
1803
next unless defined $p;
1804
if ($p =~ /^(\d+)=($::sha1_short)$/o) {
1777
- push @tmp, $2 if $1 == $log_msg->{revision};
1805
+ push @tmp, $2 if $1 == $log_entry->{revision};
1806
} else {
1807
push @tmp, $p if $p =~ /^$::sha1_short$/o;
1808
}
@@ -1782,7 +1810,7 @@ sub get_commit_parents {
1810
if (my $cur = ::verify_ref($self->refname.'^0')) {
1811
push @tmp, $cur;
1812
}
1785
- push @tmp, $_ foreach (@{$log_msg->{parents}}, @tmp);
1813
+ push @tmp, $_ foreach (@{$log_entry->{parents}}, @tmp);
1814
while (my $p = shift @tmp) {
1815
next if $seen{$p};
1816
$seen{$p} = 1;
@@ -1791,7 +1819,7 @@ sub get_commit_parents {
1819
last if @ret >= 16;
1820
}
1821
if (@tmp) {
1794
- die "r$log_msg->{revision}: No room for parents:\n\t",
1822
+ die "r$log_entry->{revision}: No room for parents:\n\t",
1823
join("\n\t", @tmp), "\n";
1824
}
1825
@ret;
@@ -1812,17 +1840,18 @@ sub check_upgrade_needed {
1840
}
1841
1842
sub do_git_commit {
1815
- my ($self, $log_msg, @parents) = @_;
1816
- if (my $c = $self->rev_db_get($log_msg->{revision})) {
1817
- croak "$log_msg->{revision} = $c already exists! ",
1843
+ my ($self, $log_entry, @parents) = @_;
1844
+ if (my $c = $self->rev_db_get($log_entry->{revision})) {
1845
+ croak "$log_entry->{revision} = $c already exists! ",
1846
"Why are we refetching it?\n";
1847
}
1820
- my ($name, $email) = ::author_name_email($log_msg->{author}, $self->ra);
1848
+ my ($name, $email) = ::author_name_email($log_entry->{author},
1849
+ $self->ra);
1850
$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
1851
$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
1823
- $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_msg->{date};
1852
+ $ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
1853
1825
- my $tree = $log_msg->{tree};
1854
+ my $tree = $log_entry->{tree};
1855
if (!defined $tree) {
1856
$tree = $self->tmp_index_do(sub {
1857
command_oneline('write-tree') });
@@ -1830,14 +1859,15 @@ sub do_git_commit {
1859
die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
1860
1861
my @exec = ('git-commit-tree', $tree);
1833
- foreach ($self->get_commit_parents($log_msg, @parents)) {
1862
+ foreach ($self->get_commit_parents($log_entry, @parents)) {
1863
push @exec, '-p', $_;
1864
}
1865
defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
1866
or croak $!;
1838
- print $msg_fh $log_msg->{log} or croak $!;
1839
- print $msg_fh "\ngit-svn-id: $self->{ra}->{url}\@$log_msg->{revision}",
1840
- " ", $self->ra->uuid,"\n" or croak $!;
1867
+ print $msg_fh $log_entry->{log} or croak $!;
1868
+ print $msg_fh "\ngit-svn-id: ", $self->ra->{url}, '@',
1869
+ $log_entry->{revision}, ' ',
1870
+ $self->ra->uuid, "\n" or croak $!;
1871
$msg_fh->flush == 0 or croak $!;
1872
close $msg_fh or croak $!;
1873
chomp(my $commit = do { local $/; <$out_fh> });
@@ -1849,16 +1879,16 @@ sub do_git_commit {
1879
}
1880
1881
command_noisy('update-ref',$self->refname, $commit);
1852
- $self->rev_db_set($log_msg->{revision}, $commit);
1882
+ $self->rev_db_set($log_entry->{revision}, $commit);
1883
1854
- $self->{last_rev} = $log_msg->{revision};
1884
+ $self->{last_rev} = $log_entry->{revision};
1885
$self->{last_commit} = $commit;
1856
- print "r$log_msg->{revision} = $commit\n";
1886
+ print "r$log_entry->{revision} = $commit\n";
1887
return $commit;
1888
}
1889
1890
sub do_fetch {
1861
- my ($self, $paths, $rev) = @_; #, $author, $date, $msg) = @_;
1891
+ my ($self, $paths, $rev) = @_; #, $author, $date, $log) = @_;
1892
my $ed = SVN::Git::Fetcher->new($self);
1893
my ($last_rev, @parents);
1894
if ($self->{last_commit}) {
@@ -1958,7 +1988,7 @@ sub fetch {
1988
while (1) {
1989
my @revs;
1990
$self->ra->get_log([''], $min, $max, 0, 1, 1, sub {
1961
- my ($paths, $rev, $author, $date, $msg) = @_;
1991
+ my ($paths, $rev, $author, $date, $log) = @_;
1992
push @revs, $rev });
1993
foreach (@revs) {
1994
my $log_entry = $self->do_fetch(undef, $_);
@@ -1993,7 +2023,6 @@ sub set_tree {
2023
my $pool = SVN::Pool->new;
2024
my $ed = SVN::Git::Editor->new({ r => $self->{last_rev},
2025
ra => $self->ra->dup,
1996
- c => $tree,
2026
svn_path => $self->ra->{svn_path}
2027
},
2028
$self->ra->get_commit_editor(
@@ -2226,7 +2255,7 @@ sub uri_decode {
2255
}
2256
2257
sub libsvn_log_entry {
2229
- my ($rev, $author, $date, $msg, $parents, $untracked) = @_;
2258
+ my ($rev, $author, $date, $log, $parents, $untracked) = @_;
2259
my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
2260
(\d\d)\:(\d\d)\:(\d\d).\d+Z$/x)
2261
or die "Unable to parse date: $date\n";
@@ -2234,7 +2263,7 @@ sub libsvn_log_entry {
2263
defined $_authors && ! defined $users{$author}) {
2264
die "Author: $author not defined in $_authors file\n";
2265
}
2237
- $msg = '' if ($rev == 0 && !defined $msg);
2266
+ $log = '' if ($rev == 0 && !defined $log);
2267
2268
open my $un, '>>', "$GIT_SVN_DIR/unhandled.log" or croak $!;
2269
my $h;
@@ -2290,18 +2319,18 @@ sub libsvn_log_entry {
2319
close $un or croak $!;
2320
2321
{ revision => $rev, date => "+0000 $Y-$m-$d $H:$M:$S",
2293
- author => $author, msg => $msg."\n", parents => $parents || [],
2322
+ author => $author, log => $log."\n", parents => $parents || [],
2323
revprops => $rp }
2324
}
2325
2326
sub libsvn_fetch {
2298
- my ($last_commit, $paths, $rev, $author, $date, $msg) = @_;
2327
+ my ($last_commit, $paths, $rev, $author, $date, $log) = @_;
2328
my $ed = SVN::Git::Fetcher->new({ c => $last_commit, q => $_q });
2329
my (undef, $last_rev, undef) = cmt_metadata($last_commit);
2330
unless ($SVN->gs_do_update($last_rev, $rev, '', 1, $ed)) {
2331
die "SVN connection failed somewhere...\n";
2332
}
2304
- libsvn_log_entry($rev, $author, $date, $msg, [$last_commit], $ed);
2333
+ libsvn_log_entry($rev, $author, $date, $log, [$last_commit], $ed);
2334
}
2335
2336
sub svn_grab_base_rev {
@@ -2390,7 +2419,7 @@ sub revisions_eq {
2419
}
2420
2421
sub libsvn_find_parent_branch {
2393
- my ($paths, $rev, $author, $date, $msg) = @_;
2422
+ my ($paths, $rev, $author, $date, $log) = @_;
2423
my $svn_path = '/'.$SVN->{svn_path};
2424
2425
# look for a parent from another branch:
@@ -2442,7 +2471,7 @@ sub libsvn_find_parent_branch {
2471
command_noisy('read-tree', $parent);
2472
unless ($SVN->can_do_switch) {
2473
return _libsvn_new_tree($paths, $rev, $author, $date,
2445
- $msg, [$parent]);
2474
+ $log, [$parent]);
2475
}
2476
# do_switch works with svn/trunk >= r22312, but that is not
2477
# included with SVN 1.4.2 (the latest version at the moment),
@@ -2451,7 +2480,7 @@ sub libsvn_find_parent_branch {
2480
my $ed = SVN::Git::Fetcher->new({c => $parent, q => $_q });
2481
$ra->gs_do_switch($r0, $rev, '', 1, $SVN->{url}, $ed) or
2482
die "SVN connection failed somewhere...\n";
2454
- return libsvn_log_entry($rev, $author, $date, $msg, [$parent]);
2483
+ return libsvn_log_entry($rev, $author, $date, $log, [$parent]);
2484
}
2485
print STDERR "Nope, branch point not imported or unknown\n";
2486
return undef;
@@ -2461,17 +2490,17 @@ sub libsvn_new_tree {
2490
if (my $log_entry = libsvn_find_parent_branch(@_)) {
2491
return $log_entry;
2492
}
2464
- my ($paths, $rev, $author, $date, $msg) = @_; # $pool is last
2465
- _libsvn_new_tree($paths, $rev, $author, $date, $msg, []);
2493
+ my ($paths, $rev, $author, $date, $log) = @_; # $pool is last
2494
+ _libsvn_new_tree($paths, $rev, $author, $date, $log, []);
2495
}
2496
2497
sub _libsvn_new_tree {
2469
- my ($paths, $rev, $author, $date, $msg, $parents) = @_;
2498
+ my ($paths, $rev, $author, $date, $log, $parents) = @_;
2499
my $ed = SVN::Git::Fetcher->new({q => $_q});
2500
unless ($SVN->gs_do_update($rev, $rev, '', 1, $ed)) {
2501
die "SVN connection failed somewhere...\n";
2502
}
2474
- libsvn_log_entry($rev, $author, $date, $msg, $parents, $ed);
2503
+ libsvn_log_entry($rev, $author, $date, $log, $parents, $ed);
2504
}
2505
2506
sub find_graft_path_commit {
@@ -2536,9 +2565,9 @@ sub restore_index {
2565
}
2566
2567
sub libsvn_commit_cb {
2539
- my ($rev, $date, $committer, $c, $msg, $r_last, $cmt_last) = @_;
2568
+ my ($rev, $date, $committer, $c, $log, $r_last, $cmt_last) = @_;
2569
if ($_optimize_commits && $rev == ($r_last + 1)) {
2541
- my $log = libsvn_log_entry($rev,$committer,$date,$msg);
2570
+ my $log = libsvn_log_entry($rev,$committer,$date,$log);
2571
$log->{tree} = get_tree_from_treeish($c);
2572
my $cmt = git_commit($log, $cmt_last, $c);
2573
my @diff = command('diff-tree', $cmt, $c);
@@ -2843,7 +2872,7 @@ sub new {
2872
my $git_svn = shift;
2873
my $self = SVN::Delta::Editor->new(@_);
2874
bless $self, $class;
2846
- foreach (qw/svn_path c r ra /) {
2875
+ foreach (qw/svn_path r ra/) {
2876
die "$_ required!\n" unless (defined $git_svn->{$_});
2877
$self->{$_} = $git_svn->{$_};
2878
}
@@ -2868,7 +2897,7 @@ sub url_path {
2897
}
2898
2899
sub rmdirs {
2871
- my ($self, $q) = @_;
2900
+ my ($self, $tree_b) = @_;
2901
my $rm = $self->{rm};
2902
delete $rm->{''}; # we never delete the url we're tracking
2903
return unless %$rm;
@@ -2887,7 +2916,7 @@ sub rmdirs {
2916
return unless %$rm;
2917
2918
my ($fh, $ctx) = command_output_pipe(
2890
- qw/ls-tree --name-only -r -z/, $self->{c});
2919
+ qw/ls-tree --name-only -r -z/, $tree_b);
2920
local $/ = "\0";
2921
while (<$fh>) {
2922
chomp;
@@ -2906,7 +2935,7 @@ sub rmdirs {
2935
foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) {
2936
$self->close_directory($bat->{$d}, $p);
2937
my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#);
2909
- print "\tD+\t$d/\n" unless $q;
2938
+ print "\tD+\t$d/\n" unless $::_q;
2939
$self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p);
2940
delete $bat->{$d};
2941
}
@@ -2945,23 +2974,23 @@ sub ensure_path {
2974
}
2975
2976
sub A {
2948
- my ($self, $m, $q) = @_;
2977
+ my ($self, $m) = @_;
2978
my ($dir, $file) = split_path($m->{file_b});
2979
my $pbat = $self->ensure_path($dir);
2980
my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2981
undef, -1);
2953
- print "\tA\t$m->{file_b}\n" unless $q;
2982
+ print "\tA\t$m->{file_b}\n" unless $::_q;
2983
$self->chg_file($fbat, $m);
2984
$self->close_file($fbat,undef,$self->{pool});
2985
}
2986
2987
sub C {
2959
- my ($self, $m, $q) = @_;
2988
+ my ($self, $m) = @_;
2989
my ($dir, $file) = split_path($m->{file_b});
2990
my $pbat = $self->ensure_path($dir);
2991
my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
2992
$self->url_path($m->{file_a}), $self->{r});
2964
- print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $q;
2993
+ print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
2994
$self->chg_file($fbat, $m);
2995
$self->close_file($fbat,undef,$self->{pool});
2996
}
@@ -2975,12 +3004,12 @@ sub delete_entry {
3004
}
3005
3006
sub R {
2978
- my ($self, $m, $q) = @_;
3007
+ my ($self, $m) = @_;
3008
my ($dir, $file) = split_path($m->{file_b});
3009
my $pbat = $self->ensure_path($dir);
3010
my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
3011
$self->url_path($m->{file_a}), $self->{r});
2983
- print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $q;
3012
+ print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
3013
$self->chg_file($fbat, $m);
3014
$self->close_file($fbat,undef,$self->{pool});
3015
@@ -2990,12 +3019,12 @@ sub R {
3019
}
3020
3021
sub M {
2993
- my ($self, $m, $q) = @_;
3022
+ my ($self, $m) = @_;
3023
my ($dir, $file) = split_path($m->{file_b});
3024
my $pbat = $self->ensure_path($dir);
3025
my $fbat = $self->open_file($self->repo_path($m->{file_b}),
3026
$pbat,$self->{r},$self->{pool});
2998
- print "\t$m->{chg}\t$m->{file_b}\n" unless $q;
3027
+ print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
3028
$self->chg_file($fbat, $m);
3029
$self->close_file($fbat,undef,$self->{pool});
3030
}
@@ -3046,10 +3075,10 @@ sub chg_file {
3075
}
3076
3077
sub D {
3049
- my ($self, $m, $q) = @_;
3078
+ my ($self, $m) = @_;
3079
my ($dir, $file) = split_path($m->{file_b});
3080
my $pbat = $self->ensure_path($dir);
3052
- print "\tD\t$m->{file_b}\n" unless $q;
3081
+ print "\tD\t$m->{file_b}\n" unless $::_q;
3082
$self->delete_entry($m->{file_b}, $pbat);
3083
}
3084
@@ -3069,6 +3098,77 @@ sub abort_edit {
3098
$self->{pool}->clear;
3099
}
3100
3101
+# this drives the editor
3102
+sub apply_diff {
3103
+ my ($self, $tree_a, $tree_b) = @_;
3104
+ my @diff_tree = qw(diff-tree -z -r);
3105
+ if ($::_cp_similarity) {
3106
+ push @diff_tree, "-C$::_cp_similarity";
3107
+ } else {
3108
+ push @diff_tree, '-C';
3109
+ }
3110
+ push @diff_tree, '--find-copies-harder' if $::_find_copies_harder;
3111
+ push @diff_tree, "-l$::_l" if defined $::_l;
3112
+ push @diff_tree, $tree_a, $tree_b;
3113
+ my ($diff_fh, $ctx) = command_output_pipe(@diff_tree);
3114
+ my $nl = $/;
3115
+ local $/ = "\0";
3116
+ my $state = 'meta';
3117
+ my @mods;
3118
+ while (<$diff_fh>) {
3119
+ chomp $_; # this gets rid of the trailing "\0"
3120
+ if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
3121
+ $::sha1\s($::sha1)\s
3122
+ ([MTCRAD])\d*$/xo) {
3123
+ push @mods, { mode_a => $1, mode_b => $2,
3124
+ sha1_b => $3, chg => $4 };
3125
+ if ($4 =~ /^(?:C|R)$/) {
3126
+ $state = 'file_a';
3127
+ } else {
3128
+ $state = 'file_b';
3129
+ }
3130
+ } elsif ($state eq 'file_a') {
3131
+ my $x = $mods[$#mods] or croak "Empty array\n";
3132
+ if ($x->{chg} !~ /^(?:C|R)$/) {
3133
+ croak "Error parsing $_, $x->{chg}\n";
3134
+ }
3135
+ $x->{file_a} = $_;
3136
+ $state = 'file_b';
3137
+ } elsif ($state eq 'file_b') {
3138
+ my $x = $mods[$#mods] or croak "Empty array\n";
3139
+ if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) {
3140
+ croak "Error parsing $_, $x->{chg}\n";
3141
+ }
3142
+ if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) {
3143
+ croak "Error parsing $_, $x->{chg}\n";
3144
+ }
3145
+ $x->{file_b} = $_;
3146
+ $state = 'meta';
3147
+ } else {
3148
+ croak "Error parsing $_\n";
3149
+ }
3150
+ }
3151
+ command_close_pipe($diff_fh, $ctx);
3152
+ $/ = $nl;
3153
+
3154
+ my %o = ( D => 1, R => 0, C => -1, A => 3, M => 3, T => 3 );
3155
+ foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @mods) {
3156
+ my $f = $m->{chg};
3157
+ if (defined $o{$f}) {
3158
+ $self->$f($m);
3159
+ } else {
3160
+ fatal("Invalid change type: $f\n");
3161
+ }
3162
+ }
3163
+ $self->rmdirs($tree_b) if $::_rmdir;
3164
+ if (@mods == 0) {
3165
+ $self->abort_edit;
3166
+ } else {
3167
+ $self->close_edit;
3168
+ }
3169
+ \@mods;
3170
+}
3171
+
3172
package Git::SVN::Ra;
3173
use vars qw/@ISA $config_dir/;
3174
use strict;
@@ -3144,9 +3244,9 @@ sub get_log {
3244
}
3245
3246
sub get_commit_editor {
3147
- my ($self, $msg, $cb, $pool) = @_;
3247
+ my ($self, $log, $cb, $pool) = @_;
3248
my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef, 0) : ();
3149
- $self->SUPER::get_commit_editor($msg, $cb, @lock, $pool);
3249
+ $self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
3250
}
3251
3252
sub uuid {
@@ -3211,13 +3311,13 @@ sub cmt_showable {
3311
return 1 if defined $c->{r};
3312
if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
3313
$c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
3214
- my @msg = command(qw/cat-file commit/, $c->{c});
3215
- shift @msg while ($msg[0] ne "\n");
3216
- shift @msg;
3217
- @{$c->{l}} = grep !/^git-svn-id: /, @msg;
3314
+ my @log = command(qw/cat-file commit/, $c->{c});
3315
+ shift @log while ($log[0] ne "\n");
3316
+ shift @log;
3317
+ @{$c->{l}} = grep !/^git-svn-id: /, @log;
3318
3319
(undef, $c->{r}, undef) = ::extract_metadata(
3220
- (grep(/^git-svn-id: /, @msg))[-1]);
3320
+ (grep(/^git-svn-id: /, @log))[-1]);
3321
}
3322
return defined $c->{r};
3323
}
@@ -3503,9 +3603,9 @@ __END__
3603
3604
Data structures:
3605
3506
-$log_msg hashref as returned by libsvn_log_entry()
3606
+$log_entry hashref as returned by libsvn_log_entry()
3607
{
3508
- msg => 'whitespace-formatted log entry
3608
+ log => 'whitespace-formatted log entry
3609
', # trailing newline is preserved
3610
revision => '8', # integer
3611
date => '2004-02-24T17:01:44.108345Z', # commit date