From bf3c05a403d06089c94da522b599cab5a0ca16db Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 23 Apr 2024 15:28:58 -0700 Subject: [PATCH 1/2] Remove "gclient sync" warning call during pre-rebase --- tools/githooks/lib/src/messages.dart | 3 --- tools/githooks/lib/src/pre_rebase_command.dart | 1 - 2 files changed, 4 deletions(-) diff --git a/tools/githooks/lib/src/messages.dart b/tools/githooks/lib/src/messages.dart index 34fe282397929..787a8a134be51 100644 --- a/tools/githooks/lib/src/messages.dart +++ b/tools/githooks/lib/src/messages.dart @@ -10,9 +10,6 @@ const String _reset = '\x1B[0m'; /// Prints a reminder to stdout to run `gclient sync -D`. Uses colors when /// stdout supports ANSI escape codes. void printGclientSyncReminder(String command) { - if (command == 'pre-rebase') { - return; - } final String prefix = io.stdout.supportsAnsiEscapes ? _redBoldUnderline : ''; final String postfix = io.stdout.supportsAnsiEscapes ? _reset : ''; io.stderr.writeln('$command: The engine source tree has been updated.'); diff --git a/tools/githooks/lib/src/pre_rebase_command.dart b/tools/githooks/lib/src/pre_rebase_command.dart index 3e81670888261..ea5c781312412 100644 --- a/tools/githooks/lib/src/pre_rebase_command.dart +++ b/tools/githooks/lib/src/pre_rebase_command.dart @@ -16,7 +16,6 @@ class PreRebaseCommand extends Command { @override Future run() async { - printGclientSyncReminder(name); // Returning false here will block the rebase. return true; } From e4d2dd637d833358c7660eb6c2928061f979e825 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 25 Apr 2024 14:32:22 -0700 Subject: [PATCH 2/2] remove unused import --- tools/githooks/lib/src/pre_rebase_command.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/githooks/lib/src/pre_rebase_command.dart b/tools/githooks/lib/src/pre_rebase_command.dart index ea5c781312412..5da5a9b8ff302 100644 --- a/tools/githooks/lib/src/pre_rebase_command.dart +++ b/tools/githooks/lib/src/pre_rebase_command.dart @@ -4,8 +4,6 @@ import 'package:args/command_runner.dart'; -import 'messages.dart'; - /// The command that implements the pre-rebase githook class PreRebaseCommand extends Command { @override