Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 803e3c08d48a1202718eeb224d1dcf6c58c8ac4e
https://github.com/WebKit/WebKit/commit/803e3c08d48a1202718eeb224d1dcf6c58c8ac4e
Author: Jonathan Bedard <[email protected]>
Date: 2024-07-18 (Thu, 18 Jul 2024)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/scm_unittest.py
Log Message:
-----------
[git-webkit] Support integration PR branches
https://bugs.webkit.org/show_bug.cgi?id=276747
rdar://131963428
Reviewed by Aakash Jain.
We have begun using "integration" branches as a special form of dev branch
supporting shared conflict resolution. git-webkit doesn't handle these branches
well, currently, and is prone to incorrectly categorizing them as canonical
branches.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py:
(Scm): Move branch categorization regexes to the base class.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:
(ScmBase): Exclude branch names with slashes in them from lists of production
branches,
treat "integration" branches as dev branches.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/scm_unittest.py:
(TestScm.test_dev_branches):
(TestScm.test_prod_branches):
Canonical link: https://commits.webkit.org/281081@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
