[webkit-changes] [WebKit/WebKit] 0a3858: [git-webkit] Handle trailing cherry-pick annotation

Jonathan Bedard noreply at github.com
Fri Apr 7 08:07:13 PDT 2023


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

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit_classifier.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/trace.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/classify_unittest.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/trace_unittest.py
    M metadata/commit_classes.json

  Log Message:
  -----------
  [git-webkit] Handle trailing cherry-pick annotation
https://bugs.webkit.org/show_bug.cgi?id=255113
rdar://107725282

Rubber-stamped by Aakash Jain.

Since cherry-picks may now be denoted by a trailing line in the commit message,
git-webkit should handle these cases. In general, these means that git-webkit
needs to parse trailing lines in a commit message along with the leading line.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Version bump.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py:
(Commit.issues): Any issues in trailers need to take priority over those listed in
the commit message for tooling.
(Commit.trailers): List all message trailers.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit_classifier.py:
(CommitClassifier.LineFilter): Renamed from HeaderFilter.
(CommitClassifier.CommitClass.__init__): Accept "trailer" filters.
(CommitClassifier.classify): Implement processing of trailers. If a classification
defines both headers and trailers, only require either a matching header or a matching trailer,
but not both.
(CommitClassifier.HeaderFilter): Renamed to LineFilter.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/trace.py:
(Relationship.parse): Parse trailers along with the commit header.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/classify_unittest.py:
(TestClassify.test_trailer_success):
(TestClassify.test_trailer_failure):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/trace_unittest.py:
(TestRelationship.test_cherry_pick):
* metadata/commit_classes.json: Commits which define themselves as cherry-picks in their
trailer should be classified as cherry-picks.

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




More information about the webkit-changes mailing list