Use different cherry-pick format for main

[JonWBedard]

659cd39

Use different cherry-pick format for main
https://bugs.webkit.org/show_bug.cgi?id=255088
rdar://107708812

Reviewed by Dewei Zhu.

When cherry-picking into main, retain the original commit message in it's entireity
and tag the bottom of the commit with a 'Originally-landed-as' message. Use existing behavior
for all other branches.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/hooks/prepare-commit-msg:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py:
(main): Do not insert lines between trailers.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/install_hooks.py:
(InstallHooks.main): Pass default branch, trailers to strip and source remotes to hook templates.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py:
(TestCanonicalize.test_alternate_trailer):

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

b2e8d31

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
	✅ 🛠 tv	🧪 api-ios	🧪 api-gtk
	✅ 🧪 mac-wk2	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

[webkit-early-warning-system]

EWS run on previous version of this PR (hash 28de774)

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	🧪 api-ios	✅ 🧪 mac-wk1	🧪 gtk-wk2
	✅ 🛠 tv	🧪 mac-wk2	🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch-sim

[JonWBedard]

#12457 is an example of what this actually looks like. We still have to have some tools adopt reading this new format, but that is being done in separate commits.

[aproskuryakov]

#12457 is an example of what this actually looks like. We still have to have some tools adopt reading this new format, but that is being done in separate commits.

May be clearer to say "Originally landed as", not "Cherry-pick". Or at least "Cherry-pick from".

Otherwise, the new format looks good to me.

[JonWBedard]

#12457 is an example of what this actually looks like. We still have to have some tools adopt reading this new format, but that is being done in separate commits.

May be clearer to say "Originally landed as", not "Cherry-pick". Or at least "Cherry-pick from".

Otherwise, the new format looks good to me.

If we're diverging from the Cherry-pick terminology (which I think is fine), I think I'd prefer "Originally landed as"

[aproskuryakov]

But now I'm thinking that it could confuse people into thinking that it's about originally landing, reverting and re-landing. "Originally landed on release branch as"?

[JonWBedard]

But now I'm thinking that it could confuse people into thinking that it's about originally landing, reverting and re-landing. "Originally landed on release branch as"?

Seems like we would be duplicating information with that that descriptor. Some full examples of our proposals here:

Cherry-pick: 259548.279@safari-7615-branch (41f425bc0ef8). rdar://107710008
Cherry-pick from: 259548.279@safari-7615-branch (41f425bc0ef8). rdar://107710008
Originally landed as: 259548.279@safari-7615-branch (41f425bc0ef8). rdar://107710008
Originally landed on release branch as: 259548.279@safari-7615-branch (41f425bc0ef8). rdar://107710008

I would prefer the shorter version of the "Originally landed as", but the longer version of the "Cherry-pick" one.

[JonWBedard]

git-webkit reading this is implemented in #12475

[webkit-early-warning-system]

EWS run on previous version of this PR (hash da640e4)

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
	✅ 🛠 tv	❌ 🧪 api-ios	✅ 🧪 api-gtk
	✅ 🧪 mac-wk2	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch
	✅ 🛠 watch-sim

[JonWBedard]

This version uses Originally-landed-as, I added the dashes because that makes it compatible with git-interpret-trailers, should we have any desire to leverage that fact in the future.

[webkit-early-warning-system]

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

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
	✅ 🛠 tv	🧪 api-ios	🧪 api-gtk
	✅ 🧪 mac-wk2	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

[dewei-zhu]

r=me

[webkit-commit-queue]

Committed 262726@main (659cd39): https://commits.webkit.org/262726@main

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