Title: [117533] trunk/Tools
- Revision
- 117533
- Author
- [email protected]
- Date
- 2012-05-17 20:16:23 -0700 (Thu, 17 May 2012)
Log Message
Unreviewed, rolling out r117526.
http://trac.webkit.org/changeset/117526
https://bugs.webkit.org/show_bug.cgi?id=86801
broke Chromium Mac 10.5 layout test canaries (Requested by
pkasting on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-05-17
* Scripts/webkitpy/common/checkout/scm/scm.py:
(SCM):
(SCM.in_working_directory):
* Scripts/webkitpy/common/checkout/scm/svn.py:
(SVN):
(SVN.in_working_directory):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (117532 => 117533)
--- trunk/Tools/ChangeLog 2012-05-18 03:10:20 UTC (rev 117532)
+++ trunk/Tools/ChangeLog 2012-05-18 03:16:23 UTC (rev 117533)
@@ -1,3 +1,19 @@
+2012-05-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r117526.
+ http://trac.webkit.org/changeset/117526
+ https://bugs.webkit.org/show_bug.cgi?id=86801
+
+ broke Chromium Mac 10.5 layout test canaries (Requested by
+ pkasting on #webkit).
+
+ * Scripts/webkitpy/common/checkout/scm/scm.py:
+ (SCM):
+ (SCM.in_working_directory):
+ * Scripts/webkitpy/common/checkout/scm/svn.py:
+ (SVN):
+ (SVN.in_working_directory):
+
2012-05-17 Dirk Pranke <[email protected]>
scm.add() doesn't work properly with svn 1.7
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (117532 => 117533)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2012-05-18 03:10:20 UTC (rev 117532)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2012-05-18 03:16:23 UTC (rev 117533)
@@ -133,8 +133,8 @@
def _subclass_must_implement():
raise NotImplementedError("subclasses must implement")
- @classmethod
- def in_working_directory(cls, path):
+ @staticmethod
+ def in_working_directory(path):
SCM._subclass_must_implement()
def find_checkout_root(path):
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (117532 => 117533)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2012-05-18 03:10:20 UTC (rev 117532)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2012-05-18 03:16:23 UTC (rev 117533)
@@ -82,17 +82,10 @@
else:
self._patch_directories = patch_directories
- @classmethod
- def in_working_directory(cls, path):
- if os.path.isdir(os.path.join(path, '.svn')):
- # This is a fast shortcut for svn info that is usually correct for SVN < 1.7,
- # but doesn't work for SVN >= 1.7.
- return True
+ @staticmethod
+ def in_working_directory(path):
+ return os.path.isdir(os.path.join(path, '.svn'))
- svn_info_args = [cls.executable_name, 'info', path]
- exit_code = Executive().run_command(svn_info_args, return_exit_code=True)
- return (exit_code == 0)
-
def find_uuid(self, path):
if not self.in_working_directory(path):
return None
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
