]>
git.ipfire.org Git - thirdparty/git.git/blob - git-cvsexportcommit.perl
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 );
20 getopts
( 'hPpvcfam: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\n Author: $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 @cvsoutput = safe_pipe_capture
( @cvs , 'status' , @canstatusfiles );
184 foreach my $l ( @cvsoutput ) {
186 if ( $l =~ /^File:/ and $l =~ /Status: (.*)$/ ) {
187 $cvsstat { $canstatusfiles [ $matchcount ]} = $1 ;
193 # ... validate new files,
194 foreach my $f ( @afiles ) {
195 if ( defined ( $cvsstat { $f }) and $cvsstat { $f } ne "Unknown" ) {
197 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 " ;
198 warn "Status was: $cvsstat { $f } \n " ;
201 # ... validate known files.
202 foreach my $f ( @files ) {
203 next if grep { $_ eq $f } @afiles ;
204 # TODO:we need to handle removed in cvs
205 unless ( defined ( $cvsstat { $f }) and $cvsstat { $f } eq "Up-to-date" ) {
207 warn "File $f not up to date but has status ' $cvsstat { $f }' in your CVS checkout! \n " ;
211 if ( $opt_f ) { warn "The tree is not clean -- forced merge \n " ;
214 die "Exiting: your CVS tree is not clean for this merge." ;
219 `GIT_DIR= git-apply $context --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch" ;
221 print "Patch applied successfully. Adding new files and directories to CVS \n " ;
223 foreach my $d ( @dirs ) {
224 if ( system ( @cvs , 'add' , $d )) {
226 warn "Failed to cvs add directory $d -- you may need to do it manually" ;
230 foreach my $f ( @afiles ) {
231 if ( grep { $_ eq $f } @bfiles ) {
232 system ( @cvs , 'add' , '-kb' , $f );
234 system ( @cvs , 'add' , $f );
238 warn "Failed to cvs add $f -- you may need to do it manually" ;
242 foreach my $f ( @dfiles ) {
243 system ( @cvs , 'rm' , '-f' , $f );
246 warn "Failed to cvs rm -f $f -- you may need to do it manually" ;
250 print "Commit to CVS \n " ;
251 print "Patch title (first comment line): $title \n " ;
252 my @commitfiles = map { unless ( m/\s/ ) { ' \' ' . $_ . ' \' ' ; } else { $_ ; }; } ( @files );
253 my $cmd = join ( ' ' , @cvs ). " commit -F .msg @commitfiles " ;
256 print "NOTE: One or more hunks failed to apply cleanly. \n " ;
257 print "You'll need to apply the patch in .cvsexportcommit.diff manually \n " ;
258 print "using a patch program. After applying the patch and resolving the \n " ;
259 print "problems you may commit using:" ;
265 print "Autocommit \n $cmd \n " ;
266 print safe_pipe_capture
( @cvs , 'commit' , '-F' , '.msg' , @files );
268 die "Exiting: The commit did not succeed" ;
270 print "Committed successfully to CVS \n " ;
274 print "Ready for you to commit, just run: \n\n $cmd \n " ;
278 unlink ( ".cvsexportcommit.diff" );
282 Usage: GIT_DIR=/path/to/.git ${ \b asename $0 } [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit
287 # An alternative to `command` that allows input to be passed as an array
288 # to work around shell problems with weird characters in arguments
289 # if the exec returns non-zero we die
290 sub safe_pipe_capture
{
292 if ( my $pid = open my $child , '-|' ) {
293 @output = (< $child >);
294 close $child or die join ( ' ' , @_ ). ": $! $?" ;
296 exec ( @_ ) or die "$! $?" ; # exec() can fail the executable can't be found
298 return wantarray ?
@output : join ( '' , @output );
301 sub safe_pipe_capture_blob
{
303 if ( my $pid = open my $child , '-|' ) {
306 $output = (< $child >);
307 close $child or die join ( ' ' , @_ ). ": $! $?" ;
309 exec ( @_ ) or die "$! $?" ; # exec() can fail the executable can't be found