3 # This tool is copyright (c) 2005, Matthias Urlichs.
4 # It is released under the Gnu Public License, version 2.
6 # The basic idea is to pull and analyze SVN changes.
8 # Checking out the files is done by a single long-running CVS connection
11 # The head revision is on branch "origin" by default.
12 # You can change that with the '-o' option.
14 require v5
.8
.0; # for shell-safe open("-|",LIST)
19 use File
::Temp
qw(tempfile);
20 use File
::Path
qw(mkpath);
21 use File
::Basename
qw(basename dirname);
24 use POSIX
qw(strftime dup2);
29 die "Need CVN:COre 1.2.1 or better" if $SVN::Core
::VERSION
lt "1.2.1";
31 $SIG{'PIPE'}="IGNORE";
34 our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b);
38 Usage: ${\basename $0} # fetch/update GIT from CVS
39 [-o branch-for-HEAD] [-h] [-v]
40 [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
41 [-i] [-u] [-s subst] [-m] [-M regex] [SVN_URL]
46 getopts
("b:C:hivmM:o:t:T:u") or usage
();
49 my $tag_name = $opt_t || "tags";
50 my $trunk_name = $opt_T || "trunk";
51 my $branch_name = $opt_b || "branches";
53 @ARGV <= 1 or usage
();
56 my $git_tree = $opt_C;
62 } elsif (-f
'CVS/Repository') {
63 open my $f, '<', 'CVS/Repository' or
64 die 'Failed to open CVS/Repository';
74 @mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
77 push (@mergerx, qr/$opt_M/);
80 select(STDERR
); $|=1; select(STDOUT
);
84 # Basic SVN connection.
85 # We're only interested in connecting and downloading, so ...
88 use File
::Temp
qw(tempfile);
89 use POSIX
qw(strftime dup2);
93 $what=ref($what) if ref($what);
96 $self->{'buffer'} = "";
100 $self->{'fullrep'} = $repo;
103 $self->{'lines'} = undef;
110 my $repo = $self->{'fullrep'};
111 my $s = SVN
::Ra
->new($repo);
113 die "SVN connection to $repo: $!\n" unless defined $s;
115 $self->{'repo'} = $repo;
116 $self->{'maxrev'} = $s->get_latest_revnum();
120 my($self,$path,$rev) = @_;
123 my ($fh, $name) = tempfile
('gitsvn.XXXXXX',
124 DIR
=> File
::Spec
->tmpdir(), UNLINK
=> 1);
126 print "... $rev $path ...\n" if $opt_v;
127 eval { $self->{'svn'}->get_file($path,$rev,$fh); };
128 if (defined $@
and $@
!~ /Attempted to get checksum/) {
131 eval { $self->{'svn'}->get_file($path,$rev,$fh); };
133 return () if defined $@
and $@
!~ /Attempted to get checksum/;
137 return ($name, $res);
143 my $svn = SVNconn
->new($cvs_tree);
148 $d =~ m
#(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)#
149 or die "Unparseable date: $d\n";
150 my $y=$1; $y-=1900 if $y>1900;
151 return timegm
($6||0,$5,$4,$3,$2-1,$y);
161 sub get_headref
($$) {
166 if (open(C
,"$git_dir/refs/heads/$name")) {
170 or die "Cannot get head id for $name ($sha): $!\n";
177 or mkdir($git_tree,0777)
178 or die "Could not create $git_tree: $!";
181 my $orig_branch = "";
182 my $forward_master = 0;
185 my $git_dir = $ENV{"GIT_DIR"} || ".git";
186 $git_dir = getwd
()."/".$git_dir unless $git_dir =~ m
#^/#;
187 $ENV{"GIT_DIR"} = $git_dir;
189 $orig_git_index = $ENV{GIT_INDEX_FILE
} if exists $ENV{GIT_INDEX_FILE
};
190 my ($git_ih, $git_index) = tempfile
('gitXXXXXX', SUFFIX
=> '.idx',
191 DIR
=> File
::Spec
->tmpdir());
193 $ENV{GIT_INDEX_FILE
} = $git_index;
198 unless(-d
$git_dir) {
199 system("git-init-db");
200 die "Cannot init the GIT db at $git_tree: $?\n" if $?
;
201 system("git-read-tree");
202 die "Cannot init an empty tree: $?\n" if $?
;
204 $last_branch = $opt_o;
207 -f
"$git_dir/refs/heads/$opt_o"
208 or die "Branch '$opt_o' does not exist.\n".
209 "Either use the correct '-o branch' option,\n".
210 "or import to a new repository.\n";
212 -f
"$git_dir/svn2git"
213 or die "'$git_dir/svn2git' does not exist.\n".
214 "You need that file for incremental imports.\n";
215 $last_branch = basename
(readlink("$git_dir/HEAD"));
216 unless($last_branch) {
217 warn "Cannot read the last branch name: $! -- assuming 'master'\n";
218 $last_branch = "master";
220 $orig_branch = $last_branch;
221 $last_rev = get_headref
($orig_branch, $git_dir);
222 if (-f
"$git_dir/SVN2GIT_HEAD") {
225 Make sure your working directory corresponds to HEAD and remove SVN2GIT_HEAD.
228 git-read-tree -m -u SVN2GIT_HEAD HEAD
231 system('cp', "$git_dir/HEAD", "$git_dir/SVN2GIT_HEAD");
234 $opt_o ne 'master' && -f
"$git_dir/refs/heads/master" &&
235 system('cmp', '-s', "$git_dir/refs/heads/master",
236 "$git_dir/refs/heads/$opt_o") == 0;
239 system('git-read-tree', $last_rev);
240 die "read-tree failed: $?\n" if $?
;
242 # Get the last import timestamps
243 open my $B,"<", "$git_dir/svn2git";
246 my($num,$branch,$ref) = split;
247 $branches{$branch}{$num} = $ref;
248 $branches{$branch}{"LAST"} = $ref;
249 $current_rev = $num+1 if $current_rev < $num+1;
254 or die "Could not create git subdir ($git_dir).\n";
256 open BRANCHES
,">>", "$git_dir/svn2git";
260 #---------------------
262 #Date: 1999/09/18 13:03:59
264 #Branch: STABLE-BRANCH-1-0
265 #Ancestor branch: HEAD
268 # See ChangeLog: Sat Sep 18 13:03:28 CEST 1999 Werner Koch
270 # README:1.57->1.57.2.1
271 # VERSION:1.96->1.96.2.1
273 #---------------------
278 my($rev,$branch,$path) = @_;
280 # revert split_path(), below
282 $path = "" if $path eq "/"; # this should not happen, but ...
284 $svnpath = "/$trunk_name/$path";
285 } elsif($branch =~ m
#^/#) {
286 $svnpath = "/$tag_name$branch/$path";
288 $svnpath = "/$branch_name/$branch/$path";
292 my ($name, $res) = eval { $svn->file($svnpath,$rev); };
293 return () unless defined $name;
295 open my $F, '-|', "git-hash-object", "-w", $name
296 or die "Cannot create object: $!\n";
300 my $mode = "0644"; # SV does not seem to store any file modes
301 return [$mode, $sha, $path];
308 if($path =~ s
#^/\Q$tag_name\E/([^/]+)/?##) {
310 } elsif($path =~ s
#^/\Q$trunk_name\E/?##) {
312 } elsif($path =~ s
#^/\Q$branch_name\E/([^/]+)/?##) {
315 print STDERR
"$rev: Unrecognized path: $path\n";
318 $path = "/" if $path eq "";
319 return ($branch,$path);
323 my($branch, $changed_paths, $revision, $author, $date, $message) = @_;
324 my($author_name,$author_email,$dest);
327 if (not defined $author) {
328 $author_name = $author_email = "unknown";
329 } elsif ($author =~ /^(.*?)\s+<(.*)>$/) {
330 ($author_name, $author_email) = ($1, $2);
332 $author =~ s/^<(.*)>$/$1/;
333 $author_name = $author_email = $author;
335 $date = pdate
($date);
339 if($branch eq "/") { # trunk
341 } elsif($branch =~ m
#^/(.+)#) { # tag
344 } else { # "normal" branch
350 my $prev = $changed_paths->{"/"};
351 if($prev and $prev->[0] eq "A") {
352 delete $changed_paths->{"/"};
353 my $oldpath = $prev->[1];
355 if(defined $oldpath) {
357 ($parent,$p) = split_path
($revision,$oldpath);
361 $parent =~ s
#^/##; # if it's a tag
369 if(defined $parent) {
370 open(H
,"git-rev-parse --verify $parent |");
373 print STDERR
"$revision: cannot find commit '$parent'!\n";
377 if(length($rev) != 40) {
378 print STDERR
"$revision: cannot find commit '$parent'!\n";
381 $rev = $branches{($parent eq $opt_o) ?
"/" : $parent}{"LAST"};
382 if($revision != 1 and not $rev) {
383 print STDERR
"$revision: do not know ancestor for '$parent'!\n";
390 # if($prev and $prev->[0] eq "A") {
392 # unless(open(H,"> $git_dir/refs/heads/$branch")) {
393 # print STDERR "$revision: Could not create branch $branch: $!\n";
398 # or die "Could not write branch $branch: $!";
400 # or die "Could not write branch $branch: $!";
403 if(not defined $rev) {
405 } elsif ($rev ne $last_rev) {
406 print "Switching from $last_rev to $rev ($branch)\n" if $opt_v;
407 system("git-read-tree", $rev);
408 die "read-tree failed for $rev: $?\n" if $?
;
412 while(my($path,$action) = each %$changed_paths) {
413 if ($action->[0] eq "A") {
414 my $f = get_file
($revision,$branch,$path);
416 } elsif ($action->[0] eq "D") {
418 } elsif ($action->[0] eq "M") {
419 my $f = get_file
($revision,$branch,$path);
421 } elsif ($action->[0] eq "R") {
422 # refer to a file/tree in an earlier commit
423 push(@old,$path); # remove any old stuff
425 # ... and add any new stuff
426 my($b,$p) = split_path
($revision,$action->[1]);
427 open my $F,"-|","git-ls-tree","-r","-z", $branches{$b}{$action->[2]}, $p;
431 my($m,$p) = split(/\t/,$_,2);
432 my($mode,$type,$sha1) = split(/ /,$m);
433 next if $type ne "blob";
434 push(@new,[$mode,$sha1,$p]);
437 die "$revision: unknown action '".$action->[0]."' for $path\n";
442 open my $F, "-│", "git-ls-files", "-z", @old or die $!;
454 @o2 = splice(@old,0,50);
459 system("git-update-index","--force-remove","--",@o2);
460 die "Cannot remove files: $?\n" if $?
;
466 @n2 = splice(@new,0,10);
471 system("git-update-index","--add",
472 (map { ('--cacheinfo', @
$_) } @n2));
473 die "Cannot add files: $?\n" if $?
;
476 my $pid = open(C
,"-|");
477 die "Cannot fork: $!" unless defined $pid;
479 exec("git-write-tree");
480 die "Cannot exec git-write-tree: $!\n";
482 chomp(my $tree = <C
>);
484 or die "Cannot get tree id ($tree): $!\n";
486 or die "Error running git-write-tree: $?\n";
487 print "Tree ID $tree\n" if $opt_v;
489 my $pr = IO
::Pipe
->new() or die "Cannot open pipe: $!\n";
490 my $pw = IO
::Pipe
->new() or die "Cannot open pipe: $!\n";
492 die "Fork: $!\n" unless defined $pid;
496 open(OUT
,">&STDOUT");
497 dup2
($pw->fileno(),0);
498 dup2
($pr->fileno(),1);
503 @par = ("-p",$rev) if defined $rev;
505 # loose detection of merges
506 # based on the commit msg
507 foreach my $rx (@mergerx) {
508 if ($message =~ $rx) {
510 if ($mparent eq 'HEAD') { $mparent = $opt_o };
511 if ( -e
"$git_dir/refs/heads/$mparent") {
512 $mparent = get_headref
($mparent, $git_dir);
513 push @par, '-p', $mparent;
514 print OUT
"Merge parent branch: $mparent\n" if $opt_v;
520 "GIT_AUTHOR_NAME=$author_name",
521 "GIT_AUTHOR_EMAIL=$author_email",
522 "GIT_AUTHOR_DATE=".strftime
("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
523 "GIT_COMMITTER_NAME=$author_name",
524 "GIT_COMMITTER_EMAIL=$author_email",
525 "GIT_COMMITTER_DATE=".strftime
("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
526 "git-commit-tree", $tree,@par);
527 die "Cannot exec git-commit-tree: $!\n";
532 $message =~ s/[\s\n]+\z//;
534 print $pw "$message\n"
535 or die "Error writing to git-commit-tree: $!\n";
538 print "Committed change $revision:$branch ".strftime
("%Y-%m-%d %H:%M:%S",gmtime($date)).")\n" if $opt_v;
539 chomp(my $cid = <$pr>);
541 or die "Cannot get commit id ($cid): $!\n";
542 print "Commit ID $cid\n" if $opt_v;
546 die "Error running git-commit-tree: $?\n" if $?
;
549 print "Writing to refs/heads/$dest\n" if $opt_v;
550 open(C
,">$git_dir/refs/heads/$dest") and
551 print C
("$cid\n") and
553 or die "Cannot write branch $dest for update: $!\n";
555 print "... no known parent\n" if $opt_v;
557 $branches{$branch}{"LAST"} = $cid;
558 $branches{$branch}{$revision} = $cid;
560 print BRANCHES
"$revision $branch $cid\n";
561 print "DONE: $revision $dest $cid\n" if $opt_v;
564 my($in, $out) = ('','');
565 $last_rev = "-" if %$changed_paths;
566 # the tag was 'complex', i.e. did not refer to a "real" revision
568 $tag =~ tr/_/\./ if $opt_u;
570 my $pid = open2
($in, $out, 'git-mktag');
571 print $out ("object $cid\n".
574 "tagger $author_name <$author_email>\n") and
576 or die "Cannot create tag object $tag: $!\n";
581 if ( !close($in) or waitpid($pid, 0) != $pid or
582 $?
!= 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
583 die "Cannot create tag object $tag: $!\n";
587 open(C
,">$git_dir/refs/tags/$tag")
588 or die "Cannot create tag $tag: $!\n";
590 or die "Cannot write tag $tag: $!\n";
592 or die "Cannot write tag $tag: $!\n";
594 print "Created tag '$tag' on '$branch'\n" if $opt_v;
598 my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
600 ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
602 while(my($path,$action) = each %$changed_paths) {
603 $p{$path} = [ $action->action,$action->copyfrom_path, $action->copyfrom_rev ];
605 $changed_paths = \
%p;
614 while(my($path,$action) = each %$changed_paths) {
615 ($branch,$path) = split_path
($revision,$path);
616 next if not defined $branch;
617 $done{$branch}{$path} = $action;
619 while(($branch,$changed_paths) = each %done) {
620 commit
($branch, $changed_paths, $revision, $author, $date, $message);
624 while(++$current_rev < $svn->{'maxrev'}) {
625 $svn->{'svn'}->get_log("/",$current_rev,$current_rev,$current_rev,1,1,\
&_commit_all
,"");
632 if (defined $orig_git_index) {
633 $ENV{GIT_INDEX_FILE
} = $orig_git_index;
635 delete $ENV{GIT_INDEX_FILE
};
638 # Now switch back to the branch we were in before all of this happened
640 print "DONE\n" if $opt_v;
641 system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
644 system('git-read-tree', '-m', '-u', 'SVN2GIT_HEAD', 'HEAD');
645 die "read-tree failed: $?\n" if $?
;
648 $orig_branch = "master";
649 print "DONE; creating $orig_branch branch\n" if $opt_v;
650 system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
651 unless -f
"$git_dir/refs/heads/master";
652 unlink("$git_dir/HEAD");
653 symlink("refs/heads/$orig_branch","$git_dir/HEAD");
655 system('git checkout');
656 die "checkout failed: $?\n" if $?
;
659 unlink("$git_dir/SVN2GIT_HEAD");