Skip to content

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Apr 12, 2022

880bb31

[git-webkit] Allow projects to declare alternate remotes
https://bugs.webkit.org/show_bug.cgi?id=239261
<rdar://problem/91654752 >

Reviewed by Dewei Zhu.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump verison.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.remote): Move logic to remote.Scm.from_url.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.github): Allow user to specify trailing remote name.
(Setup._add_remote): Add a remote or modify exising remote.
(Setup._fork_remote): Determine a remote url based on origin url.
(Setup.git): If the project declares remotes, check if the user is using the righ origin. Warn them
if they are not. Check if the user has access to alternate remotes, if they do, add those remotes
and create forks for them. Fetch all fork remotes. Do not fork repository if origin does not match
declared origin.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/scm.py:
(Scm.from_url): Moved logic from local.Git.remote.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:
* metadata/git_config_extension: Add expected remotes.

Canonical link: https://commits.webkit.org/249702@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

@JonWBedard JonWBedard self-assigned this Apr 12, 2022
@JonWBedard JonWBedard added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Apr 12, 2022
@akath20 akath20 self-requested a review April 15, 2022 17:13
Copy link
Contributor

@dewei-zhu dewei-zhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

@JonWBedard JonWBedard force-pushed the eng/git-webkit-Allow-projects-to-declare-alternate-remotes branch from 7c639d3 to b4395e3 Compare April 15, 2022 18:49
@JonWBedard JonWBedard added the merge-queue Applied to send a pull request to merge-queue label Apr 15, 2022
@webkit-early-warning-system webkit-early-warning-system merged commit 880bb31 into WebKit:main Apr 16, 2022
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/git-webkit-Allow-projects-to-declare-alternate-remotes branch from b4395e3 to 880bb31 Compare April 16, 2022 02:00
@webkit-early-warning-system
Copy link
Collaborator

Committed r292937 (249702@main): https://commits.webkit.org/249702@main

Reviewed commits have been landed. Closing PR #277 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system removed the merge-queue Applied to send a pull request to merge-queue label Apr 16, 2022
@JonWBedard JonWBedard deleted the eng/git-webkit-Allow-projects-to-declare-alternate-remotes branch May 19, 2022 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants