2005-11-07 05:57:08 +01:00
#!/usr/bin/perl -w
2006-05-27 18:39:33 +02:00
# Known limitations:
# - does not propagate permissions
2006-12-11 00:30:06 +01:00
# - error handling has not been extensively tested
#
2006-05-27 18:39:33 +02:00
2005-11-07 05:57:08 +01:00
use strict;
use Getopt::Std;
use File::Temp qw(tempdir);
use Data::Dumper;
2006-05-27 18:39:35 +02:00
use File::Basename qw(basename dirname);
2005-11-07 05:57:08 +01:00
unless ($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){
die "GIT_DIR is not defined or is unreadable";
}
2006-07-18 04:22:49 +02:00
our ($opt_h, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m );
2005-11-07 05:57:08 +01:00
2006-07-18 04:22:49 +02:00
getopts('hpvcfam:');
2005-11-07 05:57:08 +01:00
$opt_h && usage();
die "Need at least one commit identifier!" unless @ARGV;
# setup a tempdir
our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX',
TMPDIR => 1,
CLEANUP => 1);
# resolve target commit
my $commit;
$commit = pop @ARGV;
2006-01-30 07:12:12 +01:00
$commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0");
2005-11-07 05:57:08 +01:00
chomp $commit;
if ($?) {
die "The commit reference $commit did not resolve!";
}
# resolve what parent we want
my $parent;
if (@ARGV) {
$parent = pop @ARGV;
2006-01-30 07:12:12 +01:00
$parent = safe_pipe_capture('git-rev-parse', '--verify', "$parent^0");
2005-11-07 05:57:08 +01:00
chomp $parent;
if ($?) {
die "The parent reference did not resolve!";
}
}
# find parents from the commit itself
2006-01-30 07:12:12 +01:00
my @commit = safe_pipe_capture('git-cat-file', 'commit', $commit);
2005-11-07 05:57:08 +01:00
my @parents;
2006-07-18 04:22:49 +02:00
my $committer;
my $author;
my $stage = 'headers'; # headers, msg
my $title;
my $msg = '';
foreach my $line (@commit) {
chomp $line;
if ($stage eq 'headers' && $line eq '') {
$stage = 'msg';
next;
2005-11-07 05:57:08 +01:00
}
2006-07-18 04:22:49 +02:00
if ($stage eq 'headers') {
if ($line =~ m/^parent (\w{40})$/) { # found a parent
push @parents, $1;
2006-11-12 16:29:42 +01:00
} elsif ($line =~ m/^author (.+) \d+ [-+]\d+$/) {
2006-07-18 04:22:49 +02:00
$author = $1;
2006-11-12 16:29:42 +01:00
} elsif ($line =~ m/^committer (.+) \d+ [-+]\d+$/) {
2006-07-18 04:22:49 +02:00
$committer = $1;
}
} else {
$msg .= $line . "\n";
unless ($title) {
$title = $line;
}
2005-11-07 05:57:08 +01:00
}
}
if ($parent) {
2006-07-07 12:55:41 +02:00
my $found;
2005-11-07 05:57:08 +01:00
# double check that it's a valid parent
foreach my $p (@parents) {
if ($p eq $parent) {
$found = 1;
last;
}; # found it
2005-11-09 08:02:58 +01:00
}
2006-07-07 12:55:41 +02:00
die "Did not find $parent in the parents for this commit!" if !$found;
2005-11-07 05:57:08 +01:00
} else { # we don't have a parent from the cmdline...
if (@parents == 1) { # it's safe to get it from the commit
$parent = $parents[0];
} else { # or perhaps not!
die "This commit has more than one parent -- please name the parent you want to use explicitly";
}
}
$opt_v && print "Applying to CVS commit $commit from parent $parent\n";
# grab the commit message
2006-04-26 02:26:16 +02:00
open(MSG, ">.msg") or die "Cannot open .msg for writing";
2006-07-18 04:22:49 +02:00
if ($opt_m) {
print MSG $opt_m;
}
print MSG $msg;
if ($opt_a) {
print MSG "\n\nAuthor: $author\n";
if ($author ne $committer) {
print MSG "Committer: $committer\n";
}
}
2006-04-26 02:26:16 +02:00
close MSG;
2006-12-11 00:30:06 +01:00
`git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
## apply non-binary changes
my $fuzz = $opt_p ? 0 : 2;
print "Checking if patch will apply\n";
my @stat;
open APPLY, "GIT_DIR= git-apply -C$fuzz --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
@stat=<APPLY>;
close APPLY || die "Cannot patch";
my (@bfiles,@files,@afiles,@dfiles);
chomp @stat;
foreach (@stat) {
push (@bfiles,$1) if m/^-\t-\t(.*)$/;
push (@files, $1) if m/^-\t-\t(.*)$/;
push (@files, $1) if m/^\d+\t\d+\t(.*)$/;
push (@afiles,$1) if m/^ create mode [0-7]+ (.*)$/;
push (@dfiles,$1) if m/^ delete mode [0-7]+ (.*)$/;
2005-11-07 05:57:08 +01:00
}
2006-12-11 00:30:06 +01:00
map { s/^"(.*)"$/$1/g } @bfiles,@files;
map { s/\\([0-7]{3})/sprintf('%c',oct $1)/eg } @bfiles,@files;
2005-11-07 05:57:08 +01:00
# check that the files are clean and up to date according to cvs
my $dirty;
2006-12-11 00:30:06 +01:00
my @dirs;
foreach my $p (@afiles) {
my $path = dirname $p;
while (!-d $path and ! grep { $_ eq $path } @dirs) {
unshift @dirs, $path;
$path = dirname $path;
}
}
2006-05-27 18:39:35 +02:00
foreach my $d (@dirs) {
if (-e $d) {
$dirty = 1;
warn "$d exists and is not a directory!\n";
}
}
2006-01-06 21:54:41 +01:00
foreach my $f (@afiles) {
2006-01-30 07:12:12 +01:00
# This should return only one value
2006-11-12 16:29:42 +01:00
if ($f =~ m,(.*)/[^/]*$,) {
my $p = $1;
next if (grep { $_ eq $p } @dirs);
}
2006-01-30 07:12:12 +01:00
my @status = grep(m/^File/, safe_pipe_capture('cvs', '-q', 'status' ,$f));
if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
2006-05-27 18:39:35 +02:00
if (-d dirname $f and $status[0] !~ m/Status: Unknown$/
and $status[0] !~ m/^File: no file /) {
2006-01-30 07:12:12 +01:00
$dirty = 1;
2006-04-26 02:26:16 +02:00
warn "File $f is already known in your CVS checkout -- perhaps it has been added by another user. Or this may indicate that it exists on a different branch. If this is the case, use -f to force the merge.\n";
2006-06-17 19:46:40 +02:00
warn "Status was: $status[0]\n";
2006-01-06 21:54:41 +01:00
}
}
2006-11-12 16:29:42 +01:00
2006-12-11 00:30:06 +01:00
foreach my $f (@files) {
next if grep { $_ eq $f } @afiles;
2006-01-06 21:54:41 +01:00
# TODO:we need to handle removed in cvs
2006-01-30 07:12:12 +01:00
my @status = grep(m/^File/, safe_pipe_capture('cvs', '-q', 'status' ,$f));
if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
unless ($status[0] =~ m/Status: Up-to-date$/) {
2005-11-07 05:57:08 +01:00
$dirty = 1;
warn "File $f not up to date in your CVS checkout!\n";
}
}
if ($dirty) {
2006-04-26 02:26:16 +02:00
if ($opt_f) { warn "The tree is not clean -- forced merge\n";
$dirty = 0;
} else {
die "Exiting: your CVS tree is not clean for this merge.";
}
2005-11-07 05:57:08 +01:00
}
2006-12-11 00:30:06 +01:00
print "Applying\n";
`GIT_DIR= git-apply -C$fuzz --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
2005-11-07 05:57:08 +01:00
2006-12-11 00:30:06 +01:00
print "Patch applied successfully. Adding new files and directories to CVS\n";
my $dirtypatch = 0;
2006-05-27 18:39:35 +02:00
foreach my $d (@dirs) {
2006-12-11 00:30:06 +01:00
if (system('cvs','add',$d)) {
$dirtypatch = 1;
2006-05-27 18:39:35 +02:00
warn "Failed to cvs add directory $d -- you may need to do it manually";
}
}
2005-11-07 05:57:08 +01:00
foreach my $f (@afiles) {
2006-11-12 16:29:42 +01:00
if (grep { $_ eq $f } @bfiles) {
system('cvs', 'add','-kb',$f);
} else {
system('cvs', 'add', $f);
}
2005-11-07 05:57:08 +01:00
if ($?) {
2006-12-11 00:30:06 +01:00
$dirtypatch = 1;
2005-11-07 05:57:08 +01:00
warn "Failed to cvs add $f -- you may need to do it manually";
}
}
foreach my $f (@dfiles) {
2006-01-30 07:12:12 +01:00
system('cvs', 'rm', '-f', $f);
2005-11-07 05:57:08 +01:00
if ($?) {
2006-12-11 00:30:06 +01:00
$dirtypatch = 1;
2005-11-07 05:57:08 +01:00
warn "Failed to cvs rm -f $f -- you may need to do it manually";
}
}
print "Commit to CVS\n";
2006-12-11 00:30:06 +01:00
print "Patch title (first comment line): $title\n";
my @commitfiles = map { unless (m/\s/) { '\''.$_.'\''; } else { $_; }; } (@files);
my $cmd = "cvs commit -F .msg @commitfiles";
2005-11-07 05:57:08 +01:00
if ($dirtypatch) {
print "NOTE: One or more hunks failed to apply cleanly.\n";
2006-12-11 00:30:06 +01:00
print "You'll need to apply the patch in .cvsexportcommit.diff manually\n";
print "using a patch program. After applying the patch and resolving the\n";
print "problems you may commit using:";
2005-11-07 05:57:08 +01:00
print "\n $cmd\n\n";
2005-11-17 06:32:44 +01:00
exit(1);
2005-11-07 05:57:08 +01:00
}
if ($opt_c) {
print "Autocommit\n $cmd\n";
2006-12-11 00:30:06 +01:00
print safe_pipe_capture('cvs', 'commit', '-F', '.msg', @files);
2005-11-07 05:57:08 +01:00
if ($?) {
die "Exiting: The commit did not succeed";
}
print "Committed successfully to CVS\n";
} else {
print "Ready for you to commit, just run:\n\n $cmd\n";
}
2006-12-11 00:30:06 +01:00
# clean up
unlink(".cvsexportcommit.diff");
unlink(".msg");
2005-11-07 05:57:08 +01:00
sub usage {
print STDERR <<END;
2006-04-26 02:26:16 +02:00
Usage: GIT_DIR=/path/to/.git ${\basename $0} [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit
2005-11-07 05:57:08 +01:00
END
exit(1);
}
2006-07-10 07:50:18 +02:00
# An alternative to `command` that allows input to be passed as an array
2006-01-30 07:12:12 +01:00
# to work around shell problems with weird characters in arguments
# if the exec returns non-zero we die
sub safe_pipe_capture {
my @output;
if (my $pid = open my $child, '-|') {
@output = (<$child>);
close $child or die join(' ',@_).": $! $?";
} else {
exec(@_) or die "$! $?"; # exec() can fail the executable can't be found
}
return wantarray ? @output : join('',@output);
}
2006-12-04 08:44:08 +01:00
2006-12-11 00:30:06 +01:00
sub safe_pipe_capture_blob {
my $output;
if (my $pid = open my $child, '-|') {
local $/;
undef $/;
$output = (<$child>);
close $child or die join(' ',@_).": $! $?";
} else {
exec(@_) or die "$! $?"; # exec() can fail the executable can't be found
}
return $output;
2006-12-04 08:44:08 +01:00
}