Title: [91045] trunk/Tools
- Revision
- 91045
- Author
- [email protected]
- Date
- 2011-07-14 19:33:30 -0700 (Thu, 14 Jul 2011)
Log Message
Move webkitpy off of loose mocks
https://bugs.webkit.org/show_bug.cgi?id=64508
Unreviewed. Fixing a test which fails under test-webkitpy --all (but not in a normal run).
* Scripts/webkitpy/common/checkout/scm/git.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91044 => 91045)
--- trunk/Tools/ChangeLog 2011-07-15 02:16:09 UTC (rev 91044)
+++ trunk/Tools/ChangeLog 2011-07-15 02:33:30 UTC (rev 91045)
@@ -1,3 +1,12 @@
+2011-07-14 Eric Seidel <[email protected]>
+
+ Move webkitpy off of loose mocks
+ https://bugs.webkit.org/show_bug.cgi?id=64508
+
+ Unreviewed. Fixing a test which fails under test-webkitpy --all (but not in a normal run).
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+
2011-07-14 Adam Barth <[email protected]>
garden-o-matic should have a "rebaseline" button
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (91044 => 91045)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-07-15 02:16:09 UTC (rev 91044)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-07-15 02:33:30 UTC (rev 91045)
@@ -100,6 +100,7 @@
@classmethod
def find_checkout_root(cls, path):
+ # FIXME: This should use a FileSystem object instead of os.path.
# "git rev-parse --show-cdup" would be another way to get to the root
(checkout_root, dot_git) = os.path.split(run_command(['git', 'rev-parse', '--git-dir'], cwd=(path or "./")))
if not os.path.isabs(checkout_root): # Sometimes git returns relative paths
@@ -108,7 +109,8 @@
@classmethod
def to_object_name(cls, filepath):
- root_end_with_slash = self._filesystem.join(cls.find_checkout_root(self._filesystem.dirname(filepath)), '')
+ # FIXME: This should use a FileSystem object instead of os.path.
+ root_end_with_slash = os.path.join(cls.find_checkout_root(os.path.dirname(filepath)), '')
return filepath.replace(root_end_with_slash, '')
@classmethod
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
