From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Oct 2006 05:08:26 +0000 (-0700)
Subject: Merge branch 'sk/svn'
X-Git-Tag: v1.4.4-rc1~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/170487fbc3d7ec0f36208eed18d4ca0ea1e1acb7?hp=-c

Merge branch 'sk/svn'

* sk/svn:
git-svnimport.perl: copying directory from original SVN place
---

170487fbc3d7ec0f36208eed18d4ca0ea1e1acb7
diff --combined git-svnimport.perl
index aca0e4f64e,4ae0eecd37..f6eff8e32a
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@@ -193,6 -193,13 +193,13 @@@ sub ignore 
  	}
  }
  
+ sub dir_list {
+ 	my($self,$path,$rev) = @_;
+ 	my ($dirents,undef,$properties)
+ 	    = $self->{'svn'}->get_dir($path,$rev,undef);
+ 	return $dirents;
+ }
+ 
  package main;
  use URI;
  
@@@ -342,35 -349,16 +349,16 @@@ if ($opt_A) 
  
  open BRANCHES,">>", "$git_dir/svn2git";
  
- sub node_kind($$$) {
- 	my ($branch, $path, $revision) = @_;
+ sub node_kind($$) {
+ 	my ($svnpath, $revision) = @_;
  	my $pool=SVN::Pool->new;
- 	my $kind = $svn->{'svn'}->check_path(revert_split_path($branch,$path),$revision,$pool);
+ 	my $kind = $svn->{'svn'}->check_path($svnpath,$revision,$pool);
  	$pool->clear;
  	return $kind;
  }
  
- sub revert_split_path($$) {
- 	my($branch,$path) = @_;
- 
- 	my $svnpath;
- 	$path = "" if $path eq "/"; # this should not happen, but ...
- 	if($branch eq "/") {
- 		$svnpath = "$trunk_name/$path";
- 	} elsif($branch =~ m#^/#) {
- 		$svnpath = "$tag_name$branch/$path";
- 	} else {
- 		$svnpath = "$branch_name/$branch/$path";
- 	}
- 
- 	$svnpath =~ s#/+$##;
- 	return $svnpath;
- }
- 
  sub get_file($$$) {
- 	my($rev,$branch,$path) = @_;
- 
- 	my $svnpath = revert_split_path($branch,$path);
+ 	my($svnpath,$rev,$path) = @_;
  
  	# now get it
  	my ($name,$mode);
@@@ -413,10 -401,9 +401,9 @@@
  }
  
  sub get_ignore($$$$$) {
- 	my($new,$old,$rev,$branch,$path) = @_;
+ 	my($new,$old,$rev,$path,$svnpath) = @_;
  
  	return unless $opt_I;
- 	my $svnpath = revert_split_path($branch,$path);
  	my $name = $svn->ignore("$svnpath",$rev);
  	if ($path eq '/') {
  		$path = $opt_I;
@@@ -435,7 -422,7 +422,7 @@@
  		close $F;
  		unlink $name;
  		push(@$new,['0644',$sha,$path]);
- 	} else {
+ 	} elsif (defined $old) {
  		push(@$old,$path);
  	}
  }
@@@ -480,6 -467,27 +467,27 @@@ sub branch_rev($$) 
  	return $therev;
  }
  
