Skip to content

[git-webkit] Add show sub-command#6041

Merged
webkit-early-warning-system merged 1 commit intoWebKit:mainfrom
JonWBedard:eng/Please-add-git-webkit-show
Dec 12, 2022
Merged

[git-webkit] Add show sub-command#6041
webkit-early-warning-system merged 1 commit intoWebKit:mainfrom
JonWBedard:eng/Please-add-git-webkit-show

Conversation

@JonWBedard
Copy link
Copy Markdown
Member

@JonWBedard JonWBedard commented Nov 2, 2022

dd82be8

[git-webkit] Add show sub-command
https://bugs.webkit.org/show_bug.cgi?id=242400
rdar://96963230

Reviewed by Dewei Zhu.

* 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: Add mock 'git show'.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py: Add 'show' sub command.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py:
(FilteredCommand.main): 'git show' will display diffs after the commit message, those diffs should be appropriately colorized.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/log.py:
(Log.parser): Move some options to Show.parser and invoke Show.parser.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/show.py: Copied from Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/log.py.
(Show.parser): Moved from Log.parser.
(Show.main):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/show_unittest.py: Added.
(TestShow.test_git):
(TestShow.test_git_svn):
(TestShow.test_svn):
(TestShow.test_none):

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

4765101

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac 🛠 wpe 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🛠 gtk 🛠 wincairo
✅ 🧪 webkitperl 🧪 ios-wk2 🧪 api-mac 🧪 gtk-wk2
✅ 🧪 webkitpy 🧪 api-ios 🧪 mac-wk1 🧪 api-gtk
🛠 tv 🧪 mac-wk2
✅ 🛠 tv-sim 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 watch 🧪 mac-wk2-stress
🛠 watch-sim
✅ 🛠 🧪 unsafe-merge

@JonWBedard JonWBedard self-assigned this Nov 2, 2022
@JonWBedard JonWBedard added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Nov 2, 2022
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 3, 2022
@JonWBedard JonWBedard removed the merging-blocked Applied to prevent a change from being merged label Nov 8, 2022
@JonWBedard JonWBedard force-pushed the eng/Please-add-git-webkit-show branch from bbc285f to c574f46 Compare November 8, 2022 16:57
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 8, 2022
@JonWBedard JonWBedard removed the merging-blocked Applied to prevent a change from being merged label Nov 8, 2022
@aproskuryakov aproskuryakov requested a review from aj062 November 9, 2022 19:37
Copy link
Copy Markdown
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/Please-add-git-webkit-show branch from c574f46 to 4765101 Compare December 12, 2022 22:30
@JonWBedard JonWBedard added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 12, 2022
https://bugs.webkit.org/show_bug.cgi?id=242400
rdar://96963230

Reviewed by Dewei Zhu.

* 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: Add mock 'git show'.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py: Add 'show' sub command.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py:
(FilteredCommand.main): 'git show' will display diffs after the commit message, those diffs should be appropriately colorized.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/log.py:
(Log.parser): Move some options to Show.parser and invoke Show.parser.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/show.py: Copied from Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/log.py.
(Show.parser): Moved from Log.parser.
(Show.main):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/show_unittest.py: Added.
(TestShow.test_git):
(TestShow.test_git_svn):
(TestShow.test_svn):
(TestShow.test_none):

Canonical link: https://commits.webkit.org/257760@main
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 257760@main (dd82be8): https://commits.webkit.org/257760@main

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

@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 12, 2022
@webkit-early-warning-system webkit-early-warning-system merged commit dd82be8 into WebKit:main Dec 12, 2022
@JonWBedard JonWBedard deleted the eng/Please-add-git-webkit-show branch December 21, 2022 23:24
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.

6 participants