Changeset 249602 in webkit

Timestamp:

Sep 6, 2019 5:42:34 PM (5 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r249582.

This caused results.html fail to be created on internal
testers.

Reverted changeset:

"run-webkit-test: Allow results to be uploaded without scm
checkout"
​https://bugs.webkit.org/show_bug.cgi?id=200787
​https://trac.webkit.org/changeset/249582

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/detection.py (modified) (2 diffs)
• Scripts/webkitpy/common/checkout/scm/stub_repository.py (deleted)
• Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py (deleted)
• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-06  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r249582.
+
+        This caused results.html fail to be created on internal
+        testers.
+
+        Reverted changeset:
+
+        "run-webkit-test: Allow results to be uploaded without scm
+        checkout"
+        https://bugs.webkit.org/show_bug.cgi?id=200787
+        https://trac.webkit.org/changeset/249582
+
 2019-09-06  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/detection.py

@@ -35 +35 @@
 from .svn import SVN
 from .git import Git
-from .stub_repository import StubRepository
 
 _log = logging.getLogger(__name__)
@@ -76 +75 @@
             return Git(cwd=real_path, patch_directories=patch_directories, filesystem=self._filesystem, executive=self._executive)
 
-        if StubRepository.in_working_directory(real_path, filesystem=self._filesystem):
-            return StubRepository(cwd=real_path, patch_directories=patch_directories, filesystem=self._filesystem, executive=self._executive)
-
         return None
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

@@ -445 +445 @@
         """
 
+        # FIXME: We initialize this here in order to engage the stupid windows hacks :).
+        # We can't reuse an existing scm object because the specific directories may
+        # be part of other checkouts.
+        self._port.host.initialize_scm()
         scm = SCMDetector(self._filesystem, self._executive).detect_scm_system(in_directory)
         if scm:

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1604 +1604 @@
         from webkitpy.results.upload import Upload
 
+        self.host.initialize_scm()
+
         repos = {}
         if port_config.apple_additions() and getattr(port_config.apple_additions(), 'repos', False):