Title: [159838] trunk/Tools
Revision
159838
Author
commit-qu...@webkit.org
Date
2013-11-28 05:46:26 -0800 (Thu, 28 Nov 2013)

Log Message

Checkout should own the scm object in Host
https://bugs.webkit.org/show_bug.cgi?id=124943

Patch by Dániel Bátyai <batyai.dan...@stud.u-szeged.hu> on 2013-11-28
Reviewed by Ryosuke Niwa.

* Scripts/webkitpy/common/host.py:
(Host.__init__):
(Host.initialize_scm):
(Host.scm):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (159837 => 159838)


--- trunk/Tools/ChangeLog	2013-11-28 12:40:59 UTC (rev 159837)
+++ trunk/Tools/ChangeLog	2013-11-28 13:46:26 UTC (rev 159838)
@@ -1,3 +1,15 @@
+2013-11-28  Dániel Bátyai  <batyai.dan...@stud.u-szeged.hu>
+
+        Checkout should own the scm object in Host
+        https://bugs.webkit.org/show_bug.cgi?id=124943
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/common/host.py:
+        (Host.__init__):
+        (Host.initialize_scm):
+        (Host.scm):
+
 2013-11-26  Filip Pizlo  <fpi...@apple.com>
 
         Do bytecode validation as part of testing

Modified: trunk/Tools/Scripts/webkitpy/common/host.py (159837 => 159838)


--- trunk/Tools/Scripts/webkitpy/common/host.py	2013-11-28 12:40:59 UTC (rev 159837)
+++ trunk/Tools/Scripts/webkitpy/common/host.py	2013-11-28 13:46:26 UTC (rev 159838)
@@ -48,8 +48,6 @@
         SystemHost.__init__(self)
         self.web = web.Web()
 
-        # FIXME: Checkout should own the scm object.
-        self._scm = None
         self._checkout = None
 
         # Everything below this line is WebKit-specific and belongs on a higher-level object.
@@ -80,11 +78,10 @@
 
     def initialize_scm(self, patch_directories=None):
         detector = SCMDetector(self.filesystem, self.executive)
-        self._scm = detector.default_scm(patch_directories)
-        self._checkout = Checkout(self.scm())
+        self._checkout = Checkout(detector.default_scm(patch_directories))
 
     def scm(self):
-        return self._scm
+        return self._checkout._scm
 
     def checkout(self):
         return self._checkout
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to