Changeset 45939 in webkit

Timestamp:

Jul 15, 2009 1:11:01 PM (15 years ago)

Author:

bfulgham@webkit.org

Message:

2009-07-15 Joseph Pecoraro <​joepeck02@gmail.com>

Reviewed by David Kilzer.

bugzilla-tool/svn-apply can't handle patches made from a non-root directory
​https://bugs.webkit.org/show_bug.cgi?id=26999

• Scripts/svn-create-patch:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-create-patch (modified) (6 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-15  Joseph Pecoraro  <joepeck02@gmail.com>
+
+        Reviewed by David Kilzer.
+
+        bugzilla-tool/svn-apply can't handle patches made from a non-root directory
+        https://bugs.webkit.org/show_bug.cgi?id=26999
+
+        * Scripts/svn-create-patch:
+
 2009-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebKitTools/Scripts/svn-create-patch

@@ -45 +45 @@
 
 use Config;
-use Cwd;
 use File::Basename;
 use File::Spec;
@@ -56 +55 @@
 sub binarycmp($$);
 sub canonicalizePath($);
+sub chdirAndGetDifference($);
+sub determineSvnRoot();
 sub findBaseUrl($);
 sub findMimeType($;$);
@@ -61 +62 @@
 sub findSourceFileAndRevision($);
 sub fixChangeLogPatch($);
-sub generateDiff($);
+sub generateDiff($$);
 sub generateFileList($\%);
 sub isBinaryMimeType($);
@@ -95 +96 @@
 }
 
+my $svnRoot = determineSvnRoot();
+my $prefix = chdirAndGetDifference($svnRoot);
+
 # Generate the diffs, in a order chosen for easy reviewing.
 for my $path (sort patchpathcmp values %diffFiles) {
-    generateDiff($path);
+    generateDiff($path, $prefix);
 }
 
@@ -253 +257 @@
 }
 
-sub generateDiff($)
-{
-    my ($fileData) = @_;
-    my $file = $fileData->{path};
+sub generateDiff($$)
+{
+    my ($fileData, $prefix) = @_;
+    my $file = File::Spec->catdir($prefix, $fileData->{path});
     my $patch;
     if ($fileData->{modificationType} eq "additionWithHistory") {
@@ -448 +452 @@
     return $fileDataA->{isTestFile} <=> $fileDataB->{isTestFile};
 }
+
+sub chdirAndGetDifference($)
+{
+    my ($newdir) = @_;
+    my $before = File::Spec->rel2abs( File::Spec->curdir() );
+    chdir $newdir;
+    my $after = File::Spec->rel2abs( File::Spec->curdir() );
+    return File::Spec->abs2rel($before, $after);
+}
+
+sub determineSvnRoot()
+{
+    my $last = '';
+    my $path = '.';
+    my $parent = '../';
+    my $devnull = File::Spec->devnull();
+    my $exitCode;
+    while (1) {
+        $exitCode = system("svn info $path 2> $devnull > $devnull")/256;
+        last if $exitCode;
+        $last = $path;
+        $path = $parent . $path;
+    }
+
+    return File::Spec->rel2abs($last);
+}