From accedc679461ddae7f8a7d3931bdaad887957c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Masaaki=20Kakimoto=28=E6=9F=BF=E6=9C=AC=E5=8C=A1=E7=AB=A0?=
 =?UTF-8?q?=29?= <karamage.umauma@gmail.com>
Date: Tue, 24 Nov 2020 05:08:53 +0900
Subject: [PATCH] Add current version to the upgrade message of the Flutter
 tool (#68421)

---
 .../lib/src/commands/upgrade.dart             |  1 +
 .../permeable/upgrade_test.dart               | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart
index 97247a185c..62077310f3 100644
--- a/packages/flutter_tools/lib/src/commands/upgrade.dart
+++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -152,6 +152,7 @@ class UpgradeCommandRunner {
       );
     }
     recordState(flutterVersion);
+    globals.printStatus('Upgrading Flutter to ${upstreamVersion.frameworkVersion} from ${flutterVersion.frameworkVersion} in $workingDirectory...');
     await attemptReset(upstreamVersion.frameworkRevision);
     if (!testFlow) {
       await flutterUpgradeContinue();
diff --git a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
index 5e3cabb49d..ed40a4e6fa 100644
--- a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
+++ b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
@@ -282,6 +282,39 @@ void main() {
       Platform: () => fakePlatform,
     });
 
+    testUsingContext('Show current version to the upgrade message.', () async {
+      const String revision = 'abc123';
+      const String upstreamRevision = 'def456';
+      const String version = '1.2.3';
+      const String upstreamVersion = '4.5.6';
+
+      when(flutterVersion.frameworkRevision).thenReturn(revision);
+      when(flutterVersion.frameworkVersion).thenReturn(version);
+
+      final MockFlutterVersion latestVersion = MockFlutterVersion();
+
+      when(latestVersion.frameworkRevision).thenReturn(upstreamRevision);
+      when(latestVersion.frameworkVersion).thenReturn(upstreamVersion);
+
+      fakeCommandRunner.alreadyUpToDate = false;
+      fakeCommandRunner.remoteVersion = latestVersion;
+      fakeCommandRunner.workingDirectory = 'workingDirectory/aaa/bbb';
+
+      final Future<FlutterCommandResult> result = fakeCommandRunner.runCommand(
+        force: true,
+        continueFlow: false,
+        testFlow: true,
+        gitTagVersion: gitTagVersion,
+        flutterVersion: flutterVersion,
+        verifyOnly: false,
+      );
+      expect(await result, FlutterCommandResult.success());
+      expect(testLogger.statusText, contains('Upgrading Flutter to 4.5.6 from 1.2.3 in workingDirectory/aaa/bbb...'));
+    }, overrides: <Type, Generator>{
+      ProcessManager: () => processManager,
+      Platform: () => fakePlatform,
+    });
+
     testUsingContext('precacheArtifacts passes env variables to child process', () async {
       processManager.addCommand(
         FakeCommand(