X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svnimport.perl;h=26dc45479532a78febb511bf36017d6106513e70;hb=72303d44e9d8f3fc9bef039b472a2bd259509420;hp=4d5371ca901cb7579e454443958e8ca360763dbe;hpb=dd4bca39eccd01d93fe7916df3b8cb6f68629211;p=git.git

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 4d5371ca9..26dc45479 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -63,10 +63,17 @@ my $svn_dir = $ARGV[1];
 
 our @mergerx = ();
 if ($opt_m) {
-	@mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
+	my $branch_esc = quotemeta ($branch_name);
+	my $trunk_esc  = quotemeta ($trunk_name);
+	@mergerx =
+	(
+		qr!\b(?:merg(?:ed?|ing))\b.*?\b((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
+		qr!\b(?:from|of)\W+((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
+		qr!\b(?:from|of)\W+(?:the )?([\w\.\-]+)[-\s]branch\b!i
+	);
 }
 if ($opt_M) {
-	push (@mergerx, qr/$opt_M/);
+	unshift (@mergerx, qr/$opt_M/);
 }
 
 # Absolutize filename now, since we will have chdir'ed by the time we
@@ -98,6 +105,7 @@ package SVNconn;
 use File::Spec;
 use File::Temp qw(tempfile);
 use POSIX qw(strftime dup2);
+use Fcntl qw(SEEK_SET);
 
 sub new {
 	my($what,$repo) = @_;
@@ -135,17 +143,32 @@ sub file {
 
 	print "... $rev $path ...\n" if $opt_v;
 	my (undef, $properties);
+	my $pool = SVN::Pool->new();
 	eval { (undef, $properties)
-		   = $self->{'svn'}->get_file($path,$rev,$fh); };
+		   = $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
+	$pool->clear;
 	if($@) {
 		return undef if $@ =~ /Attempted to get checksum/;
 		die $@;
 	}
 	my $mode;
 	if (exists $properties->{'svn:executable'}) {
-		$mode = '0755';
+		$mode = '100755';
+	} elsif (exists $properties->{'svn:special'}) {
+		my ($special_content, $filesize);
+		$filesize = tell $fh;
+		seek $fh, 0, SEEK_SET;
+		read $fh, $special_content, $filesize;
+		if ($special_content =~ s/^link //) {
+			$mode = '120000';
+			seek $fh, 0, SEEK_SET;
+			truncate $fh, 0;
+			print $fh $special_content;
+		} else {
+			die "unexpected svn:special file encountered";
+		}
 	} else {
-		$mode = '0644';
+		$mode = '100644';
 	}
 	close ($fh);
 
@@ -511,7 +534,7 @@ sub commit {
 	my($author_name,$author_email,$dest);
 	my(@old,@new,@parents);
 
-	if (not defined $author) {
+	if (not defined $author or $author eq "") {
 		$author_name = $author_email = "unknown";
 	} elsif (defined $users_file) {
 		die "User $author is not listed in $users_file\n"