4 # - does not propagate permissions
5 # - error handling has not been extensively tested
10 use File::Temp qw(tempdir);
12 use File::Basename qw(basename dirname);
14 unless ($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){
15 die "GIT_DIR is not defined or is unreadable";
18 our ($opt_h, $opt_P, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m, $opt_d, $opt_u);
20 getopts('uhPpvcfam:d:');
24 die "Need at least one commit identifier!" unless @ARGV;
28 @cvs = ('cvs', '-d', $opt_d);
34 our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX',
38 # resolve target commit
41 $commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0");
44 die "The commit reference $commit did not resolve!";
47 # resolve what parent we want
51 $parent = safe_pipe_capture('git-rev-parse', '--verify', "$parent^0");
54 die "The parent reference did not resolve!";
58 # find parents from the commit itself
59 my @commit = safe_pipe_capture('git-cat-file', 'commit', $commit);
63 my $stage = 'headers'; # headers, msg
67 foreach my $line (@commit) {
69 if ($stage eq 'headers' && $line eq '') {
74 if ($stage eq 'headers') {
75 if ($line =~ m/^parent (\w{40})$/) { # found a parent
77 } elsif ($line =~ m/^author (.+) \d+ [-+]\d+$/) {
79 } elsif ($line =~ m/^committer (.+) \d+ [-+]\d+$/) {
92 # double check that it's a valid parent
93 foreach my $p (@parents) {
99 die "Did not find $parent in the parents for this commit!" if !$found and !$opt_P;
100 } else { # we don't have a parent from the cmdline...
101 if (@parents == 1) { # it's safe to get it from the commit
102 $parent = $parents[0];
103 } else { # or perhaps not!
104 die "This commit has more than one parent -- please name the parent you want to use explicitly";
108 $opt_v && print "Applying to CVS commit $commit from parent $parent\n";
110 # grab the commit message
111 open(MSG, ">.msg") or die "Cannot open .msg for writing";
117 print MSG "\n\nAuthor: $author\n";
118 if ($author ne $committer) {
119 print MSG "Committer: $committer\n";
124 `git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
126 ## apply non-binary changes
128 # In pedantic mode require all lines of context to match. In normal
129 # mode, be compatible with diff/patch: assume 3 lines of context and
130 # require at least one line match, i.e. ignore at most 2 lines of
131 # context, like diff/patch do by default.
132 my $context = $opt_p ? '' : '-C1';
134 print "Checking if patch will apply\n";
137 open APPLY, "GIT_DIR= git-apply $context --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
139 close APPLY || die "Cannot patch";
140 my (@bfiles,@files,@afiles,@dfiles);
143 push (@bfiles,$1) if m/^-\t-\t(.*)$/;
144 push (@files, $1) if m/^-\t-\t(.*)$/;
145 push (@files, $1) if m/^\d+\t\d+\t(.*)$/;
146 push (@afiles,$1) if m/^ create mode [0-7]+ (.*)$/;
147 push (@dfiles,$1) if m/^ delete mode [0-7]+ (.*)$/;
149 map { s/^"(.*)"$/$1/g } @bfiles,@files;
150 map { s/\\([0-7]{3})/sprintf('%c',oct $1)/eg } @bfiles,@files;
152 # check that the files are clean and up to date according to cvs
155 foreach my $p (@afiles) {
156 my $path = dirname $p;
157 while (!-d $path and ! grep { $_ eq $path } @dirs) {
158 unshift @dirs, $path;
159 $path = dirname $path;
164 foreach my $d (@dirs) {
167 warn "$d exists and is not a directory!\n";
171 # ... query status of all files that we have a directory for and parse output of 'cvs status' to %cvsstat.
173 foreach my $f (@files) {
174 my $path = dirname $f;
175 next if (grep { $_ eq $path } @dirs);
176 push @canstatusfiles, $f;
180 if (@canstatusfiles) {
182 my @updated = safe_pipe_capture(@cvs, 'update', @canstatusfiles);
186 @cvsoutput= safe_pipe_capture(@cvs, 'status', @canstatusfiles);
188 foreach my $l (@cvsoutput) {
190 if ( $l =~ /^File:/ and $l =~ /Status: (.*)$/ ) {
191 $cvsstat{$canstatusfiles[$matchcount]} = $1;
197 # ... validate new files,
198 foreach my $f (@afiles) {
199 if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
201 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";
202 warn "Status was: $cvsstat{$f}\n";
205 # ... validate known files.
206 foreach my $f (@files) {
207 next if grep { $_ eq $f } @afiles;
208 # TODO:we need to handle removed in cvs
209 unless (defined ($cvsstat{$f}) and $cvsstat{$f} eq "Up-to-date") {
211 warn "File $f not up to date but has status '$cvsstat{$f}' in your CVS checkout!\n";
215 if ($opt_f) { warn "The tree is not clean -- forced merge\n";
218 die "Exiting: your CVS tree is not clean for this merge.";
223 `GIT_DIR= git-apply $context --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
225 print "Patch applied successfully. Adding new files and directories to CVS\n";
229 # We have to add the directories in order otherwise we will have
230 # problems when we try and add the sub-directory of a directory we
231 # have not added yet.
233 # Luckily this is easy to deal with by sorting the directories and
234 # dealing with the shortest ones first.
236 @dirs = sort { length $a <=> length $b} @dirs;
238 foreach my $d (@dirs) {
239 if (system(@cvs,'add',$d)) {
241 warn "Failed to cvs add directory $d -- you may need to do it manually";
245 foreach my $f (@afiles) {
246 if (grep { $_ eq $f } @bfiles) {
247 system(@cvs, 'add','-kb',$f);
249 system(@cvs, 'add', $f);
253 warn "Failed to cvs add $f -- you may need to do it manually";
257 foreach my $f (@dfiles) {
258 system(@cvs, 'rm', '-f', $f);
261 warn "Failed to cvs rm -f $f -- you may need to do it manually";
265 print "Commit to CVS\n";
266 print "Patch title (first comment line): $title\n";
267 my @commitfiles = map { unless (m/\s/) { '\''.$_.'\''; } else { $_; }; } (@files);
268 my $cmd = join(' ', @cvs)." commit -F .msg @commitfiles";
271 print "NOTE: One or more hunks failed to apply cleanly.\n";
272 print "You'll need to apply the patch in .cvsexportcommit.diff manually\n";
273 print "using a patch program. After applying the patch and resolving the\n";
274 print "problems you may commit using:";
280 print "Autocommit\n $cmd\n";
281 print safe_pipe_capture(@cvs, 'commit', '-F', '.msg', @files);
283 die "Exiting: The commit did not succeed";
285 print "Committed successfully to CVS\n";
289 print "Ready for you to commit, just run:\n\n $cmd\n";
293 unlink(".cvsexportcommit.diff");
295 # CVS version 1.11.x and 1.12.x sleeps the wrong way to ensure the timestamp
296 # used by CVS and the one set by subsequence file modifications are different.
297 # If they are not different CVS will not detect changes.
302 Usage: GIT_DIR=/path/to/.git ${\basename $0} [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit
307 # An alternative to `command` that allows input to be passed as an array
308 # to work around shell problems with weird characters in arguments
309 # if the exec returns non-zero we die
310 sub safe_pipe_capture {
312 if (my $pid = open my $child, '-|') {
313 @output = (<$child>);
314 close $child or die join(' ',@_).": $! $?";
316 exec(@_) or die "$! $?"; # exec() can fail the executable can't be found
318 return wantarray ? @output : join('',@output);
321 sub safe_pipe_capture_blob {
323 if (my $pid = open my $child, '-|') {
326 $output = (<$child>);
327 close $child or die join(' ',@_).": $! $?";
329 exec(@_) or die "$! $?"; # exec() can fail the executable can't be found