3 # Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
4 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
5 # Copyright (C) 2010 Chris Jerdonek (chris.jerdonek@gmail.com)
7 # Redistribution and use in source and binary forms, with or without
8 # modification, are permitted provided that the following conditions
11 # 1. Redistributions of source code must retain the above copyright
12 # notice, this list of conditions and the following disclaimer.
13 # 2. Redistributions in binary form must reproduce the above copyright
14 # notice, this list of conditions and the following disclaimer in the
15 # documentation and/or other materials provided with the distribution.
16 # 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
17 # its contributors may be used to endorse or promote products derived
18 # from this software without specific prior written permission.
20 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
21 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
22 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23 # DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
24 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
25 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
26 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
27 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 # "patch" script for WebKit Open Source Project, used to apply patches.
33 # Differences from invoking "patch -p0":
35 # Handles added files (does a svn add with logic to handle local changes).
36 # Handles added directories (does a svn add).
37 # Handles removed files (does a svn rm with logic to handle local changes).
38 # Handles removed directories--those with no more files or directories left in them
40 # Has mode where it will roll back to svn version numbers in the patch file so svn
41 # can do a 3-way merge.
42 # Paths from Index: lines are used rather than the paths on the patch lines, which
43 # makes patches generated by "cvs diff" work (increasingly unimportant since we
44 # use Subversion now).
45 # ChangeLog patches use --fuzz=3 to prevent rejects.
46 # Handles binary files (requires patches made by svn-create-patch).
47 # Handles copied and moved files (requires patches made by svn-create-patch).
48 # Handles git-diff patches (without binary changes) created at the top-level directory
52 # Handle property changes.
53 # Handle copied and moved directories (would require patches made by svn-create-patch).
54 # When doing a removal, check that old file matches what's being removed.
55 # Notice a patch that's being applied at the "wrong level" and make it work anyway.
56 # Do a dry run on the whole patch and don't do anything if part of the patch is
57 # going to fail (probably too strict unless we exclude ChangeLog).
58 # Handle git-diff patches with binary delta
68 use POSIX qw(strftime);
71 use lib $FindBin::Bin;
74 sub addDirectoriesIfNeeded($);
77 sub handleBinaryChange($$);
78 sub handleGitBinaryChange($$);
79 sub isDirectoryEmptyForRemoval($);
81 sub removeDirectoriesIfNeeded();
83 # These should be replaced by an scm class/module:
84 sub scmKnowsOfFile($);
94 my $optionParseSuccess = GetOptions(
96 "help!" => \$showHelp,
97 "reviewer=s" => \$reviewer,
101 if (!$optionParseSuccess || $showHelp) {
102 print STDERR basename($0) . " [-h|--help] [--force] [-m|--merge] [-r|--reviewer name] patch1 [patch2 ...]\n";
106 my %removeDirectoryIgnoreList = (
114 my $epochTime = time(); # This is used to set the date in ChangeLog files.
115 my $globalExitStatus = 0;
117 my $repositoryRootPath = determineVCSRoot();
119 my %checkedDirectories;
121 # Need to use a typeglob to pass the file handle as a parameter,
122 # otherwise get a bareword error.
123 my @diffHashRefs = parsePatch(*ARGV);
125 print "Parsed " . @diffHashRefs . " diffs from patch file(s).\n";
127 my $preparedPatchHash = prepareParsedPatch($force, @diffHashRefs);
129 my @copyDiffHashRefs = @{$preparedPatchHash->{copyDiffHashRefs}};
130 my @nonCopyDiffHashRefs = @{$preparedPatchHash->{nonCopyDiffHashRefs}};
131 my %sourceRevisions = %{$preparedPatchHash->{sourceRevisionHash}};
134 die "--merge is currently only supported for SVN" unless isSVN();
135 # How do we handle Git patches applied to an SVN checkout here?
136 for my $file (sort keys %sourceRevisions) {
137 my $version = $sourceRevisions{$file};
138 print "Getting version $version of $file\n";
139 my $escapedFile = escapeSubversionPath($file);
140 system("svn", "update", "-r", $version, $escapedFile) == 0 or die "Failed to run svn update -r $version $escapedFile.";
144 # Handle copied and moved files first since moved files may have their
145 # source deleted before the move.
146 for my $copyDiffHashRef (@copyDiffHashRefs) {
147 my $indexPath = $copyDiffHashRef->{indexPath};
148 my $copiedFromPath = $copyDiffHashRef->{copiedFromPath};
150 addDirectoriesIfNeeded(dirname($indexPath));
151 scmCopy($copiedFromPath, $indexPath);
154 for my $diffHashRef (@nonCopyDiffHashRefs) {
158 removeDirectoriesIfNeeded();
160 exit $globalExitStatus;
162 sub addDirectoriesIfNeeded($)
164 # Git removes a directory once the last file in it is removed. We need
165 # explicitly check for the existence of each directory along the path
166 # (and create it if it doesn't) so as to support patches that move all files in
167 # directory A to A/B. That is, we cannot depend on %checkedDirectories.
169 my @dirs = File::Spec->splitdir($path);
171 while (scalar @dirs) {
172 $dir = File::Spec->catdir($dir, shift @dirs);
173 next if !isGit() && exists $checkedDirectories{$dir};
175 mkdir $dir or die "Failed to create required directory '$dir' for path '$path'\n";
177 $checkedDirectories{$dir} = 1;
180 # SVN prints "svn: warning: 'directory' is already under version control"
181 # if you try and add a directory which is already in the repository.
182 # Git will ignore the add, but re-adding large directories can be sloooow.
183 # So we check first to see if the directory is under version control first.
184 if (!scmKnowsOfFile($dir)) {
187 $checkedDirectories{$dir} = 1;
190 die "'$dir' exists, but is not a directory";
196 # $patch: a patch string.
197 # $pathRelativeToRoot: the path of the file to be patched, relative to the
198 # repository root. This should normally be the path
199 # found in the patch's "Index:" line.
200 # $options: a reference to an array of options to pass to the patch command.
203 my ($patch, $pathRelativeToRoot, $options) = @_;
205 my $optionalArgs = {options => $options, ensureForce => $force};
207 my $exitStatus = runPatchCommand($patch, $repositoryRootPath, $pathRelativeToRoot, $optionalArgs);
210 $globalExitStatus = $exitStatus;
217 open(FILE, $file) or die "Can't open '$file': $!";
219 my $checksum = Digest::MD5->new->addfile(*FILE)->hexdigest();
224 sub handleBinaryChange($$)
226 my ($fullPath, $contents) = @_;
227 # [A-Za-z0-9+/] is the class of allowed base64 characters.
228 # One or more lines, at most 76 characters in length.
229 # The last line is allowed to have up to two '=' characters at the end (to signify padding).
230 if ($contents =~ m#((\n[A-Za-z0-9+/]{76})*\n[A-Za-z0-9+/]{2,74}?[A-Za-z0-9+/=]{2}\n)#) {
231 # Addition or Modification
232 open FILE, ">", $fullPath or die "Failed to open $fullPath.";
233 print FILE decode_base64($1);
235 if (!scmKnowsOfFile($fullPath)) {
241 scmRemove($fullPath);
245 sub handleGitBinaryChange($$)
247 my ($fullPath, $diffHashRef) = @_;
249 my $contents = $diffHashRef->{svnConvertedText};
251 my ($binaryChunkType, $binaryChunk, $reverseBinaryChunkType, $reverseBinaryChunk) = decodeGitBinaryPatch($contents, $fullPath);
253 my $isFileAddition = $diffHashRef->{isNew};
254 my $isFileDeletion = $diffHashRef->{isDeletion};
256 my $originalContents = "";
257 if (open FILE, $fullPath) {
258 die "$fullPath already exists" if $isFileAddition;
260 $originalContents = join("", <FILE>);
264 if ($reverseBinaryChunkType eq "literal") {
265 die "Original content of $fullPath mismatches" if $originalContents ne $reverseBinaryChunk;
268 if ($isFileDeletion) {
269 scmRemove($fullPath);
271 # Addition or Modification
273 if ($binaryChunkType eq "delta") {
274 $out = applyGitBinaryPatchDelta($binaryChunk, $originalContents);
278 if ($reverseBinaryChunkType eq "delta") {
279 die "Original content of $fullPath mismatches" if $originalContents ne applyGitBinaryPatchDelta($reverseBinaryChunk, $out);
281 open FILE, ">", $fullPath or die "Failed to open $fullPath.";
284 if ($isFileAddition) {
290 sub isDirectoryEmptyForRemoval($)
293 return 1 unless -d $dir;
294 my $directoryIsEmpty = 1;
295 opendir DIR, $dir or die "Could not open '$dir' to list files: $?";
296 for (my $item = readdir DIR; $item && $directoryIsEmpty; $item = readdir DIR) {
297 next if exists $removeDirectoryIgnoreList{$item};
298 if (-d File::Spec->catdir($dir, $item)) {
299 $directoryIsEmpty = 0;
301 next if (scmWillDeleteFile(File::Spec->catdir($dir, $item)));
302 $directoryIsEmpty = 0;
306 return $directoryIsEmpty;
310 # $diffHashRef: a diff hash reference of the type returned by parsePatch().
313 my ($diffHashRef) = @_;
315 # Make sure $patch is initialized to some value. A deletion can have no
316 # svnConvertedText property in the case of a deletion resulting from a
318 my $patch = $diffHashRef->{svnConvertedText} || "";
320 my $fullPath = $diffHashRef->{indexPath};
321 my $isBinary = $diffHashRef->{isBinary};
322 my $isGit = $diffHashRef->{isGit};
323 my $hasTextChunks = $patch && $diffHashRef->{numTextChunks};
328 $addition = 1 if ($diffHashRef->{isNew} || $patch =~ /\n@@ -0,0 .* @@/);
329 $deletion = 1 if ($diffHashRef->{isDeletion} || $patch =~ /\n@@ .* \+0,0 @@/);
331 if (!$addition && !$deletion && !$isBinary && $hasTextChunks) {
332 # Standard patch, patch tool can handle this.
333 if (basename($fullPath) eq "ChangeLog") {
334 my $changeLogDotOrigExisted = -f "${fullPath}.orig";
335 my $changeLogHash = fixChangeLogPatch($patch);
336 my $newPatch = setChangeLogDateAndReviewer($changeLogHash->{patch}, $reviewer, $epochTime);
337 applyPatch($newPatch, $fullPath, ["--fuzz=3"]);
338 unlink("${fullPath}.orig") if (! $changeLogDotOrigExisted);
340 applyPatch($patch, $fullPath);
343 # Either a deletion, an addition or a binary change.
345 addDirectoriesIfNeeded(dirname($fullPath));
349 handleGitBinaryChange($fullPath, $diffHashRef);
351 handleBinaryChange($fullPath, $patch) if $patch;
353 } elsif ($deletion) {
354 applyPatch($patch, $fullPath, ["--force"]) if $patch;
355 scmRemove($fullPath);
356 } elsif ($addition) {
358 rename($fullPath, "$fullPath.orig") if -e $fullPath;
359 applyPatch($patch, $fullPath) if $patch;
360 unlink("$fullPath.orig") if -e "$fullPath.orig" && checksum($fullPath) eq checksum("$fullPath.orig");
362 my $escapedFullPath = escapeSubversionPath("$fullPath.orig");
364 system("svn", "stat", "$escapedFullPath") if isSVN() && -e "$fullPath.orig";
368 scmToggleExecutableBit($fullPath, $diffHashRef->{executableBitDelta}) if defined($diffHashRef->{executableBitDelta});
371 sub removeDirectoriesIfNeeded()
373 foreach my $dir (reverse sort keys %checkedDirectories) {
374 if (isDirectoryEmptyForRemoval($dir)) {
380 # This could be made into a more general "status" call, except svn and git
381 # have different ideas about "moving" files which might get confusing.
382 sub scmWillDeleteFile($)
386 my $svnOutput = svnStatus($path);
387 return 1 if $svnOutput && substr($svnOutput, 0, 1) eq "D";
389 my $command = runCommand("git", "diff-index", "--name-status", "HEAD", "--", $path);
390 return 1 if $command->{stdout} && substr($command->{stdout}, 0, 1) eq "D";
395 # Return whether the file at the given path is known to Git.
397 # This method outputs a message like the following to STDERR when
400 # "error: pathspec 'test.png' did not match any file(s) known to git.
401 # Did you forget to 'git add'?"
402 sub gitKnowsOfFile($)
406 `git ls-files --error-unmatch -- $path`;
407 my $exitStatus = exitStatus($?);
408 return $exitStatus == 0;
411 sub scmKnowsOfFile($)
415 my $svnOutput = svnStatus($path);
416 # This will match more than intended. ? might not be the first field in the status
417 if ($svnOutput && $svnOutput =~ m#\?\s+$path\n#) {
420 # This does not handle errors well.
423 my @result = callSilently(\&gitKnowsOfFile, $path);
430 my ($source, $destination) = @_;
432 my $escapedSource = escapeSubversionPath($source);
433 my $escapedDestination = escapeSubversionPath($destination);
434 system("svn", "copy", $escapedSource, $escapedDestination) == 0 or die "Failed to svn copy $escapedSource $escapedDestination.";
436 system("cp", $source, $destination) == 0 or die "Failed to copy $source $destination.";
437 system("git", "add", $destination) == 0 or die "Failed to git add $destination.";
445 my $escapedPath = escapeSubversionPath($path);
446 system("svn", "add", $escapedPath) == 0 or die "Failed to svn add $escapedPath.";
448 system("git", "add", $path) == 0 or die "Failed to git add $path.";
456 # SVN is very verbose when removing directories. Squelch all output except the last line.
458 my $escapedPath = escapeSubversionPath($path);
459 open SVN, "svn rm --force '$escapedPath' |" or die "svn rm --force '$escapedPath' failed!";
460 # Only print the last line. Subversion outputs all changed statuses below $dir
465 print $svnOutput if $svnOutput;
467 # Git removes a directory if it becomes empty when the last file it contains is
468 # removed by `git rm`. In svn-apply this can happen when a directory is being
469 # removed in a patch, and all of the files inside of the directory are removed
470 # before attemping to remove the directory itself. In this case, Git will have
471 # already deleted the directory and `git rm` would exit with an error claiming
472 # there was no file. The --ignore-unmatch switch gracefully handles this case.
473 system("git", "rm", "--force", "--ignore-unmatch", $path) == 0 or die "Failed to git rm --force --ignore-unmatch $path.";