@matheusbsbs / matheus-bagliano / commits / dc62e25cbd
Fork 0

git-svn: SVN 1.1.x library compatibility

Tested on a plain Ubuntu Hoary installation using subversion 1.1.1-2ubuntu3 1.1.x issues I had to deal with: * Avoid the noisy command-line client compatibility check if we use the libraries. * get_log() arguments differ (now using a nice wrapper from Junio's suggestion) * get_file() is picky about what kind of file handles it gets, so I ended up redirecting STDOUT. I'm probably overflushing my file handles, but that's the safest thing to do... * BDB kept segfaulting on me during tests, so svnadmin will use FSFS whenever we can. * If somebody used an expanded CVS $Id$ line inside a file, then propsetting it to use svn:keywords will cause the original CVS $Id$ to be retained when asked for the original file. As far as I can see, this is a server-side issue. We won't care in the test anymore, as long as it's not expanded by SVN, a static CVS $Id$ line is fine. While we're at making ourselves more compatible, avoid grep along with the -q flag, which is GNU-specific. (grep avoidance tip from Junio, too) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed Jun 28, 2006 at 03:07 UTC dc62e25cbd0ec1726d5108a8caa539e60492cc7a
4 files changed +44 -12
contrib/git-svn/git-svn.perl
+23 -7
@@ -134,7 +134,7 @@ usage(1) unless defined $cmd;
134 init_vars();
135 load_authors() if $_authors;
136 load_all_refs() if $_branch_all_refs;
137 -svn_compat_check();
137 +svn_compat_check() unless $_use_lib;
138 migration_check() unless $cmd =~ /^(?:init|rebuild|multi-init)$/;
139 $cmd{$cmd}->[0]->(@ARGV);
140 exit 0;
@@ -379,7 +379,8 @@ sub fetch_lib {
379 # performance sucks with it enabled, so it's much
380 # faster to fetch revision ranges instead of relying
381 # on the limiter.
382 - $SVN_LOG->get_log( '/'.$SVN_PATH, $min, $max, 0, 1, 1,
382 + libsvn_get_log($SVN_LOG, '/'.$SVN_PATH,
383 + $min, $max, 0, 1, 1,
384 sub {
385 my $log_msg;
386 if ($last_commit) {
@@ -924,7 +925,7 @@ sub graft_file_copy_lib {
925 $SVN::Error::handler = \&libsvn_skip_unknown_revs;
926 while (1) {
927 my $pool = SVN::Pool->new;
927 - $SVN_LOG->get_log( "/$path", $min, $max, 0, 1, 1,
928 + libsvn_get_log($SVN_LOG, "/$path", $min, $max, 0, 1, 1,
929 sub {
930 libsvn_graft_file_copies($grafts, $tree_paths,
931 $path, @_);
@@ -2358,8 +2359,8 @@ sub libsvn_load {
2359 return unless $_use_lib;
2360 $_use_lib = eval {
2361 require SVN::Core;
2361 - if ($SVN::Core::VERSION lt '1.2.1') {
2362 - die "Need SVN::Core 1.2.1 or better ",
2362 + if ($SVN::Core::VERSION lt '1.1.0') {
2363 + die "Need SVN::Core 1.1.0 or better ",
2364 "(got $SVN::Core::VERSION) ",
2365 "Falling back to command-line svn\n";
2366 }
@@ -2392,9 +2393,15 @@ sub libsvn_get_file {
2393 my $pool = SVN::Pool->new;
2394 defined($pid = open3($in, $out, '>&STDERR',
2395 qw/git-hash-object -w --stdin/)) or croak $!;
2395 - my ($r, $props) = $SVN->get_file($f, $rev, $in, $pool);
2396 + # redirect STDOUT for SVN 1.1.x compatibility
2397 + open my $stdout, '>&', \*STDOUT or croak $!;
2398 + open STDOUT, '>&', $in or croak $!;
2399 + $| = 1; # not sure if this is necessary, better safe than sorry...
2400 + my ($r, $props) = $SVN->get_file($f, $rev, \*STDOUT, $pool);
2401 $in->flush == 0 or croak $!;
2402 + open STDOUT, '>&', $stdout or croak $!;
2403 close $in or croak $!;
2404 + close $stdout or croak $!;
2405 $pool->clear;
2406 chomp($hash = do { local $/; <$out> });
2407 close $out or croak $!;
@@ -2566,7 +2573,8 @@ sub revisions_eq {
2573 if ($_use_lib) {
2574 # should be OK to use Pool here (r1 - r0) should be small
2575 my $pool = SVN::Pool->new;
2569 - $SVN->get_log("/$path", $r0, $r1, 0, 1, 1, sub {$nr++},$pool);
2576 + libsvn_get_log($SVN, "/$path", $r0, $r1,
2577 + 0, 1, 1, sub {$nr++}, $pool);
2578 $pool->clear;
2579 } else {
2580 my ($url, undef) = repo_path_split($SVN_URL);
@@ -2606,6 +2614,14 @@ sub libsvn_find_parent_branch {
2614 return undef;
2615 }
2616
2617 +sub libsvn_get_log {
2618 + my ($ra, @args) = @_;
2619 + if ($SVN::Core::VERSION le '1.2.0') {
2620 + splice(@args, 3, 1);
2621 + }
2622 + $ra->get_log(@args);
2623 +}
2624 +
2625 sub libsvn_new_tree {
2626 if (my $log_entry = libsvn_find_parent_branch(@_)) {
2627 return $log_entry;
contrib/git-svn/t/lib-git-svn.sh
+7 -1
@@ -33,7 +33,13 @@ svnrepo=$PWD/svnrepo
33
34 set -e
35
36 -svnadmin create $svnrepo
36 +if svnadmin create --help | grep fs-type >/dev/null
37 +then
38 + svnadmin create --fs-type fsfs "$svnrepo"
39 +else
40 + svnadmin create "$svnrepo"
41 +fi
42 +
43 svnrepo="file://$svnrepo/test-git-svn"
44
45
contrib/git-svn/t/t0000-contrib-git-svn.sh
+12 -2
@@ -5,6 +5,16 @@
5
6 test_description='git-svn tests'
7 GIT_SVN_LC_ALL=$LC_ALL
8 +
9 +case "$LC_ALL" in
10 +*.UTF-8)
11 + have_utf8=t
12 + ;;
13 +*)
14 + have_utf8=
15 + ;;
16 +esac
17 +
18 . ./lib-git-svn.sh
19
20 mkdir import
@@ -173,7 +183,7 @@ then
183 fi
184
185
176 -if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
186 +if test "$have_utf8" = t
187 then
188 name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
189 echo '# hello' >> exec-2.sh
@@ -203,7 +213,7 @@ fi
213
214 name='check imported tree checksums expected tree checksums'
215 rm -f expected
206 -if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
216 +if test "$have_utf8" = t
217 then
218 echo tree f735671b89a7eb30cab1d8597de35bd4271ab813 > expected
219 fi
contrib/git-svn/t/t0001-contrib-git-svn-props.sh
+2 -2
@@ -21,8 +21,8 @@ a_empty_crlf=
21
22 cd import
23 cat >> kw.c <<\EOF
24 -/* Make it look like somebody copied a file from CVS into SVN: */
25 -/* $Id: kw.c,v 1.1.1.1 1994/03/06 00:00:00 eric Exp $ */
24 +/* Somebody prematurely put a keyword into this file */
25 +/* $Id$ */
26 EOF
27
28 printf "Hello\r\nWorld\r\n" > crlf