]>
Commit | Line | Data |
---|---|---|
5e0306ad ML |
1 | #!/usr/bin/perl -w |
2 | ||
0d71b31a | 3 | # Known limitations: |
0d71b31a | 4 | # - does not propagate permissions |
e86ad71f RR |
5 | # - error handling has not been extensively tested |
6 | # | |
0d71b31a | 7 | |
5e0306ad ML |
8 | use strict; |
9 | use Getopt::Std; | |
10 | use File::Temp qw(tempdir); | |
11 | use Data::Dumper; | |
3f0f756b | 12 | use File::Basename qw(basename dirname); |
5e0306ad ML |
13 | |
14 | unless ($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){ | |
15 | die "GIT_DIR is not defined or is unreadable"; | |
16 | } | |
17 | ||
4a6b9bb6 | 18 | our ($opt_h, $opt_P, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m, $opt_d); |
5e0306ad | 19 | |
4a6b9bb6 | 20 | getopts('hPpvcfam:d:'); |
5e0306ad ML |
21 | |
22 | $opt_h && usage(); | |
23 | ||
24 | die "Need at least one commit identifier!" unless @ARGV; | |
25 | ||
4a6b9bb6 SS |
26 | my @cvs; |
27 | if ($opt_d) { | |
28 | @cvs = ('cvs', '-d', $opt_d); | |
29 | } else { | |
30 | @cvs = ('cvs'); | |
31 | } | |
32 | ||
5e0306ad ML |
33 | # setup a tempdir |
34 | our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX', | |
35 | TMPDIR => 1, | |
36 | CLEANUP => 1); | |
37 | ||
5e0306ad ML |
38 | # resolve target commit |
39 | my $commit; | |
40 | $commit = pop @ARGV; | |
d41df15e | 41 | $commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0"); |
5e0306ad ML |
42 | chomp $commit; |
43 | if ($?) { | |
44 | die "The commit reference $commit did not resolve!"; | |
45 | } | |
46 | ||
47 | # resolve what parent we want | |
48 | my $parent; | |
49 | if (@ARGV) { | |
50 | $parent = pop @ARGV; | |
d41df15e | 51 | $parent = safe_pipe_capture('git-rev-parse', '--verify', "$parent^0"); |
5e0306ad ML |
52 | chomp $parent; |
53 | if ($?) { | |
54 | die "The parent reference did not resolve!"; | |
55 | } | |
56 | } | |
57 | ||
58 | # find parents from the commit itself | |
d41df15e | 59 | my @commit = safe_pipe_capture('git-cat-file', 'commit', $commit); |
5e0306ad | 60 | my @parents; |
1b91abe3 ML |
61 | my $committer; |
62 | my $author; | |
63 | my $stage = 'headers'; # headers, msg | |
64 | my $title; | |
65 | my $msg = ''; | |
66 | ||
67 | foreach my $line (@commit) { | |
68 | chomp $line; | |
69 | if ($stage eq 'headers' && $line eq '') { | |
70 | $stage = 'msg'; | |
71 | next; | |
5e0306ad | 72 | } |
1b91abe3 ML |
73 | |
74 | if ($stage eq 'headers') { | |
75 | if ($line =~ m/^parent (\w{40})$/) { # found a parent | |
76 | push @parents, $1; | |
fe142b3a | 77 | } elsif ($line =~ m/^author (.+) \d+ [-+]\d+$/) { |
1b91abe3 | 78 | $author = $1; |
fe142b3a | 79 | } elsif ($line =~ m/^committer (.+) \d+ [-+]\d+$/) { |
1b91abe3 ML |
80 | $committer = $1; |
81 | } | |
82 | } else { | |
83 | $msg .= $line . "\n"; | |
84 | unless ($title) { | |
85 | $title = $line; | |
86 | } | |
5e0306ad ML |
87 | } |
88 | } | |
89 | ||
90 | if ($parent) { | |
135a522e | 91 | my $found; |
5e0306ad ML |
92 | # double check that it's a valid parent |
93 | foreach my $p (@parents) { | |
5e0306ad ML |
94 | if ($p eq $parent) { |
95 | $found = 1; | |
96 | last; | |
97 | }; # found it | |
e09f5d7b | 98 | } |
ca28370a | 99 | die "Did not find $parent in the parents for this commit!" if !$found and !$opt_P; |
5e0306ad ML |
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"; | |
105 | } | |
106 | } | |
107 | ||
108 | $opt_v && print "Applying to CVS commit $commit from parent $parent\n"; | |
109 | ||
110 | # grab the commit message | |
992793c8 | 111 | open(MSG, ">.msg") or die "Cannot open .msg for writing"; |
1b91abe3 ML |
112 | if ($opt_m) { |
113 | print MSG $opt_m; | |
114 | } | |
115 | print MSG $msg; | |
116 | if ($opt_a) { | |
117 | print MSG "\n\nAuthor: $author\n"; | |
118 | if ($author ne $committer) { | |
119 | print MSG "Committer: $committer\n"; | |
120 | } | |
121 | } | |
992793c8 ML |
122 | close MSG; |
123 | ||
e86ad71f RR |
124 | `git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; |
125 | ||
126 | ## apply non-binary changes | |
fc1f458c TB |
127 | |
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'; | |
e86ad71f RR |
133 | |
134 | print "Checking if patch will apply\n"; | |
135 | ||
136 | my @stat; | |
fc1f458c | 137 | open APPLY, "GIT_DIR= git-apply $context --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch"; |
e86ad71f RR |
138 | @stat=<APPLY>; |
139 | close APPLY || die "Cannot patch"; | |
140 | my (@bfiles,@files,@afiles,@dfiles); | |
141 | chomp @stat; | |
142 | foreach (@stat) { | |
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]+ (.*)$/; | |
5e0306ad | 148 | } |
e86ad71f RR |
149 | map { s/^"(.*)"$/$1/g } @bfiles,@files; |
150 | map { s/\\([0-7]{3})/sprintf('%c',oct $1)/eg } @bfiles,@files; | |
5e0306ad ML |
151 | |
152 | # check that the files are clean and up to date according to cvs | |
153 | my $dirty; | |
e86ad71f RR |
154 | my @dirs; |
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; | |
160 | } | |
161 | } | |
162 | ||
c56f0d9c | 163 | # ... check dirs, |
3f0f756b YD |
164 | foreach my $d (@dirs) { |
165 | if (-e $d) { | |
166 | $dirty = 1; | |
167 | warn "$d exists and is not a directory!\n"; | |
168 | } | |
169 | } | |
c56f0d9c SP |
170 | |
171 | # ... query status of all files that we have a directory for and parse output of 'cvs status' to %cvsstat. | |
172 | my @canstatusfiles; | |
173 | foreach my $f (@files) { | |
174 | my $path = dirname $f; | |
175 | next if (grep { $_ eq $path } @dirs); | |
176 | push @canstatusfiles, $f; | |
177 | } | |
178 | ||
179 | my %cvsstat; | |
180 | if (@canstatusfiles) { | |
181 | my @cvsoutput; | |
182 | @cvsoutput= safe_pipe_capture(@cvs, 'status', @canstatusfiles); | |
183 | my $matchcount = 0; | |
184 | foreach my $l (@cvsoutput) { | |
185 | chomp $l; | |
186 | if ( $l =~ /^File:/ and $l =~ /Status: (.*)$/ ) { | |
187 | $cvsstat{$canstatusfiles[$matchcount]} = $1; | |
188 | $matchcount++; | |
189 | } | |
fe142b3a | 190 | } |
c56f0d9c SP |
191 | } |
192 | ||
193 | # ... validate new files, | |
194 | foreach my $f (@afiles) { | |
195 | if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") { | |
d41df15e | 196 | $dirty = 1; |
992793c8 | 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"; |
c56f0d9c | 198 | warn "Status was: $cvsstat{$f}\n"; |
576cfc86 YD |
199 | } |
200 | } | |
c56f0d9c | 201 | # ... validate known files. |
e86ad71f RR |
202 | foreach my $f (@files) { |
203 | next if grep { $_ eq $f } @afiles; | |
576cfc86 | 204 | # TODO:we need to handle removed in cvs |
c56f0d9c | 205 | unless (defined ($cvsstat{$f}) and $cvsstat{$f} eq "Up-to-date") { |
5e0306ad | 206 | $dirty = 1; |
c56f0d9c | 207 | warn "File $f not up to date but has status '$cvsstat{$f}' in your CVS checkout!\n"; |
5e0306ad ML |
208 | } |
209 | } | |
210 | if ($dirty) { | |
992793c8 ML |
211 | if ($opt_f) { warn "The tree is not clean -- forced merge\n"; |
212 | $dirty = 0; | |
213 | } else { | |
214 | die "Exiting: your CVS tree is not clean for this merge."; | |
215 | } | |
5e0306ad ML |
216 | } |
217 | ||
e86ad71f | 218 | print "Applying\n"; |
fc1f458c | 219 | `GIT_DIR= git-apply $context --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch"; |
5e0306ad | 220 | |
e86ad71f RR |
221 | print "Patch applied successfully. Adding new files and directories to CVS\n"; |
222 | my $dirtypatch = 0; | |
3f0f756b | 223 | foreach my $d (@dirs) { |
4a6b9bb6 | 224 | if (system(@cvs,'add',$d)) { |
e86ad71f | 225 | $dirtypatch = 1; |
3f0f756b YD |
226 | warn "Failed to cvs add directory $d -- you may need to do it manually"; |
227 | } | |
228 | } | |
229 | ||
5e0306ad | 230 | foreach my $f (@afiles) { |
fe142b3a | 231 | if (grep { $_ eq $f } @bfiles) { |
4a6b9bb6 | 232 | system(@cvs, 'add','-kb',$f); |
fe142b3a | 233 | } else { |
4a6b9bb6 | 234 | system(@cvs, 'add', $f); |
fe142b3a | 235 | } |
5e0306ad | 236 | if ($?) { |
e86ad71f | 237 | $dirtypatch = 1; |
5e0306ad ML |
238 | warn "Failed to cvs add $f -- you may need to do it manually"; |
239 | } | |
240 | } | |
241 | ||
242 | foreach my $f (@dfiles) { | |
4a6b9bb6 | 243 | system(@cvs, 'rm', '-f', $f); |
5e0306ad | 244 | if ($?) { |
e86ad71f | 245 | $dirtypatch = 1; |
5e0306ad ML |
246 | warn "Failed to cvs rm -f $f -- you may need to do it manually"; |
247 | } | |
248 | } | |
249 | ||
250 | print "Commit to CVS\n"; | |
e86ad71f RR |
251 | print "Patch title (first comment line): $title\n"; |
252 | my @commitfiles = map { unless (m/\s/) { '\''.$_.'\''; } else { $_; }; } (@files); | |
4a6b9bb6 | 253 | my $cmd = join(' ', @cvs)." commit -F .msg @commitfiles"; |
5e0306ad ML |
254 | |
255 | if ($dirtypatch) { | |
256 | print "NOTE: One or more hunks failed to apply cleanly.\n"; | |
e86ad71f RR |
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:"; | |
5e0306ad | 260 | print "\n $cmd\n\n"; |
27dedf0c | 261 | exit(1); |
5e0306ad ML |
262 | } |
263 | ||
5e0306ad ML |
264 | if ($opt_c) { |
265 | print "Autocommit\n $cmd\n"; | |
4a6b9bb6 | 266 | print safe_pipe_capture(@cvs, 'commit', '-F', '.msg', @files); |
5e0306ad | 267 | if ($?) { |
5e0306ad ML |
268 | die "Exiting: The commit did not succeed"; |
269 | } | |
270 | print "Committed successfully to CVS\n"; | |
cf70c16f GP |
271 | # clean up |
272 | unlink(".msg"); | |
5e0306ad ML |
273 | } else { |
274 | print "Ready for you to commit, just run:\n\n $cmd\n"; | |
275 | } | |
e86ad71f RR |
276 | |
277 | # clean up | |
278 | unlink(".cvsexportcommit.diff"); | |
e86ad71f | 279 | |
5e0306ad ML |
280 | sub usage { |
281 | print STDERR <<END; | |
992793c8 | 282 | Usage: GIT_DIR=/path/to/.git ${\basename $0} [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit |
5e0306ad ML |
283 | END |
284 | exit(1); | |
285 | } | |
286 | ||
82e5a82f | 287 | # An alternative to `command` that allows input to be passed as an array |
d41df15e ML |
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 { | |
291 | my @output; | |
292 | if (my $pid = open my $child, '-|') { | |
293 | @output = (<$child>); | |
294 | close $child or die join(' ',@_).": $! $?"; | |
295 | } else { | |
296 | exec(@_) or die "$! $?"; # exec() can fail the executable can't be found | |
297 | } | |
298 | return wantarray ? @output : join('',@output); | |
299 | } | |
7c0f7028 | 300 | |
e86ad71f RR |
301 | sub safe_pipe_capture_blob { |
302 | my $output; | |
303 | if (my $pid = open my $child, '-|') { | |
304 | local $/; | |
305 | undef $/; | |
306 | $output = (<$child>); | |
307 | close $child or die join(' ',@_).": $! $?"; | |
308 | } else { | |
309 | exec(@_) or die "$! $?"; # exec() can fail the executable can't be found | |
310 | } | |
311 | return $output; | |
7c0f7028 | 312 | } |