git-cvsimport-script: remove unused variable

[git.git] / git-cvsimport-script

diff --git a/git-cvsimport-script b/git-cvsimport-script
index cc68460..3e6d22e 100755 (executable)
--- 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,19 +28,19 @@ use POSIX qw(strftime dup2);
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 
-our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C);
+our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C,$opt_z);
 
 sub usage() {
        print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from CVS
-          [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
-       [ -p opts-for-cvsps ] [ -C GIT_repository ]
+       [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
+       [ -p opts-for-cvsps ] [ -C GIT_repository ] [ -z fuzz ]
        [ CVS_module ]
 END
        exit(1);
 }
 
-getopts("hqvo:d:p:C:") or usage();
+getopts("hqvo:d:p:C:z:") or usage();
 usage if $opt_h;
 
 @ARGV <= 1 or usage();
@@ -357,8 +359,6 @@ sub pmode($) {
        return $m;
 }
 
-my $tmpcv = "/var/cache/cvs";
-
 sub getwd() {
        my $pwd = `pwd`;
        chomp $pwd;
@@ -377,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 $?;
@@ -398,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))) {
@@ -425,7 +435,8 @@ die "Cannot fork: $!\n" unless defined $pid;
 unless($pid) {
        my @opt;
        @opt = split(/,/,$opt_p) if defined $opt_p;
-       exec("cvsps",@opt,"-x","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
+       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";
 }
 
@@ -498,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) {
@@ -640,14 +651,10 @@ while(<CVS>) {
                }
                if(($ancestor || $branch) ne $last_branch) {
                        print "Switching from $last_branch to $branch\n" if $opt_v;
-                       system("git-read-tree","-m","$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";
@@ -686,26 +693,23 @@ while(<CVS>) {
 }
 &$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 $?;
 }
-
-if ($orig_branch) {
-       system("git-read-tree",$last_branch);
-       die "read-tree failed: $?\n" if $?;
-} else {
-       system('git-read-tree', $orig_branch);
-       die "read-tree failed: $?\n" if $?;
-       system('git-checkout-cache', '-a');
-       die "checkout-cache failed: $?\n" if $?;
-}
-
-unlink("$git_dir/HEAD");
-symlink("refs/heads/$orig_branch","$git_dir/HEAD");
-