]>
git.ipfire.org Git - thirdparty/git.git/blob - git-cvsexportcommit.perl
4 # - cannot add or remove binary files
5 # - does not propagate permissions
6 # - tells "ready for commit" even when things could not be completed
7 # (eg addition of a binary file)
11 use File
:: Temp
qw(tempdir) ;
13 use File
:: Basename
qw(basename dirname) ;
15 unless ( $ENV { GIT_DIR
} && - r
$ENV { GIT_DIR
}){
16 die "GIT_DIR is not defined or is unreadable" ;
19 our ( $opt_h , $opt_p , $opt_v , $opt_c , $opt_f , $opt_a , $opt_m );
25 die "Need at least one commit identifier!" unless @ARGV ;
28 our ( $tmpdir , $tmpdirname ) = tempdir
( 'git-cvsapplycommit-XXXXXX' ,
32 # resolve target commit
35 $commit = safe_pipe_capture
( 'git-rev-parse' , '--verify' , " $commit ^0" );
38 die "The commit reference $commit did not resolve!" ;
41 # resolve what parent we want
45 $parent = safe_pipe_capture
( 'git-rev-parse' , '--verify' , " $parent ^0" );
48 die "The parent reference did not resolve!" ;
52 # find parents from the commit itself
53 my @commit = safe_pipe_capture
( 'git-cat-file' , 'commit' , $commit );
57 my $stage = 'headers' ; # headers, msg
61 foreach my $line ( @commit ) {
63 if ( $stage eq 'headers' && $line eq '' ) {
68 if ( $stage eq 'headers' ) {
69 if ( $line =~ m/^parent (\w{40})$/ ) { # found a parent
71 } elsif ( $line =~ m/^author (.+) \d+ \+\d+$/ ) {
73 } elsif ( $line =~ m/^committer (.+) \d+ \+\d+$/ ) {
86 # double check that it's a valid parent
87 foreach my $p ( @parents ) {
93 die "Did not find $parent in the parents for this commit!" if ! $found ;
94 } else { # we don't have a parent from the cmdline...
95 if ( @parents == 1 ) { # it's safe to get it from the commit
96 $parent = $parents [ 0 ];
97 } else { # or perhaps not!
98 die "This commit has more than one parent -- please name the parent you want to use explicitly" ;
102 $opt_v && print "Applying to CVS commit $commit from parent $parent \n " ;
104 # grab the commit message
105 open ( MSG
, ">.msg" ) or die "Cannot open .msg for writing" ;
111 print MSG
" \n\n Author: $author \n " ;
112 if ( $author ne $committer ) {
113 print MSG
"Committer: $committer \n " ;
118 my ( @afiles , @dfiles , @mfiles , @dirs );
119 my @files = safe_pipe_capture
( 'git-diff-tree' , '-r' , $parent , $commit );
121 $ ?
&& die "Error in git-diff-tree" ;
122 foreach my $f ( @files ) {
124 my @fields = split ( m!\s+! , $f );
125 if ( $fields [ 4 ] eq 'A' ) {
126 my $path = $fields [ 5 ];
128 # add any needed parent directories
129 $path = dirname
$path ;
130 while (!- d
$path and ! grep { $_ eq $path } @dirs ) {
131 unshift @dirs , $path ;
132 $path = dirname
$path ;
135 if ( $fields [ 4 ] eq 'M' ) {
136 push @mfiles , $fields [ 5 ];
138 if ( $fields [ 4 ] eq 'R' ) {
139 push @dfiles , $fields [ 5 ];
142 $opt_v && print "The commit affects: \n " ;
143 $opt_v && print join ( " \n " , @afiles , @mfiles , @dfiles ) . " \n\n " ;
144 undef @files ; # don't need it anymore
146 # check that the files are clean and up to date according to cvs
148 foreach my $d ( @dirs ) {
151 warn " $d exists and is not a directory! \n " ;
154 foreach my $f ( @afiles ) {
155 # This should return only one value
156 my @status = grep ( m/^File/ , safe_pipe_capture
( 'cvs' , '-q' , 'status' , $f ));
157 if ( @status > 1 ) { warn 'Strange! cvs status returned more than one line?' };
158 if (- d dirname
$f and $status [ 0 ] !~ m/Status: Unknown$/
159 and $status [ 0 ] !~ m/^File: no file / ) {
161 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 " ;
162 warn "Status was: $status [0] \n " ;
165 foreach my $f ( @mfiles , @dfiles ) {
166 # TODO:we need to handle removed in cvs
167 my @status = grep ( m/^File/ , safe_pipe_capture
( 'cvs' , '-q' , 'status' , $f ));
168 if ( @status > 1 ) { warn 'Strange! cvs status returned more than one line?' };
169 unless ( $status [ 0 ] =~ m/Status: Up-to-date$/ ) {
171 warn "File $f not up to date in your CVS checkout! \n " ;
175 if ( $opt_f ) { warn "The tree is not clean -- forced merge \n " ;
178 die "Exiting: your CVS tree is not clean for this merge." ;
183 ### NOTE: if you are planning to die() past this point
184 ### you MUST call cleanupcvs(@files) before die()
188 print "Creating new directories \n " ;
189 foreach my $d ( @dirs ) {
191 warn "Could not mkdir $d : $!" ;
197 warn "Failed to cvs add directory $d -- you may need to do it manually" ;
201 print "'Patching' binary files \n " ;
203 my @bfiles = grep ( m/^Binary/ , safe_pipe_capture
( 'git-diff-tree' , '-p' , $parent , $commit ));
204 @bfiles = map { chomp } @bfiles ;
205 foreach my $f ( @bfiles ) {
206 # check that the file in cvs matches the "old" file
207 # extract the file to $tmpdir and compare with cmp
208 my $tree = safe_pipe_capture
( 'git-rev-parse' , " $parent ^{tree}" );
210 my $blob = `git-ls-tree $tree " $f " | cut -f 1 | cut -d ' ' -f 3` ;
212 `git-cat-file blob $blob > $tmpdir /blob` ;
213 if ( system ( 'cmp' , '-s' , $f , " $tmpdir /blob" )) {
214 warn "Binary file $f in CVS does not match parent. \n " ;
219 # replace with the new file
220 `git-cat-file blob $blob > $f ` ;
222 # TODO: something smart with file modes
227 die "Exiting: Binary files in CVS do not match parent" ;
230 ## apply non-binary changes
231 my $fuzz = $opt_p ?
0 : 2 ;
233 print "Patching non-binary files \n " ;
234 print `(git-diff-tree -p $parent -p $commit | patch -p1 -F $fuzz ) 2>&1` ;
237 if (($ ?
>> 8 ) == 2 ) {
239 die "Exiting: Patch reported serious trouble -- you will have to apply this patch manually" ;
240 } elsif (($ ?
>> 8 ) == 1 ) { # some hunks failed to apply
244 foreach my $f ( @afiles ) {
245 system ( 'cvs' , 'add' , $f );
248 warn "Failed to cvs add $f -- you may need to do it manually" ;
252 foreach my $f ( @dfiles ) {
253 system ( 'cvs' , 'rm' , '-f' , $f );
256 warn "Failed to cvs rm -f $f -- you may need to do it manually" ;
260 print "Commit to CVS \n " ;
261 print "Patch: $title \n " ;
262 my $commitfiles = join ( ' ' , @afiles , @mfiles , @dfiles );
263 my $cmd = "cvs commit -F .msg $commitfiles " ;
266 print "NOTE: One or more hunks failed to apply cleanly. \n " ;
267 print "Resolve the conflicts and then commit using: \n " ;
274 print "Autocommit \n $cmd \n " ;
275 print safe_pipe_capture
( 'cvs' , 'commit' , '-F' , '.msg' , @afiles , @mfiles , @dfiles );
278 die "Exiting: The commit did not succeed" ;
280 print "Committed successfully to CVS \n " ;
282 print "Ready for you to commit, just run: \n\n $cmd \n " ;
286 Usage: GIT_DIR=/path/to/.git ${ \b asename $0 } [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit
291 # ensure cvs is clean before we die
294 foreach my $f ( @files ) {
295 system ( 'cvs' , '-q' , 'update' , '-C' , $f );
297 warn "Warning! Failed to cleanup state of $f \n " ;
302 # An alternative to `command` that allows input to be passed as an array
303 # to work around shell problems with weird characters in arguments
304 # if the exec returns non-zero we die
305 sub safe_pipe_capture
{
307 if ( my $pid = open my $child , '-|' ) {
308 @output = (< $child >);
309 close $child or die join ( ' ' , @_ ). ": $! $?" ;
311 exec ( @_ ) or die "$! $?" ; # exec() can fail the executable can't be found
313 return wantarray ?
@output : join ( '' , @output );