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] git revert does not produce a meaningful commit message #20127

Merged
merged 1 commit into from Nov 8, 2023
Merged

[git-webkit] git revert does not produce a meaningful commit message #20127

merged 1 commit into from Nov 8, 2023

Conversation

briannafan
Copy link
Contributor

@briannafan briannafan commented Nov 7, 2023 •
edited by webkit-early-warning-system

a4e3641

[git-webkit] `git revert` does not produce a meaningful commit message
https://bugs.webkit.org/show_bug.cgi?id=243947
rdar://problem/98992367

Reviewed by Jonathan Bedard.

Changes to logic so git revert is no longer a blank template.
Also prevents git-webkit revert from affecting future commits on main.
A better commit message for git revert is in the works!

* Tools/Scripts/hooks/prepare-commit-msg:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/revert.py:
(Revert):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/revert_unittest.py:
(TestRevert.test_github):
(TestRevert.test_github_two_step):
(test_update):

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

3789399

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 webkitpy ✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch ⏳ 🛠 jsc-mips
✅ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

@briannafan briannafan self-assigned this Nov 7, 2023
@briannafan briannafan added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Nov 7, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 9e15c57)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac   🛠 wpe ⏳ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug   🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac ⏳ 🛠 gtk
❌ 🧪 webkitpy ⏳ 🧪 ios-wk2-wpt   🧪 mac-wk1 ⏳ 🧪 gtk-wk2
  🧪 api-ios   🧪 mac-wk2 ⏳ 🧪 api-gtk
⏳ 🛠 tv   🧪 mac-AS-debug-wk2 ⏳ 🛠 jsc-armv7
✅ 🧪 services ⏳ 🛠 tv-sim ⏳ 🧪 jsc-armv7-tests
⏳ 🛠 watch ⏳ 🛠 jsc-mips
⏳ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

JonWBedard
JonWBedard approved these changes Nov 7, 2023
View reviewed changes
Tools/Scripts/hooks/prepare-commit-msg Outdated
# `1` means that key did not exist, which is valid.
if error.returncode != 1:
sys.stderr.write(error.stderr)
def set_env_variables():
Copy link
Member

Choose a reason for hiding this comment

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

Nit: I think this should be set_env_variables_from_config. Reason for the verbose name is that, as you found, this is not intuitive behavior.

@briannafan briannafan force-pushed the eng/git-webkit-git-revert-does-not-produce-a-meaningful-commit-message branch from 9e15c57 to 01b5622 Compare November 7, 2023 21:47
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 01b5622)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ⏳ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac ✅ 🛠 gtk
❌ 🧪 webkitpy   🧪 ios-wk2-wpt   🧪 mac-wk1   🧪 gtk-wk2
  🧪 api-ios   🧪 mac-wk2   🧪 api-gtk
⏳ 🛠 tv   🧪 mac-AS-debug-wk2
✅ 🧪 services ⏳ 🛠 tv-sim
⏳ 🛠 watch ⏳ 🛠 jsc-mips
⏳ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

@briannafan briannafan force-pushed the eng/git-webkit-git-revert-does-not-produce-a-meaningful-commit-message branch from 01b5622 to 1f4c286 Compare November 7, 2023 22:00
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 1f4c286)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style   🛠 ios ✅ 🛠 mac ⏳ 🛠 wpe ⏳ 🛠 wincairo
✅ 🧪 bindings ⏳ 🛠 ios-sim ⏳ 🛠 mac-AS-debug ⏳ 🧪 wpe-wk2
  🧪 webkitperl ⏳ 🧪 ios-wk2   🧪 api-mac ⏳ 🛠 gtk
  🧪 webkitpy ⏳ 🧪 ios-wk2-wpt   🧪 mac-wk1 ⏳ 🧪 gtk-wk2
⏳ 🧪 api-ios   🧪 mac-wk2 ⏳ 🧪 api-gtk
⏳ 🛠 tv ⏳ 🧪 mac-AS-debug-wk2
  🧪 services ⏳ 🛠 tv-sim
⏳ 🛠 watch ⏳ 🛠 jsc-mips
⏳ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

@briannafan briannafan force-pushed the eng/git-webkit-git-revert-does-not-produce-a-meaningful-commit-message branch from 1f4c286 to 3789399 Compare November 7, 2023 22:03
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 3789399)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 webkitpy ✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch ⏳ 🛠 jsc-mips
✅ 🛠 watch-sim ⏳ 🧪 jsc-mips-tests

@briannafan briannafan added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Nov 7, 2023
@webkit-ews-buildbot webkit-ews-buildbot added merge-queue Applied to send a pull request to merge-queue and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Nov 8, 2023
@webkit-ews-buildbot
Copy link
Collaborator

Safe-Merge-Queue: Build #2699.

@briannafan
[git-webkit] git revert does not produce a meaningful commit message
a4e3641 
https://bugs.webkit.org/show_bug.cgi?id=243947
rdar://problem/98992367

Reviewed by Jonathan Bedard.

Changes to logic so git revert is no longer a blank template.
Also prevents git-webkit revert from affecting future commits on main.
A better commit message for git revert is in the works!

* Tools/Scripts/hooks/prepare-commit-msg:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/revert.py:
(Revert):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/revert_unittest.py:
(TestRevert.test_github):
(TestRevert.test_github_two_step):
(test_update):

Canonical link: https://commits.webkit.org/270375@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/git-webkit-git-revert-does-not-produce-a-meaningful-commit-message branch from 3789399 to a4e3641 Compare November 8, 2023 06:00
@webkit-commit-queue webkit-commit-queue merged commit a4e3641 into WebKit:main Nov 8, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 270375@main (a4e3641): https://commits.webkit.org/270375@main

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

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 8, 2023
@briannafan briannafan mentioned this pull request Nov 9, 2023
Merged
@briannafan briannafan deleted the eng/git-webkit-git-revert-does-not-produce-a-meaningful-commit-message branch December 12, 2023 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JonWBedard JonWBedard JonWBedard approved these changes

@facetothefate facetothefate Awaiting requested review from facetothefate facetothefate is a code owner

Assignees

@briannafan briannafan

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
5 participants
@briannafan @webkit-early-warning-system @webkit-ews-buildbot @webkit-commit-queue @JonWBedard