[thirdparty/git.git] / git-cvsimport-script

#!/usr/bin/perl -w

# This tool is copyright (c) 2005, Matthias Urlichs.
# It is released under the Gnu Public License, version 2.
#
# The basic idea is to aggregate CVS check-ins into related changes.
# Fortunately, "cvsps" does that for us; all we have to do is to parse
# its output.
#
# Checking out the files is done by a single long-running CVS connection
# / server process.
#
# The head revision is on branch "origin" by default.
# You can change that with the '-o' option.

use strict;
use warnings;
use Getopt::Std;
use File::Path qw(mkpath);
use File::Basename qw(basename dirname);
use Time::Local;
use IO::Socket;
use IO::Pipe;
use POSIX qw(strftime dup2);

$SIG{'PIPE'}="IGNORE";
$ENV{'TZ'}="UTC";

our($opt_h,$opt_o,$opt_v,$opt_d);

sub usage() {
	print STDERR <<END;
Usage: ${\basename $0}     # fetch/update GIT from CVS
	   [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
       CVS_module [ GIT_repository ]
END
	exit(1);
}

getopts("hqvo:d:") or usage();
usage if $opt_h;

@ARGV == 1 or @ARGV == 2 or usage();

my($cvs_tree, $git_tree) = @ARGV;

if($opt_d) {
	$ENV{"CVSROOT"} = $opt_d;
} elsif($ENV{"CVSROOT"}) {
	$opt_d = $ENV{"CVSROOT"};
} else {
	die "CVSROOT needs to be set";
}
$opt_o ||= "origin";
$git_tree ||= ".";

select(STDERR); $|=1; select(STDOUT);


package CVSconn;
# Basic CVS dialog.
# We're only interested in connecting and downloading, so ...

use POSIX qw(strftime dup2);

sub new {
	my($what,$repo,$subdir) = @_;
	$what=ref($what) if ref($what);

	my $self = {};
	$self->{'buffer'} = "";
	bless($self,$what);

	$repo =~ s#/+$##;
	$self->{'fullrep'} = $repo;
	$self->conn();

	$self->{'subdir'} = $subdir;
	$self->{'lines'} = undef;

	return $self;
}

sub conn {
	my $self = shift;
	my $repo = $self->{'fullrep'};
	if($repo =~ s/^:pserver:(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?//) {
		my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
		$user="anonymous" unless defined $user;
		my $rr2 = "-";
		unless($port) {
			$rr2 = ":pserver:$user\@$serv:$repo";
			$port=2401;
		}
		my $rr = ":pserver:$user\@$serv:$port$repo";

		unless($pass) {
			open(H,$ENV{'HOME'}."/.cvspass") and do {
				# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
				while(<H>) {
					chomp;
					s/^\/\d+\s+//;
					my ($w,$p) = split(/\s/,$_,2);
					if($w eq $rr or $w eq $rr2) {
						$pass = $p;
						last;
					}
				}
			};
		}
		$pass="A" unless $pass;

		my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
		die "Socket to $serv: $!\n" unless defined $s;
		$s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
			or die "Write to $serv: $!\n";
		$s->flush();

		my $rep = <$s>;

		if($rep ne "I LOVE YOU\n") {
			$rep="<unknown>" unless $rep;
			die "AuthReply: $rep\n";
		}
		$self->{'socketo'} = $s;
		$self->{'socketi'} = $s;
	} else { # local: 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;
		unless($pid) {
			$pr->writer();
			$pw->reader();
			dup2($pw->fileno(),0);
			dup2($pr->fileno(),1);
			$pr->close();
			$pw->close();
			exec("cvs","server");
		}
		$pw->writer();
		$pr->reader();
		$self->{'socketo'} = $pw;
		$self->{'socketi'} = $pr;
	}
	$self->{'socketo'}->write("Root $repo\n");

	# Trial and error says that this probably is the minimum set
	$self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");

	$self->{'socketo'}->write("valid-requests\n");
	$self->{'socketo'}->flush();

	chomp(my $rep=$self->readline());
	if($rep !~ s/^Valid-requests\s*//) {
		$rep="<unknown>" unless $rep;
		die "Expected Valid-requests from server, but got: $rep\n";
	}
	chomp(my $res=$self->readline());
	die "validReply: $res\n" if $res ne "ok";

	$self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
	$self->{'repo'} = $repo;
}

sub readline {
	my($self) = @_;
	return $self->{'socketi'}->getline();
}

sub _file {
	# Request a file with a given revision.
	# Trial and error says this is a good way to do it. :-/
	my($self,$fn,$rev) = @_;
	$self->{'socketo'}->write("Argument -N\n") or return undef;
	$self->{'socketo'}->write("Argument -P\n") or return undef;
	# $self->{'socketo'}->write("Argument -ko\n") or return undef;
	# -ko: Linus' version doesn't use it
	$self->{'socketo'}->write("Argument -r\n") or return undef;
	$self->{'socketo'}->write("Argument $rev\n") or return undef;
	$self->{'socketo'}->write("Argument --\n") or return undef;
	$self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
	$self->{'socketo'}->write("Directory .\n") or return undef;
	$self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
	$self->{'socketo'}->write("Sticky T1.1\n") or return undef;
	$self->{'socketo'}->write("co\n") or return undef;
	$self->{'socketo'}->flush() or return undef;
	$self->{'lines'} = 0;
	return 1;
}
sub _line {
	# Read a line from the server.
	# ... except that 'line' may be an entire file. ;-)
	my($self) = @_;
	die "Not in lines" unless defined $self->{'lines'};

	my $line;
	my $res="";
	while(defined($line = $self->readline())) {
		# M U gnupg-cvs-rep/AUTHORS
		# Updated gnupg-cvs-rep/
		# /daten/src/rsync/gnupg-cvs-rep/AUTHORS
		# /AUTHORS/1.1///T1.1
		# u=rw,g=rw,o=rw
		# 0
		# ok

		if($line =~ s/^(?:Created|Updated) //) {
			$line = $self->readline(); # path
			$line = $self->readline(); # Entries line
			my $mode = $self->readline(); chomp $mode;
			$self->{'mode'} = $mode;
			defined (my $cnt = $self->readline())
				or die "EOF from server after 'Changed'\n";
			chomp $cnt;
			die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
			$line="";
			$res="";
			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;
				$cnt -= $num;
			}
		} elsif($line =~ s/^ //) {
			$res .= $line;
		} elsif($line =~ /^M\b/) {
			# output, do nothing
		} elsif($line =~ /^Mbinary\b/) {
			my $cnt;
			die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
			chomp $cnt;
			die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
			$line="";
			while($cnt) {
				my $buf;
				my $num = $self->{'socketi'}->read($buf,$cnt);
				die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
				$res .= $buf;
				$cnt -= $num;
			}
		} else {
			chomp $line;
			if($line eq "ok") {
				# print STDERR "S: ok (".length($res).")\n";
				return $res;
			} elsif($line =~ s/^E //) {
				# print STDERR "S: $line\n";
			} else {
				die "Unknown: $line\n";
			}
		}
	}
}
sub file {
	my($self,$fn,$rev) = @_;
	my $res;

	if ($self->_file($fn,$rev)) {
		$res = $self->_line();
		return $res if 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;
}


package main;

my $cvs = CVSconn->new($opt_d, $cvs_tree);


sub pdate($) {
	my($d) = @_;
	m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
		or die "Unparseable date: $d\n";
	my $y=$1; $y-=1900 if $y>1900;
	return timegm($6||0,$5,$4,$3,$2-1,$y);
}

sub pmode($) {
	my($mode) = @_;
	my $m = 0;
	my $mm = 0;
	my $um = 0;
	for my $x(split(//,$mode)) {
		if($x eq ",") {
			$m |= $mm&$um;
			$mm = 0;
			$um = 0;
		} elsif($x eq "u") { $um |= 0700;
		} elsif($x eq "g") { $um |= 0070;
		} elsif($x eq "o") { $um |= 0007;
		} elsif($x eq "r") { $mm |= 0444;
		} elsif($x eq "w") { $mm |= 0222;
		} elsif($x eq "x") { $mm |= 0111;
		} elsif($x eq "=") { # do nothing
		} else { die "Unknown mode: $mode\n";
		}
	}
	$m |= $mm&$um;
	return $m;
}

my $tmpcv = "/var/cache/cvs";

sub getwd() {
	my $pwd = `pwd`;
	chomp $pwd;
	return $pwd;
}

-d $git_tree
	or mkdir($git_tree,0777)
	or die "Could not create $git_tree: $!";
chdir($git_tree);

my $last_branch = "";
my %branch_date;

my $git_dir = $ENV{"GIT_DIR"} || ".git";
$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
$ENV{"GIT_DIR"} = $git_dir;
unless(-d $git_dir) {
	system("git-init-db");
	die "Cannot init the GIT db at $git_tree: $?\n" if $?;
	system("git-read-tree");
	die "Cannot init an empty tree: $?\n" if $?;

	$last_branch = $opt_o;
} else {
	$last_branch = basename(readlink("$git_dir/HEAD"));
	die "Cannot read the last branch name: $!\n" unless $last_branch;

	# Get the last import timestamps
	opendir(D,"$git_dir/refs/heads");
	while(defined(my $head = readdir(D))) {
		next if $head =~ /^\./;
		open(F,"$git_dir/refs/heads/$head")
			or die "Bad head branch: $head: $!\n";
		chomp(my $ftag = <F>);
		close(F);
		open(F,"git-cat-file commit $ftag |");
		while(<F>) {
			next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
			$branch_date{$head} = $1;
			last;
		}
		close(F);
	}
	closedir(D);
}

-d $git_dir
	or die "Could not create git subdir ($git_dir).\n";

my $pid = open(CVS,"-|");
die "Cannot fork: $!\n" unless defined $pid;
unless($pid) {
	exec("cvsps","-A","--cvs-direct",$cvs_tree);
	die "Could not start cvsps: $!\n";
}


## cvsps output:
#---------------------
#PatchSet 314
#Date: 1999/09/18 13:03:59
#Author: wkoch
#Branch: STABLE-BRANCH-1-0
#Ancestor branch: HEAD
#Tag: (none)
#Log:
#    See ChangeLog: Sat Sep 18 13:03:28 CEST 1999  Werner Koch
#Members:
#	README:1.57->1.57.2.1
#	VERSION:1.96->1.96.2.1
#
#---------------------

my $state = 0;

my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
my(@old,@new);
my $commit = sub {
	my $pid;
	system("git-update-cache","--force-remove","--",@old) if @old;
	die "Cannot remove files: $?\n" if $?;
	system("git-update-cache","--add","--",@new) if @new;
	die "Cannot add files: $?\n" if $?;

	$pid = open(C,"-|");
	die "Cannot fork: $!" unless defined $pid;
	unless($pid) {
		exec("git-write-tree");
		die "Cannot exec git-write-tree: $!\n";
	}
	chomp(my $tree = <C>);
	length($tree) == 40
		or die "Cannot get tree id ($tree): $!\n";
	close(C)
		or die "Error running git-write-tree: $?\n";
	print "Tree ID $tree\n" if $opt_v;

	my $parent = "";
	if(open(C,"$git_dir/refs/heads/$last_branch")) {
		chomp($parent = <C>);
		close(C);
		length($parent) == 40
			or die "Cannot get parent id ($parent): $!\n";
		print "Parent ID $parent\n" if $opt_v;
	}

	my $pr = IO::Pipe->new();
	my $pw = IO::Pipe->new();
	$pid = fork();
	die "Fork: $!\n" unless defined $pid;
	unless($pid) {
		$pr->writer();
		$pw->reader();
		dup2($pw->fileno(),0);
		dup2($pr->fileno(),1);
		$pr->close();
		$pw->close();

		my @par = ();
		@par = ("-p",$parent) if $parent;
		exec("env",
			"GIT_AUTHOR_NAME=$author",
			"GIT_AUTHOR_EMAIL=$author",
			"GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
			"GIT_COMMITTER_NAME=$author",
			"GIT_COMMITTER_EMAIL=$author",
			"GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
			"git-commit-tree", $tree,@par);
		die "Cannot exec git-commit-tree: $!\n";
	}
	$pw->writer();
	$pr->reader();
	print $pw $logmsg
		or die "Error writing to git-commit-tree: $!\n";
	$pw->close();

	print "Committed patch $patchset ($branch)\n" if $opt_v;
	chomp(my $cid = <$pr>);
	length($cid) == 40
		or die "Cannot get commit id ($cid): $!\n";
	print "Commit ID $cid\n" if $opt_v;
	$pr->close();

	waitpid($pid,0);
	die "Error running git-commit-tree: $?\n" if $?;

	open(C,">$git_dir/refs/heads/$branch")
		or die "Cannot open branch $branch for update: $!\n";
	print C "$cid\n"
		or die "Cannot write branch $branch for update: $!\n";
	close(C)
		or die "Cannot write branch $branch for update: $!\n";

	if($tag) {
		open(C,">$git_dir/refs/tags/$tag")
			or die "Cannot create tag $tag: $!\n";
		print C "$cid\n"
			or die "Cannot write tag $branch: $!\n";
		close(C)
			or die "Cannot write tag $branch: $!\n";
		print "Created tag '$tag' on '$branch'\n" if $opt_v;
	}

	@old = ();
	@new = ();
};

while(<CVS>) {
	chomp;
	if($state == 0 and /^-+$/) {
		$state = 1;
	} elsif($state == 0) {
		$state = 1;
		redo;
	} elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
		$patchset = 0+$_;
		$state=2;
	} elsif($state == 2 and s/^Date:\s+//) {
		$date = pdate($_);
		unless($date) {
			print STDERR "Could not parse date: $_\n";
			$state=0;
			next;
		}
		$state=3;
	} elsif($state == 3 and s/^Author:\s+//) {
		s/\s+$//;
		$author = $_;
		$state = 4;
	} elsif($state == 4 and s/^Branch:\s+//) {
		s/\s+$//;
		$branch = $_;
		$state = 5;
	} elsif($state == 5 and s/^Ancestor branch:\s+//) {
		s/\s+$//;
		$ancestor = $_;
		$ancestor = $opt_o if $ancestor == "HEAD";
		$state = 6;
	} elsif($state == 5) {
		$ancestor = undef;
		$state = 6;
		redo;
	} elsif($state == 6 and s/^Tag:\s+//) {
		s/\s+$//;
		if($_ eq "(none)") {
			$tag = undef;
		} else {
			$tag = $_;
		}
		$state = 7;
	} elsif($state == 7 and /^Log:/) {
		$logmsg = "";
		$state = 8;
	} elsif($state == 8 and /^Members:/) {
		$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";
			$state = 11;
			next;
		}
		if($ancestor) {
			if(-f "$git_dir/refs/heads/$branch") {
				print STDERR "Branch $branch already exists!\n";
				$state=11;
				next;
			}
			unless(open(H,"$git_dir/refs/heads/$ancestor")) {
				print STDERR "Branch $ancestor does not exist!\n";
				$state=11;
				next;
			}
			chomp(my $id = <H>);
			close(H);
			unless(open(H,"> $git_dir/refs/heads/$branch")) {
				print STDERR "Could not create branch $branch: $!\n";
				$state=11;
				next;
			}
			print H "$id\n"
				or die "Could not write branch $branch: $!";
			close(H)
				or die "Could not write branch $branch: $!";
		}
		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");
			die "read-tree $branch failed at $branch: $?\n" if $?;
		}
		if($branch ne $last_branch) {
			unlink("$git_dir/HEAD");
			symlink("refs/heads/$branch","$git_dir/HEAD");
			$last_branch = $branch;
		}
		$state = 9;
	} elsif($state == 8) {
		$logmsg .= "$_\n";
	} elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
#	VERSION:1.96->1.96.2.1
		my $init = ($2 eq "INITIAL");
		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!
	} elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
		my $fn = $1;
		$fn =~ s#^/+##;
		push(@old,$fn);
	} elsif($state == 9 and /^\s*$/) {
		$state = 10;
	} elsif(($state == 9 or $state == 10) and /^-+$/) {
		&$commit();
		$state = 1;
	} elsif($state == 11 and /^-+$/) {
		$state = 1;
	} elsif(/^-+$/) { # end of unknown-line processing
		$state = 1;
	} elsif($state != 11) { # ignore stuff when skipping
		print "* UNKNOWN LINE * $_\n";
	}
}
&$commit() if $branch and $state != 11;

