Title: [203095] trunk/Tools
Revision
203095
Author
jmarc...@apple.com
Date
2016-07-11 16:34:22 -0700 (Mon, 11 Jul 2016)

Log Message

SVN.create_patch should find svn-create-patch relative to the WebKit root.
https://bugs.webkit.org/show_bug.cgi?id=159652

Reviewed by Daniel Bates.

* Scripts/webkitpy/common/checkout/scm/svn.py:
(SVN.create_patch): Use WebKitFinder to find the WebKit checkout so that we can find svn-create-patch relative to it.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (203094 => 203095)


--- trunk/Tools/ChangeLog	2016-07-11 23:29:23 UTC (rev 203094)
+++ trunk/Tools/ChangeLog	2016-07-11 23:34:22 UTC (rev 203095)
@@ -1,3 +1,13 @@
+2016-07-11  Jason Marcell  <jmarc...@apple.com>
+
+        SVN.create_patch should find svn-create-patch relative to the WebKit root.
+        https://bugs.webkit.org/show_bug.cgi?id=159652
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/webkitpy/common/checkout/scm/svn.py:
+        (SVN.create_patch): Use WebKitFinder to find the WebKit checkout so that we can find svn-create-patch relative to it.
+
 2016-07-11  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         Implement grapheme cluster iterator on StringView

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (203094 => 203095)


--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py	2016-07-11 23:29:23 UTC (rev 203094)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py	2016-07-11 23:34:22 UTC (rev 203095)
@@ -36,9 +36,10 @@
 import sys
 import tempfile
 
+from webkitpy.common.config.urls import svn_server_host, svn_server_realm
 from webkitpy.common.memoized import memoized
 from webkitpy.common.system.executive import Executive, ScriptError
-from webkitpy.common.config.urls import svn_server_host, svn_server_realm
+from webkitpy.common.webkit_finder import WebKitFinder
 
 from .scm import AuthenticationError, SCM, commit_error_handler
 
@@ -279,7 +280,7 @@
             return ""
         elif changed_files == None:
             changed_files = []
-        script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
+        script_path = WebKitFinder(self._filesystem).path_from_webkit_base("Tools", "Scripts", "svn-create-patch")
         return self.run([script_path, "--no-style"] + changed_files,
             cwd=self.checkout_root, return_stderr=False,
             decode_output=False)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to