Changeset 45998 in webkit

Timestamp:

Jul 16, 2009 4:38:02 PM (15 years ago)

Author:

pkasting@chromium.org

Message:

2009-07-16 Peter Kasting <​pkasting@google.com>

Reviewed by David Kilzer.

​https://bugs.webkit.org/show_bug.cgi?id=27323
Improve support for WebKit checkouts hosted inside other checkouts
(possible for some ports, e.g. Chromium).

• Scripts/svn-create-patch: Determine SVN root by looking for Repository Root string and aborting when it's missing or different than what we've already seen.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-16  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by David Kilzer.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Improve support for WebKit checkouts hosted inside other checkouts
+        (possible for some ports, e.g. Chromium).
+
+        * Scripts/svn-create-patch: Determine SVN root by looking for Repository
+          Root string and aborting when it's missing or different than what
+          we've already seen.
+
 2009-07-16  Peter Kasting  <pkasting@google.com>
 

trunk/WebKitTools/Scripts/svn-create-patch

@@ -471 +471 @@
     my $last = '';
     my $path = '.';
-    my $parent = '../';
+    my $parent = '..';
     my $devnull = File::Spec->devnull();
-    my $exitCode;
+    my $repositoryRoot;
     while (1) {
-        $exitCode = system("svn info $path 2> $devnull > $devnull")/256;
-        last if $exitCode;
+        my $thisRoot;
+        open INFO, "svn info '$path' |" or die;
+        while (<INFO>) {
+            if (/^Repository Root: (.+)/) {
+                $thisRoot = $1;
+            }
+        }
+        close INFO;
+
+        # It's possible (e.g. for developers of some ports) to have a WebKit
+        # checkout in a subdirectory of another checkout.  So abort if the
+        # repository root suddenly changes.
+        last if !$thisRoot;
+        if (!$repositoryRoot) {
+            $repositoryRoot = $thisRoot;
+        }
+        last if $thisRoot ne $repositoryRoot;
+
         $last = $path;
-        $path = $parent . $path;
+        $path = File::Spec->catdir($parent, $path);
     }