print "DONE\n" if $opt_v;
Commit	Line	Data
a57a9493	1	#!/usr/bin/perl -w
9718a00b	2
a57a9493 MU	3	# This tool is copyright (c) 2005, Matthias Urlichs.
	4	# It is released under the Gnu Public License, version 2.
	5	#
	6	# The basic idea is to aggregate CVS check-ins into related changes.
	7	# Fortunately, "cvsps" does that for us; all we have to do is to parse
	8	# its output.
	9	#
	10	# Checking out the files is done by a single long-running CVS connection
	11	# / server process.
	12	#
	13	# The head revision is on branch "origin" by default.
	14	# You can change that with the '-o' option.
	15
	16	use strict;
	17	use warnings;
	18	use Getopt::Std;
	19	use File::Path qw(mkpath);
	20	use File::Basename qw(basename dirname);
	21	use Time::Local;
2a3e1a85 MU	22	use IO::Socket;
	23	use IO::Pipe;
	24	use POSIX qw(strftime dup2);
a57a9493 MU	25
	26	$SIG{'PIPE'}="IGNORE";
	27	$ENV{'TZ'}="UTC";
	28
2a3e1a85	29	our($opt_h,$opt_o,$opt_v,$opt_d);
a57a9493 MU	30
	31	sub usage() {
	32	print STDERR <<END;
2a3e1a85 MU	33	Usage: ${\basename $0} # fetch/update GIT from CVS
	34	[ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
	35	CVS_module [ GIT_repository ]
a57a9493 MU	36	END
	37	exit(1);
	38	}
	39
2a3e1a85	40	getopts("hqvo:d:") or usage();
a57a9493 MU	41	usage if $opt_h;
a57a9493 MU	42
2a3e1a85	43	@ARGV == 1 or @ARGV == 2 or usage();
a57a9493 MU	44
	45	my($cvs_tree, $git_tree) = @ARGV;
	46
2a3e1a85 MU	47	if($opt_d) {
	48	$ENV{"CVSROOT"} = $opt_d;
	49	} elsif($ENV{"CVSROOT"}) {
	50	$opt_d = $ENV{"CVSROOT"};
	51	} else {
	52	die "CVSROOT needs to be set";
	53	}
	54	$opt_o \|\|= "origin";
	55	$git_tree \|\|= ".";
	56
a57a9493 MU	57	select(STDERR); $\|=1; select(STDOUT);
	58
	59
	60	package CVSconn;
	61	# Basic CVS dialog.
2a3e1a85	62	# We're only interested in connecting and downloading, so ...
a57a9493	63
f65ae603 MU	64	use POSIX qw(strftime dup2);
f65ae603 MU	65
a57a9493 MU	66	sub new {
	67	my($what,$repo,$subdir) = @_;
	68	$what=ref($what) if ref($what);
	69
	70	my $self = {};
	71	$self->{'buffer'} = "";
	72	bless($self,$what);
	73
	74	$repo =~ s#/+$##;
	75	$self->{'fullrep'} = $repo;
	76	$self->conn();
	77
	78	$self->{'subdir'} = $subdir;
	79	$self->{'lines'} = undef;
	80
	81	return $self;
	82	}
	83
	84	sub conn {
	85	my $self = shift;
	86	my $repo = $self->{'fullrep'};
	87	if($repo =~ s/^:pserver:(?:(.?)(?::(.?))?@)?([^:\/])(?::(\d))?//) {
	88	my($user,$pass,$serv,$port) = ($1,$2,$3,$4);
	89	$user="anonymous" unless defined $user;
2a3e1a85	90	my $rr2 = "-";
a57a9493 MU	91	unless($port) {
	92	$rr2 = ":pserver:$user\@$serv:$repo";
	93	$port=2401;
	94	}
	95	my $rr = ":pserver:$user\@$serv:$port$repo";
	96
	97	unless($pass) {
	98	open(H,$ENV{'HOME'}."/.cvspass") and do {
	99	# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
	100	while(<H>) {
	101	chomp;
	102	s/^\/\d+\s+//;
	103	my ($w,$p) = split(/\s/,$_,2);
	104	if($w eq $rr or $w eq $rr2) {
	105	$pass = $p;
	106	last;
	107	}
	108	}
	109	};
	110	}
	111	$pass="A" unless $pass;
	112
a57a9493 MU	113	my $s = IO::Socket::INET->new(PeerHost => $serv, PeerPort => $port);
	114	die "Socket to $serv: $!\n" unless defined $s;
	115	$s->write("BEGIN AUTH REQUEST\n$repo\n$user\n$pass\nEND AUTH REQUEST\n")
	116	or die "Write to $serv: $!\n";
	117	$s->flush();
	118
	119	my $rep = <$s>;
	120
	121	if($rep ne "I LOVE YOU\n") {
	122	$rep="<unknown>" unless $rep;
	123	die "AuthReply: $rep\n";
	124	}
	125	$self->{'socketo'} = $s;
	126	$self->{'socketi'} = $s;
	127	} else { # local: Fork off our own cvs server.
a57a9493 MU	128	my $pr = IO::Pipe->new();
	129	my $pw = IO::Pipe->new();
	130	my $pid = fork();
	131	die "Fork: $!\n" unless defined $pid;
	132	unless($pid) {
	133	$pr->writer();
	134	$pw->reader();
a57a9493 MU	135	dup2($pw->fileno(),0);
	136	dup2($pr->fileno(),1);
	137	$pr->close();
	138	$pw->close();
	139	exec("cvs","server");
	140	}
	141	$pw->writer();
	142	$pr->reader();
	143	$self->{'socketo'} = $pw;
	144	$self->{'socketi'} = $pr;
	145	}
	146	$self->{'socketo'}->write("Root $repo\n");
	147
	148	# Trial and error says that this probably is the minimum set
	149	$self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
	150
	151	$self->{'socketo'}->write("valid-requests\n");
	152	$self->{'socketo'}->flush();
	153
	154	chomp(my $rep=$self->readline());
	155	if($rep !~ s/^Valid-requests\s*//) {
	156	$rep="<unknown>" unless $rep;
	157	die "Expected Valid-requests from server, but got: $rep\n";
	158	}
	159	chomp(my $res=$self->readline());
	160	die "validReply: $res\n" if $res ne "ok";
	161
	162	$self->{'socketo'}->write("UseUnchanged\n") if $rep =~ /\bUseUnchanged\b/;
	163	$self->{'repo'} = $repo;
	164	}
	165
	166	sub readline {
	167	my($self) = @_;
	168	return $self->{'socketi'}->getline();
	169	}
	170
	171	sub _file {
	172	# Request a file with a given revision.
	173	# Trial and error says this is a good way to do it. :-/
	174	my($self,$fn,$rev) = @_;
	175	$self->{'socketo'}->write("Argument -N\n") or return undef;
	176	$self->{'socketo'}->write("Argument -P\n") or return undef;
	177	# $self->{'socketo'}->write("Argument -ko\n") or return undef;
	178	# -ko: Linus' version doesn't use it
	179	$self->{'socketo'}->write("Argument -r\n") or return undef;
	180	$self->{'socketo'}->write("Argument $rev\n") or return undef;
	181	$self->{'socketo'}->write("Argument --\n") or return undef;
	182	$self->{'socketo'}->write("Argument $self->{'subdir'}/$fn\n") or return undef;
	183	$self->{'socketo'}->write("Directory .\n") or return undef;
	184	$self->{'socketo'}->write("$self->{'repo'}\n") or return undef;
	185	$self->{'socketo'}->write("Sticky T1.1\n") or return undef;
	186	$self->{'socketo'}->write("co\n") or return undef;
	187	$self->{'socketo'}->flush() or return undef;
	188	$self->{'lines'} = 0;
	189	return 1;
	190	}
	191	sub _line {
	192	# Read a line from the server.
	193	# ... except that 'line' may be an entire file. ;-)
	194	my($self) = @_;
	195	die "Not in lines" unless defined $self->{'lines'};
	196
	197	my $line;
	198	my $res="";
199	while(defined($line = $self->readline())) {
200	# M U gnupg-cvs-rep/AUTHORS
201	# Updated gnupg-cvs-rep/
202	# /daten/src/rsync/gnupg-cvs-rep/AUTHORS
203	# /AUTHORS/1.1///T1.1
204	# u=rw,g=rw,o=rw
205	# 0
206	# ok
207
208	if($line =~ s/^(?:Created\|Updated) //) {
209	$line = $self->readline(); # path
210	$line = $self->readline(); # Entries line
211	my $mode = $self->readline(); chomp $mode;
212	$self->{'mode'} = $mode;
213	defined (my $cnt = $self->readline())
214	or die "EOF from server after 'Changed'\n";
215	chomp $cnt;
216	die "Duh: Filesize $cnt" if $cnt !~ /^\d+$/;
217	$line="";
218	$res="";
219	while($cnt) {
220	my $buf;
221	my $num = $self->{'socketi'}->read($buf,$cnt);
222	die "Server: Filesize $cnt: $num: $!\n" if not defined $num or $num<=0;
223	$res .= $buf;
224	$cnt -= $num;
225	}
226	} elsif($line =~ s/^ //) {
227	$res .= $line;
228	} elsif($line =~ /^M\b/) {
229	# output, do nothing
230	} elsif($line =~ /^Mbinary\b/) {
231	my $cnt;
232	die "EOF from server after 'Mbinary'" unless defined ($cnt = $self->readline());
233	chomp $cnt;
234	die "Duh: Mbinary $cnt" if $cnt !~ /^\d+$/ or $cnt<1;
235	$line="";
236	while($cnt) {
237	my $buf;
238	my $num = $self->{'socketi'}->read($buf,$cnt);
239	die "S: Mbinary $cnt: $num: $!\n" if not defined $num or $num<=0;
240	$res .= $buf;
241	$cnt -= $num;
242	}
243	} else {
244	chomp $line;
245	if($line eq "ok") {
246	# print STDERR "S: ok (".length($res).")\n";
247	return $res;
248	} elsif($line =~ s/^E //) {
249	# print STDERR "S: $line\n";
250	} else {
251	die "Unknown: $line\n";
252	}
253	}
254	}
255	}
256	sub file {
257	my($self,$fn,$rev) = @_;
258	my $res;
259
260	if ($self->_file($fn,$rev)) {
261	$res = $self->_line();
262	return $res if defined $res;
263	}
264
265	# retry
266	$self->conn();
267	$self->_file($fn,$rev)
268	or die "No file command send\n";
269	$res = $self->_line();
270	die "No input: $fn $rev\n" unless defined $res;
271	return $res;
272	}
273
274
275	package main;
276
2a3e1a85	277	my $cvs = CVSconn->new($opt_d, $cvs_tree);
a57a9493 MU	278
	279
	280	sub pdate($) {
	281	my($d) = @_;
	282	m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
	283	or die "Unparseable date: $d\n";
	284	my $y=$1; $y-=1900 if $y>1900;
	285	return timegm($6\|\|0,$5,$4,$3,$2-1,$y);
9718a00b TM	286	}
9718a00b TM	287
a57a9493 MU	288	sub pmode($) {
	289	my($mode) = @_;
	290	my $m = 0;
	291	my $mm = 0;
	292	my $um = 0;
	293	for my $x(split(//,$mode)) {
	294	if($x eq ",") {
	295	$m \|= $mm&$um;
	296	$mm = 0;
	297	$um = 0;
	298	} elsif($x eq "u") { $um \|= 0700;
	299	} elsif($x eq "g") { $um \|= 0070;
	300	} elsif($x eq "o") { $um \|= 0007;
	301	} elsif($x eq "r") { $mm \|= 0444;
	302	} elsif($x eq "w") { $mm \|= 0222;
	303	} elsif($x eq "x") { $mm \|= 0111;
	304	} elsif($x eq "=") { # do nothing
	305	} else { die "Unknown mode: $mode\n";
	306	}
	307	}
	308	$m \|= $mm&$um;
	309	return $m;
	310	}
d4f8b390	311
a57a9493	312	my $tmpcv = "/var/cache/cvs";
d4f8b390	313
a57a9493 MU	314	sub getwd() {
	315	my $pwd = `pwd`;
	316	chomp $pwd;
	317	return $pwd;
d4f8b390 LT	318	}
d4f8b390 LT	319
a57a9493 MU	320	-d $git_tree
	321	or mkdir($git_tree,0777)
	322	or die "Could not create $git_tree: $!";
	323	chdir($git_tree);
d4f8b390	324
a57a9493 MU	325	my $last_branch = "";
	326	my %branch_date;
	327
	328	my $git_dir = $ENV{"GIT_DIR"} \|\| ".git";
	329	$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
	330	$ENV{"GIT_DIR"} = $git_dir;
	331	unless(-d $git_dir) {
	332	system("git-init-db");
	333	die "Cannot init the GIT db at $git_tree: $?\n" if $?;
	334	system("git-read-tree");
	335	die "Cannot init an empty tree: $?\n" if $?;
	336
	337	$last_branch = $opt_o;
	338	} else {
	339	$last_branch = basename(readlink("$git_dir/HEAD"));
	340	die "Cannot read the last branch name: $!\n" unless $last_branch;
	341
	342	# Get the last import timestamps
	343	opendir(D,"$git_dir/refs/heads");
	344	while(defined(my $head = readdir(D))) {
	345	next if $head =~ /^\./;
	346	open(F,"$git_dir/refs/heads/$head")
	347	or die "Bad head branch: $head: $!\n";
	348	chomp(my $ftag = <F>);
	349	close(F);
	350	open(F,"git-cat-file commit $ftag \|");
	351	while(<F>) {
	352	next unless /^author\s.*\s(\d+)\s[-+]\d{4}$/;
	353	$branch_date{$head} = $1;
	354	last;
	355	}
	356	close(F);
	357	}
	358	closedir(D);
	359	}
	360
	361	-d $git_dir
	362	or die "Could not create git subdir ($git_dir).\n";
	363
	364	my $pid = open(CVS,"-\|");
	365	die "Cannot fork: $!\n" unless defined $pid;
	366	unless($pid) {
	367	exec("cvsps","-A","--cvs-direct",$cvs_tree);
	368	die "Could not start cvsps: $!\n";
	369	}
	370
	371
	372	## cvsps output:
	373	#---------------------
	374	#PatchSet 314
	375	#Date: 1999/09/18 13:03:59
	376	#Author: wkoch
	377	#Branch: STABLE-BRANCH-1-0
	378	#Ancestor branch: HEAD
	379	#Tag: (none)
	380	#Log:
	381	# See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
	382	#Members:
	383	# README:1.57->1.57.2.1
	384	# VERSION:1.96->1.96.2.1
	385	#
	386	#---------------------
	387
	388	my $state = 0;
389
390	my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg);
391	my(@old,@new);
392	my $commit = sub {
393	my $pid;
394	system("git-update-cache","--force-remove","--",@old) if @old;
395	die "Cannot remove files: $?\n" if $?;
396	system("git-update-cache","--add","--",@new) if @new;
397	die "Cannot add files: $?\n" if $?;
398
399	$pid = open(C,"-\|");
400	die "Cannot fork: $!" unless defined $pid;
401	unless($pid) {
402	exec("git-write-tree");
403	die "Cannot exec git-write-tree: $!\n";
404	}
405	chomp(my $tree = <C>);
406	length($tree) == 40
407	or die "Cannot get tree id ($tree): $!\n";
408	close(C)
409	or die "Error running git-write-tree: $?\n";
410	print "Tree ID $tree\n" if $opt_v;
411
412	my $parent = "";
413	if(open(C,"$git_dir/refs/heads/$last_branch")) {
414	chomp($parent = <C>);
415	close(C);
416	length($parent) == 40
417	or die "Cannot get parent id ($parent): $!\n";
418	print "Parent ID $parent\n" if $opt_v;
419	}
420
2a3e1a85 MU	421	my $pr = IO::Pipe->new();
	422	my $pw = IO::Pipe->new();
	423	$pid = fork();
	424	die "Fork: $!\n" unless defined $pid;
a57a9493	425	unless($pid) {
2a3e1a85 MU	426	$pr->writer();
	427	$pw->reader();
	428	dup2($pw->fileno(),0);
	429	dup2($pr->fileno(),1);
	430	$pr->close();
	431	$pw->close();
	432
a57a9493 MU	433	my @par = ();
	434	@par = ("-p",$parent) if $parent;
	435	exec("env",
	436	"GIT_AUTHOR_NAME=$author",
	437	"GIT_AUTHOR_EMAIL=$author",
	438	"GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
	439	"GIT_COMMITTER_NAME=$author",
	440	"GIT_COMMITTER_EMAIL=$author",
	441	"GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
	442	"git-commit-tree", $tree,@par);
	443	die "Cannot exec git-commit-tree: $!\n";
	444	}
2a3e1a85 MU	445	$pw->writer();
	446	$pr->reader();
	447	print $pw $logmsg
a57a9493	448	or die "Error writing to git-commit-tree: $!\n";
2a3e1a85 MU	449	$pw->close();
2a3e1a85 MU	450
a57a9493	451	print "Committed patch $patchset ($branch)\n" if $opt_v;
2a3e1a85	452	chomp(my $cid = <$pr>);
a57a9493 MU	453	length($cid) == 40
	454	or die "Cannot get commit id ($cid): $!\n";
	455	print "Commit ID $cid\n" if $opt_v;
2a3e1a85 MU	456	$pr->close();
	457
	458	waitpid($pid,0);
	459	die "Error running git-commit-tree: $?\n" if $?;
a57a9493 MU	460
	461	open(C,">$git_dir/refs/heads/$branch")
	462	or die "Cannot open branch $branch for update: $!\n";
	463	print C "$cid\n"
	464	or die "Cannot write branch $branch for update: $!\n";
	465	close(C)
	466	or die "Cannot write branch $branch for update: $!\n";
	467
	468	if($tag) {
	469	open(C,">$git_dir/refs/tags/$tag")
	470	or die "Cannot create tag $tag: $!\n";
	471	print C "$cid\n"
	472	or die "Cannot write tag $branch: $!\n";
	473	close(C)
	474	or die "Cannot write tag $branch: $!\n";
	475	print "Created tag '$tag' on '$branch'\n" if $opt_v;
	476	}
	477
	478	@old = ();
	479	@new = ();
	480	};
	481
	482	while(<CVS>) {
	483	chomp;
	484	if($state == 0 and /^-+$/) {
	485	$state = 1;
	486	} elsif($state == 0) {
	487	$state = 1;
	488	redo;
	489	} elsif(($state==0 or $state==1) and s/^PatchSet\s+//) {
	490	$patchset = 0+$_;
	491	$state=2;
	492	} elsif($state == 2 and s/^Date:\s+//) {
	493	$date = pdate($_);
	494	unless($date) {
	495	print STDERR "Could not parse date: $_\n";
	496	$state=0;
	497	next;
	498	}
	499	$state=3;
	500	} elsif($state == 3 and s/^Author:\s+//) {
	501	s/\s+$//;
	502	$author = $_;
	503	$state = 4;
	504	} elsif($state == 4 and s/^Branch:\s+//) {
	505	s/\s+$//;
	506	$branch = $_;
	507	$state = 5;
	508	} elsif($state == 5 and s/^Ancestor branch:\s+//) {
	509	s/\s+$//;
	510	$ancestor = $_;
	511	$ancestor = $opt_o if $ancestor == "HEAD";
	512	$state = 6;
	513	} elsif($state == 5) {
	514	$ancestor = undef;
	515	$state = 6;
	516	redo;
	517	} elsif($state == 6 and s/^Tag:\s+//) {
	518	s/\s+$//;
	519	if($_ eq "(none)") {
	520	$tag = undef;
	521	} else {
	522	$tag = $_;
	523	}
524	$state = 7;
525	} elsif($state == 7 and /^Log:/) {
526	$logmsg = "";
527	$state = 8;
528	} elsif($state == 8 and /^Members:/) {
529	$branch = $opt_o if $branch eq "HEAD";
530	if(defined $branch_date{$branch} and $branch_date{$branch} >= $date) {
531	# skip
532	print "skip patchset $patchset: $date before $branch_date{$branch}\n";
533	$state = 11;
534	next;
535	}
536	if($ancestor) {
537	if(-f "$git_dir/refs/heads/$branch") {
538	print STDERR "Branch $branch already exists!\n";
539	$state=11;
540	next;
541	}
542	unless(open(H,"$git_dir/refs/heads/$ancestor")) {
543	print STDERR "Branch $ancestor does not exist!\n";
544	$state=11;
545	next;
546	}
547	chomp(my $id = <H>);
548	close(H);
549	unless(open(H,"> $git_dir/refs/heads/$branch")) {
550	print STDERR "Could not create branch $branch: $!\n";
551	$state=11;
552	next;
553	}
554	print H "$id\n"
555	or die "Could not write branch $branch: $!";
556	close(H)
557	or die "Could not write branch $branch: $!";
558	}
559	if(($ancestor \|\| $branch) ne $last_branch) {
2a3e1a85	560	print "Switching from $last_branch to $branch\n" if $opt_v;
a57a9493 MU	561	system("git-read-tree -m -u $last_branch $branch");
	562	die "read-tree $branch failed at $branch: $?\n" if $?;
	563	}
	564	if($branch ne $last_branch) {
	565	unlink("$git_dir/HEAD");
	566	symlink("refs/heads/$branch","$git_dir/HEAD");
	567	$last_branch = $branch;
	568	}
	569	$state = 9;
	570	} elsif($state == 8) {
	571	$logmsg .= "$_\n";
2a3e1a85	572	} elsif($state == 9 and /^\s+(\S+):(INITIAL\|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
a57a9493	573	# VERSION:1.96->1.96.2.1
2a3e1a85	574	my $init = ($2 eq "INITIAL");
a57a9493	575	my $fn = $1;
f65ae603 MU	576	my $rev = $3;
	577	$fn =~ s#^/+##;
	578	my $data = $cvs->file($fn,$rev);
2a3e1a85	579	print "".($init ? "New" : "Update")." $fn: ".length($data)." bytes.\n";
a57a9493 MU	580	mkpath(dirname($fn),$opt_v);
	581	open(F,"> ./$fn")
	582	or die "Cannot create '$fn': $!\n";
	583	print F $data
	584	or die "Cannot write to '$fn': $!\n";
	585	close(F)
	586	or die "Cannot write to '$fn': $!\n";
	587	chmod(pmode($cvs->{'mode'}), $fn);
	588	push(@new,$fn); # may be resurrected!
	589	} elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
f65ae603 MU	590	my $fn = $1;
	591	$fn =~ s#^/+##;
	592	push(@old,$fn);
a57a9493 MU	593	} elsif($state == 9 and /^\s*$/) {
	594	$state = 10;
	595	} elsif(($state == 9 or $state == 10) and /^-+$/) {
	596	&$commit();
	597	$state = 1;
	598	} elsif($state == 11 and /^-+$/) {
	599	$state = 1;
	600	} elsif(/^-+$/) { # end of unknown-line processing
	601	$state = 1;
	602	} elsif($state != 11) { # ignore stuff when skipping
	603	print "* UNKNOWN LINE * $_\n";
	604	}
	605	}
	606	&$commit() if $branch and $state != 11;
d4f8b390	607
a57a9493	608	print "DONE\n" if $opt_v;