Title: [287054] trunk/Tools
- Revision
- 287054
- Author
- [email protected]
- Date
- 2021-12-14 15:09:41 -0800 (Tue, 14 Dec 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (287053 => 287054)
--- trunk/Tools/ChangeLog 2021-12-14 23:04:49 UTC (rev 287053)
+++ trunk/Tools/ChangeLog 2021-12-14 23:09:41 UTC (rev 287054)
@@ -1,3 +1,17 @@
+2021-12-14 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
Revert r284816
Modified: trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py (287053 => 287054)
--- trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py 2021-12-14 23:04:49 UTC (rev 287053)
+++ trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py 2021-12-14 23:09:41 UTC (rev 287054)
@@ -44,7 +44,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 3, 0)
+version = Version(0, 3, 1)
import webkitflaskpy
Modified: trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py (287053 => 287054)
--- trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py 2021-12-14 23:04:49 UTC (rev 287053)
+++ trunk/Tools/Scripts/libraries/reporelaypy/reporelaypy/checkout.py 2021-12-14 23:09:41 UTC (rev 287054)
@@ -170,7 +170,11 @@
return None
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):
run(
@@ -178,10 +182,6 @@
cwd=self.repository.root_path,
)
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
Modified: trunk/Tools/Scripts/libraries/reporelaypy/setup.py (287053 => 287054)
--- trunk/Tools/Scripts/libraries/reporelaypy/setup.py 2021-12-14 23:04:49 UTC (rev 287053)
+++ trunk/Tools/Scripts/libraries/reporelaypy/setup.py 2021-12-14 23:09:41 UTC (rev 287054)
@@ -30,7 +30,7 @@
setup(
name='reporelaypy',
- version='0.3.0',
+ version='0.3.1',
description='Library for visualizing, processing and storing test results.',
long_description=readme(),
classifiers=[
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
