Title: [284263] trunk/Tools
- Revision
- 284263
- Author
- jbed...@apple.com
- Date
- 2021-10-15 12:14:53 -0700 (Fri, 15 Oct 2021)
Log Message
[webkitscmpy] Refactor PR branch management (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=230432
<rdar://problem/83258413>
Reviewed by Stephanie Lewis.
When we are uploading a change that includes multiple commits,
the second commit will be on the same branch as the first, but that
branch will be editable. We should not declare that "no commits
have been found on an editable branch," because that's not true.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
(Branch.branch_point): Log the found commit for branches with multiple commits.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (284262 => 284263)
--- trunk/Tools/ChangeLog 2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/ChangeLog 2021-10-15 19:14:53 UTC (rev 284263)
@@ -1,3 +1,21 @@
+2021-10-15 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitscmpy] Refactor PR branch management (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=230432
+ <rdar://problem/83258413>
+
+ Reviewed by Stephanie Lewis.
+
+ When we are uploading a change that includes multiple commits,
+ the second commit will be on the same branch as the first, but that
+ branch will be editable. We should not declare that "no commits
+ have been found on an editable branch," because that's not true.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
+ (Branch.branch_point): Log the found commit for branches with multiple commits.
+
2021-10-15 Aakash Jain <aakash_j...@apple.com>
Make submit to ews error messages readable
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284262 => 284263)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-15 19:14:53 UTC (rev 284263)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='2.2.10',
+ version='2.2.11',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284262 => 284263)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-15 19:14:53 UTC (rev 284263)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(2, 2, 10)
+version = Version(2, 2, 11)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py (284262 => 284263)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py 2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py 2021-10-15 19:14:53 UTC (rev 284263)
@@ -62,7 +62,7 @@
while not commit or cls.editable(commit.branch, repository=repository):
cnt += 1
commit = repository.find(argument='HEAD~{}'.format(cnt), include_log=False, include_identifier=False)
- if cnt > 1 or commit.branch != repository.branch:
+ if cnt > 1 or commit.branch != repository.branch or cls.editable(commit.branch, repository=repository):
log.warning(' Found {}...'.format(string_utils.pluralize(cnt, 'commit')))
else:
log.warning(' No commits on editable branch')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
