[webkit-changes] [WebKit/WebKit] 659cd3: Use different cherry-pick format for main

[Jonathan Bedard]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 659cd39a8658844cd7a44aeecfc4fa607b73eb73
      https://github.com/WebKit/WebKit/commit/659cd39a8658844cd7a44aeecfc4fa607b73eb73
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2023-04-07 (Fri, 07 Apr 2023)

  Changed paths:
    M Tools/Scripts/hooks/prepare-commit-msg
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/message.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/install_hooks.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py

  Log Message:
  -----------
  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