1#!/usr/bin/perl -w 2 3# Known limitations: 4# - does not propagate permissions 5# - error handling has not been extensively tested 6# 7 8use strict; 9use Getopt::Std; 10use File::Temp qw(tempdir); 11use Data::Dumper; 12use File::Basename qw(basename dirname); 13 14unless($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){ 15die"GIT_DIR is not defined or is unreadable"; 16} 17 18our($opt_h,$opt_P,$opt_p,$opt_v,$opt_c,$opt_f,$opt_a,$opt_m,$opt_d,$opt_u); 19 20getopts('uhPpvcfam:d:'); 21 22$opt_h&& usage(); 23 24die"Need at least one commit identifier!"unless@ARGV; 25 26my@cvs; 27if($opt_d) { 28@cvs= ('cvs','-d',$opt_d); 29}else{ 30@cvs= ('cvs'); 31} 32 33# resolve target commit 34my$commit; 35$commit=pop@ARGV; 36$commit= safe_pipe_capture('git-rev-parse','--verify',"$commit^0"); 37chomp$commit; 38if($?) { 39die"The commit reference$commitdid not resolve!"; 40} 41 42# resolve what parent we want 43my$parent; 44if(@ARGV) { 45$parent=pop@ARGV; 46$parent= safe_pipe_capture('git-rev-parse','--verify',"$parent^0"); 47chomp$parent; 48if($?) { 49die"The parent reference did not resolve!"; 50} 51} 52 53# find parents from the commit itself 54my@commit= safe_pipe_capture('git-cat-file','commit',$commit); 55my@parents; 56my$committer; 57my$author; 58my$stage='headers';# headers, msg 59my$title; 60my$msg=''; 61 62foreachmy$line(@commit) { 63chomp$line; 64if($stageeq'headers'&&$lineeq'') { 65$stage='msg'; 66next; 67} 68 69if($stageeq'headers') { 70if($line=~m/^parent (\w{40})$/) {# found a parent 71push@parents,$1; 72}elsif($line=~m/^author (.+) \d+ [-+]\d+$/) { 73$author=$1; 74}elsif($line=~m/^committer (.+) \d+ [-+]\d+$/) { 75$committer=$1; 76} 77}else{ 78$msg.=$line."\n"; 79unless($title) { 80$title=$line; 81} 82} 83} 84 85if($parent) { 86my$found; 87# double check that it's a valid parent 88foreachmy$p(@parents) { 89if($peq$parent) { 90$found=1; 91last; 92};# found it 93} 94die"Did not find$parentin the parents for this commit!"if!$foundand!$opt_P; 95}else{# we don't have a parent from the cmdline... 96if(@parents==1) {# it's safe to get it from the commit 97$parent=$parents[0]; 98}else{# or perhaps not! 99die"This commit has more than one parent -- please name the parent you want to use explicitly"; 100} 101} 102 103$opt_v&&print"Applying to CVS commit$commitfrom parent$parent\n"; 104 105# grab the commit message 106open(MSG,">.msg")or die"Cannot open .msg for writing"; 107if($opt_m) { 108print MSG $opt_m; 109} 110print MSG $msg; 111if($opt_a) { 112print MSG "\n\nAuthor:$author\n"; 113if($authorne$committer) { 114print MSG "Committer:$committer\n"; 115} 116} 117close MSG; 118 119`git-diff-tree --binary -p$parent$commit>.cvsexportcommit.diff`;# || die "Cannot diff"; 120 121## apply non-binary changes 122 123# In pedantic mode require all lines of context to match. In normal 124# mode, be compatible with diff/patch: assume 3 lines of context and 125# require at least one line match, i.e. ignore at most 2 lines of 126# context, like diff/patch do by default. 127my$context=$opt_p?'':'-C1'; 128 129print"Checking if patch will apply\n"; 130 131my@stat; 132open APPLY,"GIT_DIR= git-apply$context--summary --numstat<.cvsexportcommit.diff|"||die"cannot patch"; 133@stat=<APPLY>; 134close APPLY ||die"Cannot patch"; 135my(@bfiles,@files,@afiles,@dfiles); 136chomp@stat; 137foreach(@stat) { 138push(@bfiles,$1)ifm/^-\t-\t(.*)$/; 139push(@files,$1)ifm/^-\t-\t(.*)$/; 140push(@files,$1)ifm/^\d+\t\d+\t(.*)$/; 141push(@afiles,$1)ifm/^ create mode [0-7]+ (.*)$/; 142push(@dfiles,$1)ifm/^ delete mode [0-7]+ (.*)$/; 143} 144map{s/^"(.*)"$/$1/g}@bfiles,@files; 145map{s/\\([0-7]{3})/sprintf('%c',oct $1)/eg}@bfiles,@files; 146 147# check that the files are clean and up to date according to cvs 148my$dirty; 149my@dirs; 150foreachmy$p(@afiles) { 151my$path= dirname $p; 152while(!-d $pathand!grep{$_eq$path}@dirs) { 153unshift@dirs,$path; 154$path= dirname $path; 155} 156} 157 158# ... check dirs, 159foreachmy$d(@dirs) { 160if(-e $d) { 161$dirty=1; 162warn"$dexists and is not a directory!\n"; 163} 164} 165 166# ... query status of all files that we have a directory for and parse output of 'cvs status' to %cvsstat. 167my@canstatusfiles; 168foreachmy$f(@files) { 169my$path= dirname $f; 170next if(grep{$_eq$path}@dirs); 171push@canstatusfiles,$f; 172} 173 174my%cvsstat; 175if(@canstatusfiles) { 176if($opt_u) { 177my@updated= safe_pipe_capture(@cvs,'update',@canstatusfiles); 178print@updated; 179} 180my@cvsoutput; 181@cvsoutput= safe_pipe_capture(@cvs,'status',@canstatusfiles); 182my$matchcount=0; 183foreachmy$l(@cvsoutput) { 184chomp$l; 185if($l=~/^File:/and$l=~/Status: (.*)$/) { 186$cvsstat{$canstatusfiles[$matchcount]} =$1; 187$matchcount++; 188} 189} 190} 191 192# ... validate new files, 193foreachmy$f(@afiles) { 194if(defined($cvsstat{$f})and$cvsstat{$f}ne"Unknown") { 195$dirty=1; 196warn"File$fis 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"; 197warn"Status was:$cvsstat{$f}\n"; 198} 199} 200# ... validate known files. 201foreachmy$f(@files) { 202next ifgrep{$_eq$f}@afiles; 203# TODO:we need to handle removed in cvs 204unless(defined($cvsstat{$f})and$cvsstat{$f}eq"Up-to-date") { 205$dirty=1; 206warn"File$fnot up to date but has status '$cvsstat{$f}' in your CVS checkout!\n"; 207} 208} 209if($dirty) { 210if($opt_f) {warn"The tree is not clean -- forced merge\n"; 211$dirty=0; 212}else{ 213die"Exiting: your CVS tree is not clean for this merge."; 214} 215} 216 217print"Applying\n"; 218`GIT_DIR= git-apply$context--summary --numstat --apply <.cvsexportcommit.diff`||die"cannot patch"; 219 220print"Patch applied successfully. Adding new files and directories to CVS\n"; 221my$dirtypatch=0; 222foreachmy$d(@dirs) { 223if(system(@cvs,'add',$d)) { 224$dirtypatch=1; 225warn"Failed to cvs add directory$d-- you may need to do it manually"; 226} 227} 228 229foreachmy$f(@afiles) { 230if(grep{$_eq$f}@bfiles) { 231system(@cvs,'add','-kb',$f); 232}else{ 233system(@cvs,'add',$f); 234} 235if($?) { 236$dirtypatch=1; 237warn"Failed to cvs add$f-- you may need to do it manually"; 238} 239} 240 241foreachmy$f(@dfiles) { 242system(@cvs,'rm','-f',$f); 243if($?) { 244$dirtypatch=1; 245warn"Failed to cvs rm -f$f-- you may need to do it manually"; 246} 247} 248 249print"Commit to CVS\n"; 250print"Patch title (first comment line):$title\n"; 251my@commitfiles=map{unless(m/\s/) {'\''.$_.'\''; }else{$_; }; } (@files); 252my$cmd=join(' ',@cvs)." commit -F .msg@commitfiles"; 253 254if($dirtypatch) { 255print"NOTE: One or more hunks failed to apply cleanly.\n"; 256print"You'll need to apply the patch in .cvsexportcommit.diff manually\n"; 257print"using a patch program. After applying the patch and resolving the\n"; 258print"problems you may commit using:"; 259print"\n$cmd\n\n"; 260exit(1); 261} 262 263if($opt_c) { 264print"Autocommit\n$cmd\n"; 265print safe_pipe_capture(@cvs,'commit','-F','.msg',@files); 266if($?) { 267die"Exiting: The commit did not succeed"; 268} 269print"Committed successfully to CVS\n"; 270# clean up 271unlink(".msg"); 272}else{ 273print"Ready for you to commit, just run:\n\n$cmd\n"; 274} 275 276# clean up 277unlink(".cvsexportcommit.diff"); 278 279# CVS version 1.11.x and 1.12.x sleeps the wrong way to ensure the timestamp 280# used by CVS and the one set by subsequence file modifications are different. 281# If they are not different CVS will not detect changes. 282sleep(1); 283 284sub usage { 285print STDERR <<END; 286Usage: GIT_DIR=/path/to/.git ${\basename$0} [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit 287END 288exit(1); 289} 290 291# An alternative to `command` that allows input to be passed as an array 292# to work around shell problems with weird characters in arguments 293# if the exec returns non-zero we die 294sub safe_pipe_capture { 295my@output; 296if(my$pid=open my$child,'-|') { 297@output= (<$child>); 298close$childor die join(' ',@_).":$!$?"; 299}else{ 300exec(@_)or die"$!$?";# exec() can fail the executable can't be found 301} 302returnwantarray?@output:join('',@output); 303} 304 305sub safe_pipe_capture_blob { 306my$output; 307if(my$pid=open my$child,'-|') { 308local$/; 309undef$/; 310$output= (<$child>); 311close$childor die join(' ',@_).":$!$?"; 312}else{ 313exec(@_)or die"$!$?";# exec() can fail the executable can't be found 314} 315return$output; 316}