+ sub expand_svndir($$$);
+ 
+ sub expand_svndir($$$)
+ {
+ 	my ($svnpath, $rev, $path) = @_;
+ 	my @list;
+ 	get_ignore(\@list, undef, $rev, $path, $svnpath);
+ 	my $dirents = $svn->dir_list($svnpath, $rev);
+ 	foreach my $p(keys %$dirents) {
+ 		my $kind = node_kind($svnpath.'/'.$p, $rev);
+ 		if ($kind eq $SVN::Node::file) {
+ 			my $f = get_file($svnpath.'/'.$p, $rev, $path.'/'.$p);
+ 			push(@list, $f) if $f;
+ 		} elsif ($kind eq $SVN::Node::dir) {
+ 			push(@list,
+ 			     expand_svndir($svnpath.'/'.$p, $rev, $path.'/'.$p));
+ 		}
+ 	}
+ 	return @list;
+ }
+ 
  sub copy_path($$$$$$$$) {
  	# Somebody copied a whole subdirectory.
  	# We need to find the index entries from the old version which the
@@@ -488,8 -496,11 +496,11 @@@
  	my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
  
  	my($srcbranch,$srcpath) = split_path($rev,$oldpath);
- 	unless(defined $srcbranch) {
- 		print "Path not found when copying from $oldpath @ $rev\n";
+ 	unless(defined $srcbranch && defined $srcpath) {
+ 		print "Path not found when copying from $oldpath @ $rev.\n".
+ 			"Will try to copy from original SVN location...\n"
+ 			if $opt_v;
+ 		push (@$new, expand_svndir($oldpath, $rev, $path));
  		return;
  	}
  	my $therev = branch_rev($srcbranch, $rev);
@@@ -503,7 -514,7 +514,7 @@@
  	}
  	print "$newrev:$newbranch:$path: copying from $srcbranch:$srcpath @ $rev\n" if $opt_v;
  	if ($node_kind eq $SVN::Node::dir) {
- 			$srcpath =~ s#/*$#/#;
+ 		$srcpath =~ s#/*$#/#;
  	}
  	
  	my $pid = open my $f,'-|';
@@@ -582,10 -593,12 +593,12 @@@ sub commit 
  		if(defined $oldpath) {
  			my $p;
  			($parent,$p) = split_path($revision,$oldpath);
- 			if($parent eq "/") {
- 				$parent = $opt_o;
- 			} else {
- 				$parent =~ s#^/##; # if it's a tag
+ 			if(defined $parent) {
+ 				if($parent eq "/") {
+ 					$parent = $opt_o;
+ 				} else {
+ 					$parent =~ s#^/##; # if it's a tag
+ 				}
  			}
  		} else {
  			$parent = undef;
@@@ -651,9 -664,10 +664,10 @@@
  				push(@old,$path); # remove any old stuff
  			}
  			if(($action->[0] eq "A") || ($action->[0] eq "R")) {
- 				my $node_kind = node_kind($branch,$path,$revision);
+ 				my $node_kind = node_kind($action->[3], $revision);
  				if ($node_kind eq $SVN::Node::file) {
- 					my $f = get_file($revision,$branch,$path);
+ 					my $f = get_file($action->[3],
+ 							 $revision, $path);
  					if ($f) {
  						push(@new,$f) if $f;
  					} else {
@@@ -668,19 -682,20 +682,20 @@@
  							  \@new, \@parents);
  					} else {
  						get_ignore(\@new, \@old, $revision,
- 							   $branch, $path);
+ 							   $path, $action->[3]);
  					}
  				}
  			} elsif ($action->[0] eq "D") {
  				push(@old,$path);
  			} elsif ($action->[0] eq "M") {
- 				my $node_kind = node_kind($branch,$path,$revision);
+ 				my $node_kind = node_kind($action->[3], $revision);
  				if ($node_kind eq $SVN::Node::file) {
- 					my $f = get_file($revision,$branch,$path);
+ 					my $f = get_file($action->[3],
+ 							 $revision, $path);
  					push(@new,$f) if $f;
  				} elsif ($node_kind eq $SVN::Node::dir) {
  					get_ignore(\@new, \@old, $revision,
- 						   $branch,$path);
+ 						   $path, $action->[3]);
  				}
  			} else {
  				die "$revision: unknown action '".$action->[0]."' for $path\n";
@@@ -838,7 -853,7 +853,7 @@@
  		print $out ("object $cid\n".
  		    "type commit\n".
  		    "tag $dest\n".
 -		    "tagger $committer_name <$committer_email>\n") and
 +		    "tagger $committer_name <$committer_email> 0 +0000\n") and
  		close($out)
  		    or die "Cannot create tag object $dest: $!\n";