Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Only print "gclient sync" warning once during rebase #52133

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented Apr 15, 2024

Skip the "pre-rebase" message since it will also be printed "post-checkout" at the end.

Fixes flutter/flutter#146781

Before this PR:

rebase

On this PR it's only printed once

Screenshot 2024-04-15 at 2 06 24 PM

Fixes flutter/flutter#146781

@jmagman jmagman self-assigned this Apr 15, 2024
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@jmagman jmagman requested a review from loic-sharma April 15, 2024 21:11
Copy link
Member

@loic-sharma loic-sharma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this!

@loic-sharma loic-sharma requested a review from zanderso April 16, 2024 15:40
@loic-sharma
Copy link
Member

cc @zanderso

@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 16, 2024
@auto-submit auto-submit bot merged commit 4d69c0c into flutter:main Apr 16, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 16, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Apr 16, 2024
…146841)

flutter/engine@bb127fe...4d69c0c

2024-04-16 [email protected] Only print "gclient sync" warning once during rebase (flutter/engine#52133)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@jmagman jmagman deleted the pre-rebase branch April 16, 2024 23:49
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
…lutter#146841)

flutter/engine@bb127fe...4d69c0c

2024-04-16 [email protected] Only print "gclient sync" warning once during rebase (flutter/engine#52133)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@@ -10,6 +10,9 @@ 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') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be cleaner to just remove the call to this function from https://github.com/flutter/engine/blob/main/tools/githooks/lib/src/pre_rebase_command.dart#L19, I think.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes that would be better, let me fix it. Thanks @zanderso

auto-submit bot pushed a commit that referenced this pull request Apr 25, 2024
Remove `pre-rebase` check from `gclient sync` warning, and instead remove the warning call from `pre_rebase_command`

Follow-up to #52133 (comment)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rebasing in engine prints "gclient sync -D" reminder twice
3 participants