X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport-script;h=3e6d22e74201360fd7520f7b52e91d76e4065572;hb=fc6e714c838846aad566528f6ada904651c514f9;hp=9b23d1f0169b8c9a1a9358ac4706b557634476ae;hpb=4f7c0caa8f37934fa05f22a48a987a6e14dd0e07;p=git.git diff --git a/git-cvsimport-script b/git-cvsimport-script index 9b23d1f0..3e6d22e7 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -16,6 +16,8 @@ use strict; use warnings; use Getopt::Std; +use File::Spec; +use File::Temp qw(tempfile); use File::Path qw(mkpath); use File::Basename qw(basename dirname); use Time::Local; @@ -26,34 +28,53 @@ use POSIX qw(strftime dup2); $SIG{'PIPE'}="IGNORE"; $ENV{'TZ'}="UTC"; -our($opt_h,$opt_o,$opt_v,$opt_d); +our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C,$opt_z); sub usage() { print STDERR <; + chomp $opt_d; + close $f; + $ENV{"CVSROOT"} = $opt_d; } elsif($ENV{"CVSROOT"}) { $opt_d = $ENV{"CVSROOT"}; } else { die "CVSROOT needs to be set"; } $opt_o ||= "origin"; +my $git_tree = $opt_C; $git_tree ||= "."; +my $cvs_tree; +if ($#ARGV == 0) { + $cvs_tree = $ARGV[0]; +} elsif (-f 'CVS/Repository') { + open my $f, '<', 'CVS/Repository' or + die 'Failed to open CVS/Repository'; + $cvs_tree = <$f>; + chomp $cvs_tree; + close $f +} else { + usage(); +} + select(STDERR); $|=1; select(STDOUT); @@ -61,6 +82,8 @@ package CVSconn; # Basic CVS dialog. # We're only interested in connecting and downloading, so ... +use File::Spec; +use File::Temp qw(tempfile); use POSIX qw(strftime dup2); sub new { @@ -124,11 +147,32 @@ sub conn { } $self->{'socketo'} = $s; $self->{'socketi'} = $s; - } else { # local: Fork off our own cvs server. + } else { # local or ext: Fork off our own cvs server. my $pr = IO::Pipe->new(); my $pw = IO::Pipe->new(); my $pid = fork(); die "Fork: $!\n" unless defined $pid; + my $cvs = 'cvs'; + $cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER}; + my $rsh = 'rsh'; + $rsh = $ENV{CVS_RSH} if exists $ENV{CVS_RSH}; + + my @cvs = ($cvs, 'server'); + my ($local, $user, $host); + $local = $repo =~ s/:local://; + if (!$local) { + $repo =~ s/:ext://; + $local = !($repo =~ s/^(?:([^\@:]+)\@)?([^:]+)://); + ($user, $host) = ($1, $2); + } + if (!$local) { + if ($user) { + unshift @cvs, $rsh, '-l', $user, $host; + } else { + unshift @cvs, $rsh, $host; + } + } + unless($pid) { $pr->writer(); $pw->reader(); @@ -136,7 +180,7 @@ sub conn { dup2($pr->fileno(),1); $pr->close(); $pw->close(); - exec("cvs","server"); + exec(@cvs); } $pw->writer(); $pr->reader(); @@ -191,11 +235,11 @@ sub _file { sub _line { # Read a line from the server. # ... except that 'line' may be an entire file. ;-) - my($self) = @_; + my($self, $fh) = @_; die "Not in lines" unless defined $self->{'lines'}; my $line; - my $res=""; + my $res=0; while(defined($line = $self->readline())) { # M U gnupg-cvs-rep/AUTHORS # Updated gnupg-cvs-rep/ @@ -215,16 +259,18 @@ sub _line { chomp $cnt; die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/; $line=""; - $res=""; + $res=0; while($cnt) { my $buf; my $num = $self->{'socketi'}->read($buf,$cnt); die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0; - $res .= $buf; + print $fh $buf; + $res += $num; $cnt -= $num; } } elsif($line =~ s/^ //) { - $res .= $line; + print $fh $line; + $res += length($line); } elsif($line =~ /^M\b/) { # output, do nothing } elsif($line =~ /^Mbinary\b/) { @@ -237,7 +283,8 @@ sub _line { my $buf; my $num = $self->{'socketi'}->read($buf,$cnt); die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0; - $res .= $buf; + print $fh $buf; + $res += $num; $cnt -= $num; } } else { @@ -257,18 +304,21 @@ sub file { my($self,$fn,$rev) = @_; my $res; - if ($self->_file($fn,$rev)) { - $res = $self->_line(); - return $res if defined $res; + my ($fh, $name) = tempfile('gitcvs.XXXXXX', + DIR => File::Spec->tmpdir(), UNLINK => 1); + + $self->_file($fn,$rev) and $res = $self->_line($fh); + + if (!defined $res) { + # retry + $self->conn(); + $self->_file($fn,$rev) + or die "No file command send\n"; + $res = $self->_line($fh); + die "No input: $fn $rev\n" unless defined $res; } - # retry - $self->conn(); - $self->_file($fn,$rev) - or die "No file command send\n"; - $res = $self->_line(); - die "No input: $fn $rev\n" unless defined $res; - return $res; + return ($name, $res); } @@ -309,8 +359,6 @@ sub pmode($) { return $m; } -my $tmpcv = "/var/cache/cvs"; - sub getwd() { my $pwd = `pwd`; chomp $pwd; @@ -329,6 +377,12 @@ my %branch_date; my $git_dir = $ENV{"GIT_DIR"} || ".git"; $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#; $ENV{"GIT_DIR"} = $git_dir; +my $orig_git_index; +$orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE}; +my ($git_ih, $git_index) = tempfile('gitXXXXXX', SUFFIX => '.idx', + DIR => File::Spec->tmpdir()); +close ($git_ih); +$ENV{GIT_INDEX_FILE} = $git_index; unless(-d $git_dir) { system("git-init-db"); die "Cannot init the GIT db at $git_tree: $?\n" if $?; @@ -338,6 +392,11 @@ unless(-d $git_dir) { $last_branch = $opt_o; $orig_branch = ""; } else { + -f "$git_dir/refs/heads/$opt_o" + or die "Branch '$opt_o' does not exist.\n". + "Either use the correct '-o branch' option,\n". + "or import to a new repository.\n"; + $last_branch = basename(readlink("$git_dir/HEAD")); unless($last_branch) { warn "Cannot read the last branch name: $! -- assuming 'master'\n"; @@ -345,6 +404,10 @@ unless(-d $git_dir) { } $orig_branch = $last_branch; + # populate index + system('git-read-tree', $last_branch); + die "read-tree failed: $?\n" if $?; + # Get the last import timestamps opendir(D,"$git_dir/refs/heads"); while(defined(my $head = readdir(D))) { @@ -370,7 +433,10 @@ unless(-d $git_dir) { my $pid = open(CVS,"-|"); die "Cannot fork: $!\n" unless defined $pid; unless($pid) { - exec("cvsps","-A","--cvs-direct",$cvs_tree); + my @opt; + @opt = split(/,/,$opt_p) if defined $opt_p; + unshift @opt, '-z', $opt_z if defined $opt_z; + exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree); die "Could not start cvsps: $!\n"; } @@ -410,13 +476,14 @@ my $commit = sub { } while(@new) { my @n2; - if(@new > 55) { - @n2 = splice(@new,0,50); + if(@new > 12) { + @n2 = splice(@new,0,10); } else { @n2 = @new; @new = (); } - system("git-update-cache","--add","--",@n2); + system("git-update-cache","--add", + (map { ('--cacheinfo', @$_) } @n2)); die "Cannot add files: $?\n" if $?; } @@ -442,8 +509,8 @@ my $commit = sub { print "Parent ID $parent\n" if $opt_v; } - my $pr = IO::Pipe->new(); - my $pw = IO::Pipe->new(); + my $pr = IO::Pipe->new() or die "Cannot open pipe: $!\n"; + my $pw = IO::Pipe->new() or die "Cannot open pipe: $!\n"; $pid = fork(); die "Fork: $!\n" unless defined $pid; unless($pid) { @@ -468,7 +535,12 @@ my $commit = sub { } $pw->writer(); $pr->reader(); - print $pw $logmsg + + # compatibility with git2cvs + substr($logmsg,32767) = "" if length($logmsg) > 32767; + $logmsg =~ s/[\s\n]+\z//; + + print $pw "$logmsg\n" or die "Error writing to git-commit-tree: $!\n"; $pw->close(); @@ -498,9 +570,6 @@ my $commit = sub { or die "Cannot write tag $branch: $!\n"; print "Created tag '$tag' on '$branch'\n" if $opt_v; } - - @old = (); - @new = (); }; while() { @@ -532,7 +601,7 @@ while() { } elsif($state == 5 and s/^Ancestor branch:\s+//) { s/\s+$//; $ancestor = $_; - $ancestor = $opt_o if $ancestor == "HEAD"; + $ancestor = $opt_o if $ancestor eq "HEAD"; $state = 6; } elsif($state == 5) { $ancestor = undef; @@ -553,7 +622,7 @@ while() { $branch = $opt_o if $branch eq "HEAD"; if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) { # skip - print "skip patchset $patchset: $date before $branch_date{$branch}\n"; + print "skip patchset $patchset: $date before $branch_date{$branch}\n" if $opt_v; $state = 11; next; } @@ -582,14 +651,10 @@ while() { } if(($ancestor || $branch) ne $last_branch) { print "Switching from $last_branch to $branch\n" if $opt_v; - system("git-read-tree","-m","-u","$last_branch","$branch"); + system("git-read-tree", $branch); die "read-tree failed: $?\n" if $?; } - if($branch ne $last_branch) { - unlink("$git_dir/HEAD"); - symlink("refs/heads/$branch","$git_dir/HEAD"); - $last_branch = $branch; - } + $last_branch = $branch if $branch ne $last_branch; $state = 9; } elsif($state == 8) { $logmsg .= "$_\n"; @@ -599,17 +664,16 @@ while() { my $fn = $1; my $rev = $3; $fn =~ s#^/+##; - my $data = $cvs->file($fn,$rev); - print "".($init ? "New" : "Update")." $fn: ".length($data)." bytes.\n"; - mkpath(dirname($fn),$opt_v); - open(F,"> ./$fn") - or die "Cannot create '$fn': $!\n"; - print F $data - or die "Cannot write to '$fn': $!\n"; - close(F) - or die "Cannot write to '$fn': $!\n"; - chmod(pmode($cvs->{'mode'}), $fn); - push(@new,$fn); # may be resurrected! + my ($tmpname, $size) = $cvs->file($fn,$rev); + print "".($init ? "New" : "Update")." $fn: $size bytes.\n" if $opt_v; + open my $F, '-|', "git-write-blob $tmpname" + or die "Cannot create object: $!\n"; + my $sha = <$F>; + chomp $sha; + close $F; + unlink($tmpname); + my $mode = pmode($cvs->{'mode'}); + push(@new,[$mode, $sha, $fn]); # may be resurrected! } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) { my $fn = $1; $fn =~ s#^/+##; @@ -629,19 +693,23 @@ while() { } &$commit() if $branch and $state != 11; +unlink($git_index); + # Now switch back to the branch we were in before all of this happened if($orig_branch) { - print "DONE; switching back to $orig_branch\n" if $opt_v; + print "DONE\n" if $opt_v; } else { $orig_branch = "master"; print "DONE; creating $orig_branch branch\n" if $opt_v; system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master") unless -f "$git_dir/refs/heads/master"; + unlink("$git_dir/HEAD"); + symlink("refs/heads/$orig_branch","$git_dir/HEAD"); + if (defined $orig_git_index) { + $ENV{GIT_INDEX_FILE} = $orig_git_index; + } else { + delete $ENV{GIT_INDEX_FILE}; + } + system('git checkout'); + die "checkout failed: $?\n" if $?; } - -system("git-read-tree","-m","-u","$last_branch","$orig_branch"); -die "read-tree failed: $?\n" if $?; - -unlink("$git_dir/HEAD"); -symlink("refs/heads/$orig_branch","$git_dir/HEAD"); -