Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f8225fcd9756b6c2e4e3054cb0539d861638e0e1
https://github.com/WebKit/WebKit/commit/f8225fcd9756b6c2e4e3054cb0539d861638e0e1
Author: Cameron McCormack <[email protected]>
Date: 2026-08-13 (Thu, 13 Aug 2026)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/apply.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/apply_unittest.py
Log Message:
-----------
Add a --reset-author argument to `git-webkit apply`
https://bugs.webkit.org/show_bug.cgi?id=321745
rdar://problem/184872095
Reviewed by Ryosuke Niwa.
Since `git am` doesn't have a --reset-author like `git apply` does, we
let `git am` commit the changes first, then amend them to change the
author.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/apply.py:
(Apply.parser):
(Apply.edit_commit_message):
(Apply):
(Apply.head):
(Apply.commit_count):
(Apply.reset_author):
(Apply.main):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/apply_unittest.py:
(TestApply):
(TestApply._args):
(TestApply._run):
(TestApply._run.invoke):
(TestApply._commands):
(TestApply.test_main_rejects_non_git_repository):
(TestApply.test_main_rejects_dirty_tree):
(TestApply.test_main_errors_when_issue_unresolvable):
(TestApply.test_main_errors_when_attachments_unsupported):
(TestApply.test_main_errors_when_no_patches):
(TestApply.test_main_errors_when_named_patch_missing):
(TestApply.test_main_named_patch_rejected_reports_not_applied):
(TestApply.test_main_errors_on_download_failure):
(TestApply.test_main_errors_on_empty_content):
(TestApply.test_main_commits_with_git_am):
(TestApply.test_main_no_commit_uses_git_apply_3way):
(TestApply.test_parser_reset_author_defaults_to_off):
(TestApply.test_main_rejects_reset_author_without_a_commit):
(TestApply.test_main_resets_author_after_am):
(TestApply.test_main_replays_a_multi_commit_patch_to_reset_every_author):
(TestApply.test_main_counts_commits_from_head_before_the_patch):
(TestApply.test_main_aborts_the_replay_when_it_fails):
(TestApply.test_main_amends_when_the_commit_count_is_unavailable):
(TestApply.test_main_amends_when_head_does_not_resolve):
(TestApply.test_main_keeps_patch_author_by_default):
(TestApply.test_main_does_not_reset_author_when_am_fails):
(TestApply.test_main_warns_when_author_reset_fails):
(TestApply.test_main_resets_author_before_editing_the_message):
(TestApply.test_main_aborts_am_on_conflict):
(TestApply.test_main_no_commit_failure_does_not_abort):
(TestApply.test_main_removes_tempfile_even_on_failure):
(TestApply.test_main_encodes_str_content):
(TestApply.test_main_downloads_named_patch_from_radar):
(TestApply.test_main_reviews_and_opens_editor_when_interactive):
(TestApply.test_main_creates_pull_request_when_accepted):
(TestApply.test_main_skips_pull_request_when_declined):
(TestApply.test_main_no_editor_when_not_committing):
(TestApply.test_main_declined_review_is_not_applied):
(TestApply.test_main_skips_review_and_editor_when_not_interactive):
Canonical link: https://commits.webkit.org/319159@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
