[webkit-changes] [WebKit/WebKit] 753968: [git-webkit] Resolve multiple cherry-picks

[Jonathan Bedard]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 753968168a4b2c3251b5e6a0c9c80d07847fa2de
      https://github.com/WebKit/WebKit/commit/753968168a4b2c3251b5e6a0c9c80d07847fa2de
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2023-01-12 (Thu, 12 Jan 2023)

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/cherry_pick.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/cherry_pick_unittest.py

  Log Message:
  -----------
  [git-webkit] Resolve multiple cherry-picks
https://bugs.webkit.org/show_bug.cgi?id=250468
rdar://104132930

Reviewed by Aakash Jain.

Double cherry-picks are confusing, and in most cases, both unneeded and unhelpful.
Tooling should strongly encourage direct cherry-picks.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/cherry_pick.py:
(CherryPick.parser): Add the '--resolve' and '--no-resolve' options.
(CherryPick.main): If the specified commit has an original, cherry-pick the original
instead of having a double cherry-pick.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/cherry_pick_unittest.py:
(TestCherryPick.test_resolve):
(TestCherryPick.test_no_resolve):

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