From a20bdbdae7f397d01d026c192e75226e4dcb6a4b Mon Sep 17 00:00:00 2001 From: cdesouza-chromium Date: Wed, 6 May 2026 12:02:55 +0100 Subject: [PATCH] Change pinned commit name for `plaster` reapply (#36206) This change uses a new label for plaster reapply commits, as the previous name had `Regen` in it, which can cause confusion with the similar command `brockit regen`. --- tools/cr/alias/commit-msg.py | 2 +- tools/cr/brockit.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/cr/alias/commit-msg.py b/tools/cr/alias/commit-msg.py index c3bea76dc60..7987b4e66d3 100755 --- a/tools/cr/alias/commit-msg.py +++ b/tools/cr/alias/commit-msg.py @@ -65,7 +65,7 @@ import re PREFIXES_FOR_UPGRADE_COMMITS = [ 'Update from Chromium ', - 'Regen-fixed 🩹 patches from Chromium ', + 'Apply-fixed 🩹 patches from Chromium ', 'Conflict-resolved patches from Chromium ', 'Update patches from Chromium ', 'Updated strings for Chromium ', diff --git a/tools/cr/brockit.py b/tools/cr/brockit.py index 6db93f2af24..e9408776324 100755 --- a/tools/cr/brockit.py +++ b/tools/cr/brockit.py @@ -233,7 +233,7 @@ VERSION_UPGRADE_FILE = Path('.version_upgrade') # NOT dev-cycle changes and therefore must NOT be turned into fixups. _UPGRADE_COMMIT_WITH_PATCHES_PREFIXES = ( 'Conflict-resolved patches from Chromium ', - 'Regen-fixed 🩹 patches from Chromium ', + 'Apply-fixed 🩹 patches from Chromium ', 'Update patches from Chromium ', ) @@ -1230,7 +1230,7 @@ class Upgrade(Versioned): # exception for the branch tag. self._commit_pinned_patches_and_fixups( patch_paths, - f'Regen-fixed 🩹 patches from Chromium {self.base_version} ' + f'Apply-fixed 🩹 patches from Chromium {self.base_version} ' f'to Chromium {self.target_version}.', no_verify=True) @@ -1957,7 +1957,7 @@ class Rebase(Task): if comment.startswith('Update from Chromium '): version.append( line if not version else line.replace('pick', 'squash')) - elif comment.startswith('Regen-fixed 🩹 patches from Chromium '): + elif comment.startswith('Apply-fixed 🩹 patches from Chromium '): plaster_reruns.append(line if not plaster_reruns else line. replace('pick', 'squash')) elif comment.startswith(