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] Extract revision from git svn dcommit #161

Merged
merged 0 commits into from Feb 22, 2022
Merged

[git-webkit] Extract revision from git svn dcommit #161

merged 0 commits into from Feb 22, 2022

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Feb 18, 2022 •
edited

79ad9dc

[git-webkit] Extract revision from `git svn dcommit`
https://bugs.webkit.org/show_bug.cgi?id=236849
<rdar://problem/89155179 >

Reviewed by Ryan Haddad.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git): Thoroughly mock `dcommit`
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/land.py:
(Land.main): Extract committed SVN revision from `git svn dcommit` command to accurately
match landed commits to the pull request that generated them.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/land_unittest.py:
(repository): Add revision to local commit.


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

@JonWBedard JonWBedard self-assigned this Feb 18, 2022
@JonWBedard
Copy link
Member Author

Used this on https://commits.webkit.org/247487@main, looks to work well "for real"

@JonWBedard JonWBedard force-pushed the eng/git-webkit-land-race-condition branch from 4f70e2f to 93d2ba6 Compare February 20, 2022 15:54
@JonWBedard JonWBedard mentioned this pull request Feb 20, 2022
Merged
@JonWBedard JonWBedard merged commit 79ad9dc into WebKit:main Feb 22, 2022
@JonWBedard JonWBedard force-pushed the eng/git-webkit-land-race-condition branch from 93d2ba6 to 79ad9dc Compare February 22, 2022 19:26
@JonWBedard
Copy link
Member Author

Landed https://commits.webkit.org/247644@main (79ad9dc)!

@JonWBedard JonWBedard deleted the eng/git-webkit-land-race-condition branch February 22, 2022 19:26
@aj062
Copy link
Member

aj062 commented Feb 22, 2022

Left a comment in: 79ad9dc#r67252064

@JonWBedard JonWBedard added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Mar 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanhaddad ryanhaddad ryanhaddad approved these changes

@dewei-zhu dewei-zhu Awaiting requested review from dewei-zhu

@aj062 aj062 Awaiting requested review from aj062

Assignees

@JonWBedard JonWBedard

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
3 participants
@JonWBedard @aj062 @ryanhaddad