Changeset 249582 in webkit

Timestamp:

Sep 6, 2019 11:10:49 AM (5 years ago)

Author:

Matt Lewis

Message:

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

Reviewed by Jonathan Bedard.

• Scripts/webkitpy/common/checkout/scm/detection.py:

(SCMDetector.detect_scm_system): Added in detection of stub repository.

• Scripts/webkitpy/common/checkout/scm/stub_repository.py: Added.

(StubRepository):
(StubRepository.init):
(StubRepository._find_parent_path_matching_callback_condition): Checks up the path given to
find the directory containing the checkout_information.json of the stub repository.
(StubRepository.in_working_directory): Required functions to be implemented.
(StubRepository.svn_revision): Required functions to be implemented.
(StubRepository.native_revision): Required functions to be implemented.
(StubRepository.native_branch): Required functions to be implemented.
(StubRepository._decode_json): Decodes checkout_information.json.
(StubRepository.find_checkout_root): Required functions to be implemented.

• Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py: Added.

(StubRepositoryTest): Unit test for stub_repository SCM.
(StubRepositoryTest.mock_host_for_stub_repository):
(StubRepositoryTest.test_in_working_directory):
(StubRepositoryTest.test_native_revision):
(StubRepositoryTest.test_native_branch):
(StubRepositoryTest.test_svn_revision):
(StubRepositoryTest.test_find_checkout_root):

• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:

(JSONResultsGenerator._get_svn_revision): Removed unnecessary scm initialization.

• Scripts/webkitpy/port/base.py:

(Port.commits_for_upload): Removed unnecessary scm initialization.

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 (added)
• Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py (added)
• 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>
+
+        run-webkit-test: Allow results to be uploaded without scm checkout
+        https://bugs.webkit.org/show_bug.cgi?id=200787
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/common/checkout/scm/detection.py:
+        (SCMDetector.detect_scm_system): Added in detection of stub repository.
+        * Scripts/webkitpy/common/checkout/scm/stub_repository.py: Added.
+        (StubRepository):
+        (StubRepository.__init__):
+        (StubRepository._find_parent_path_matching_callback_condition): Checks up the path given to
+        find the directory containing the checkout_information.json of the stub repository.
+        (StubRepository.in_working_directory): Required functions to be implemented.
+        (StubRepository.svn_revision): Required functions to be implemented.
+        (StubRepository.native_revision): Required functions to be implemented.
+        (StubRepository.native_branch): Required functions to be implemented.
+        (StubRepository._decode_json): Decodes checkout_information.json.
+        (StubRepository.find_checkout_root): Required functions to be implemented.
+        * Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py: Added.
+        (StubRepositoryTest): Unit test for stub_repository SCM.
+        (StubRepositoryTest.mock_host_for_stub_repository):
+        (StubRepositoryTest.test_in_working_directory):
+        (StubRepositoryTest.test_native_revision):
+        (StubRepositoryTest.test_native_branch):
+        (StubRepositoryTest.test_svn_revision):
+        (StubRepositoryTest.test_find_checkout_root):
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+        (JSONResultsGenerator._get_svn_revision): Removed unnecessary scm initialization.
+        * Scripts/webkitpy/port/base.py:
+        (Port.commits_for_upload): Removed unnecessary scm initialization.
+
 2019-09-06  Alex Christensen  <achristensen@webkit.org>
 

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__)
@@ -75 +76 @@
             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):