Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[git-webkit] Mark landed changes as merged #37

Merged
merged 0 commits into from
Nov 16, 2021
Merged

[git-webkit] Mark landed changes as merged #37

merged 0 commits into from
Nov 16, 2021

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Nov 12, 2021 •
edited
Loading

55b48ce

[git-webkit] Mark landed changes as merged
https://bugs.webkit.org/show_bug.cgi?id=233056
<rdar://problem/85351564 >

Reviewed by Dewei Zhu.

For BitBucket and GitHub to recognize a pull-request as merged, the target
branch must be updated with the exact commit to be merged as the merge occurs.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
(Land.main): Update source branch when merging commits to target branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py:
(BitBucket.PRGenerator.update): Only delete values if they exist.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
(TestLand):
(TestLandGitHub):
(TestLandBitBucket):


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

@JonWBedard JonWBedard self-assigned this Nov 12, 2021
@JonWBedard
Copy link
Member Author

For reference, #35 was landed with this technique to prove that it works for git-svn

dewei-zhu
dewei-zhu approved these changes Nov 16, 2021
View reviewed changes
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

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/bitbucket.py Outdated
@@ -202,8 +202,10 @@ def update(self, pull_request, head=None, title=None, body=None, commits=None, b
if response.status_code // 100 != 2:
return None
data = response.json()
del data['author']
del data['participants']
if 'author' in data:
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: data.pop('author', None)?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea!

@JonWBedard JonWBedard merged commit 55b48ce into WebKit:main Nov 16, 2021
@JonWBedard
Copy link
Member Author

Landed https://commits.webkit.org/244312@main (55b48ce)!

@JonWBedard JonWBedard deleted the eng/mark-prs-as-merged branch November 16, 2021 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dewei-zhu dewei-zhu dewei-zhu approved these changes

@sundiamonde sundiamonde Awaiting requested review from sundiamonde

Assignees

@JonWBedard JonWBedard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JonWBedard @dewei-zhu