Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: b0f1b831ed3c5fa2efca2d65436dfb3e4f8605ac
https://github.com/WebKit/WebKit/commit/b0f1b831ed3c5fa2efca2d65436dfb3e4f8605ac
Author: Jonathan Bedard <[email protected]>
Date: 2022-09-21 (Wed, 21 Sep 2022)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/setup.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/branch_unittest.py
Log Message:
-----------
[git-webkit] Handle colliding branch names locally
https://bugs.webkit.org/show_bug.cgi?id=245444
<rdar://100184775>
Reviewed by Elliott Williams.
* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.branches_for): Return an empty list for a non-existent remote.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
(Branch.parser): Add --delete-existing flag.
(Branch.main): If we find an existing branch, rebase, delete or fail based on
the --delete-existing flag.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.pull_request_branch_point): Pass target_remote.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/branch_unittest.py:
Canonical link: https://commits.webkit.org/254738@main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
