[webkit-changes] [WebKit/WebKit] 556bf5: [git-webkit] Update fork via API instead of local ...

Jonathan Bedard noreply at github.com
Fri Apr 21 11:07:29 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 556bf5c84d3e8a71a75ffe2e68e52683d7f2bcb0
      https://github.com/WebKit/WebKit/commit/556bf5c84d3e8a71a75ffe2e68e52683d7f2bcb0
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2023-04-21 (Fri, 21 Apr 2023)

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/revert_unittest.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/squash_unittest.py

  Log Message:
  -----------
  [git-webkit] Update fork via API instead of local push
https://bugs.webkit.org/show_bug.cgi?id=243283
rdar://97741202

Reviewed by Aakash Jain.

For GitHub forks, update the fork via GitHub's API before pushing anything
to avoid re-pushing commits GitHub already has.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/remote/git_hub.py:
(GitHub.request): Mock 'merge-upstream' path.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.create_pull_request): Update fork's base branch before pushing PR branch,
and use GitHub's API to update the fork if available.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/revert_unittest.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/squash_unittest.py:

Canonical link: https://commits.webkit.org/263251@main




More information about the webkit-changes mailing list