Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 6faa6aea3e0099064195339b77fbb4b41d26c242
https://github.com/WebKit/WebKit/commit/6faa6aea3e0099064195339b77fbb4b41d26c242
Author: Jonathan Bedard <[email protected]>
Date: 2022-12-19 (Mon, 19 Dec 2022)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/setup.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pickable.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/trace.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pickable_unittest.py
Log Message:
-----------
[git-webkit] Handle cherry-picks from divergent branches
https://bugs.webkit.org/show_bug.cgi?id=249501
rdar://103460662
Reviewed by Dewei Zhu.
A commit that is cherry-picked from a commit which is not on the target branch
should
be considered pickable.
* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pickable.py:
(Pickable.pickable): Related commits should not be automatically added to the
commits story,
so that we can use the commits story to filter out changes already on the
target branch.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/trace.py:
(CommitsStory.__contains__): Check if the story contains a commit.
(CommitsStory.add): Use shared "__contains__" call.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pickable_unittest.py:
(TestPickable.test_branch_diverged_cherry_pick):
Canonical link: https://commits.webkit.org/258105@main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
