Changeset 287054 in webkit

Timestamp:

Dec 14, 2021, 3:09:41 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[reporelaypy] Update checkout with hook instead of polling (Follow-up fix)
​https://bugs.webkit.org/show_bug.cgi?id=234243
<rdar://problem/86413065>

Unreviewed follow-up fix.

• Scripts/libraries/reporelaypy/reporelaypy/init.py: Bump version.
• Scripts/libraries/reporelaypy/reporelaypy/checkout.py:

(Checkout.update_for): main is not a recognized production branch, so handle
default branch first.

• Scripts/libraries/reporelaypy/setup.py: Bump version.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/reporelaypy/reporelaypy/__init__.py (modified) (1 diff)
• Scripts/libraries/reporelaypy/reporelaypy/checkout.py (modified) (2 diffs)
• Scripts/libraries/reporelaypy/setup.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-14  Jonathan Bedard  <jbedard@apple.com>
+
+        [reporelaypy] Update checkout with hook instead of polling (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=234243
+        <rdar://problem/86413065>
+
+        Unreviewed follow-up fix.
+
+        * Scripts/libraries/reporelaypy/reporelaypy/__init__.py: Bump version.
+        * Scripts/libraries/reporelaypy/reporelaypy/checkout.py:
+        (Checkout.update_for): `main` is not a recognized production branch, so handle
+        default branch first.
+        * Scripts/libraries/reporelaypy/setup.py: Bump version.
+
 2021-12-14  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py

@@ -45 +45 @@
     )
 
-version = Version(0, 3, 0)
+version = Version(0, 3, 1)
 
 import webkitflaskpy

trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py

@@ -171 +171 @@
 
         branch = branch or self.repository.default_branch
-        if not self.repository.prod_branches.match(branch):
+        if branch == self.repository.default_branch:
+            self.repository.pull(remote=remote)
+            self.repository.cache.populate(branch=branch)
+            return True
+        elif not self.repository.prod_branches.match(branch):
             return False
         elif track and branch not in self.repository.branches_for(remote=remote):
@@ -179 +183 @@
             )
             self.repository.cache.populate(branch=branch)
-        elif branch == self.repository.default_branch:
-            self.repository.pull(remote=remote)
-            self.repository.cache.populate(branch=branch)
-            return True
         elif not track and self.is_updated(branch, remote=remote):
             return True

trunk/Tools/Scripts/libraries/reporelaypy/setup.py

@@ -31 +31 @@
 setup(
     name='reporelaypy',
-    version='0.3.0',
+    version='0.3.1',
     description='Library for visualizing, processing and storing test results.',
     long_description=readme(),