[flutter_conductor] Add "start", "status", "clean" commands to conductor release tool (#80528)

analysis_options.yaml

@@ -40,6 +40,8 @@ analyzer:
     unnecessary_null_comparison: ignore
   exclude:
     - "bin/cache/**"
+      # Ignore protoc generated files
+    - "dev/tools/lib/proto/*"
 
 linter:
   rules:

dev/tools/bin/conductor.dart

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Rolls the dev channel.
-// Only tested on Linux.
-//
 // See: https://github.com/flutter/flutter/wiki/Release-process
 
 import 'dart:io' as io;
 
 import 'package:args/command_runner.dart';
+import 'package:dev_tools/clean.dart';
 import 'package:dev_tools/codesign.dart';
 import 'package:dev_tools/globals.dart';
 import 'package:dev_tools/roll_dev.dart';
 import 'package:dev_tools/repository.dart';
+import 'package:dev_tools/start.dart';
+import 'package:dev_tools/status.dart';
 import 'package:dev_tools/stdio.dart';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
@@ -54,6 +54,16 @@ Future<void> main(List<String> args) async {
       checkouts: checkouts,
       flutterRoot: localFlutterRoot,
     ),
+    StatusCommand(
+      checkouts: checkouts,
+    ),
+    StartCommand(
+      checkouts: checkouts,
+      flutterRoot: localFlutterRoot,
+    ),
+    CleanCommand(
+      checkouts: checkouts,
+    ),
   ].forEach(runner.addCommand);
 
   if (!assertsEnabled()) {
@@ -63,8 +73,8 @@ Future<void> main(List<String> args) async {
 
   try {
     await runner.run(args);
-  } on Exception catch (e) {
-    stdio.printError(e.toString());
+  } on Exception catch (e, stacktrace) {
+    stdio.printError('$e\n\n$stacktrace');
     io.exit(1);
   }
 }

dev/tools/lib/clean.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+import 'package:file/file.dart';
+import 'package:meta/meta.dart';
+import 'package:platform/platform.dart';
+
+import './globals.dart';
+import './repository.dart';
+import './state.dart';
+import './stdio.dart';
+
+const String kYesFlag = 'yes';
+const String kStateOption = 'state-file';
+
+/// Command to clean up persistent state file.
+///
+/// If the release was not completed, this command will abort the release.
+class CleanCommand extends Command<void> {
+  CleanCommand({
+    @required this.checkouts,
+  })  : platform = checkouts.platform,
+        fileSystem = checkouts.fileSystem,
+        stdio = checkouts.stdio {
+    final String defaultPath = defaultStateFilePath(platform);
+    argParser.addFlag(
+      kYesFlag,
+      help: 'Override confirmation checks.',
+    );
+    argParser.addOption(
+      kStateOption,
+      defaultsTo: defaultPath,
+      help: 'Path to persistent state file. Defaults to $defaultPath',
+    );
+  }
+
+  final Checkouts checkouts;
+  final FileSystem fileSystem;
+  final Platform platform;
+  final Stdio stdio;
+
+  @override
+  String get name => 'clean';
+
+  @override
+  String get description => 'Cleanup persistent state file. '
+      'This will abort a work in progress release.';
+
+  @override
+  void run() {
+    final File stateFile = checkouts.fileSystem.file(argResults[kStateOption]);
+    if (!stateFile.existsSync()) {
+      throw ConductorException(
+          'No persistent state file found at ${stateFile.path}!');
+    }
+
+    if (!(argResults[kYesFlag] as bool)) {
+      stdio.printStatus(
+        'Are you sure you want to clean up the persistent state file at\n'
+        '${stateFile.path} (y/n)?',
+      );
+      final String response = stdio.readLineSync();
+
+      // Only proceed if the first character of stdin is 'y' or 'Y'
+      if (response.isEmpty || response[0].toLowerCase() != 'y') {
+        stdio.printStatus('Aborting clean operation.');
+        return;
+      }
+    }
+    stdio.printStatus('Deleting persistent state file ${stateFile.path}...');
+    stateFile.deleteSync();
+  }
+}

dev/tools/lib/codesign.dart

@@ -33,11 +33,15 @@ class CodesignCommand extends Command<void> {
   CodesignCommand({
     @required this.checkouts,
     @required this.flutterRoot,
+    FrameworkRepository framework,
   })  : assert(flutterRoot != null),
         fileSystem = checkouts.fileSystem,
         platform = checkouts.platform,
         stdio = checkouts.stdio,
         processManager = checkouts.processManager {
+          if (framework != null) {
+            _framework = framework;
+          }
     argParser.addFlag(
       kVerify,
       help:
@@ -71,13 +75,12 @@ class CodesignCommand extends Command<void> {
   final Directory flutterRoot;
 
   FrameworkRepository _framework;
-  FrameworkRepository get framework => _framework ??= FrameworkRepository.localRepoAsUpstream(
-    checkouts,
-    upstreamPath: flutterRoot.path,
-  );
-
-  @visibleForTesting
-  set framework(FrameworkRepository framework) => _framework = framework;
+  FrameworkRepository get framework {
+    return _framework ??= FrameworkRepository.localRepoAsUpstream(
+      checkouts,
+      upstreamPath: flutterRoot.path,
+    );
+  }
 
   @override
   String get name => 'codesign';
@@ -102,15 +105,19 @@ class CodesignCommand extends Command<void> {
 
     String revision;
     if (argResults.wasParsed(kRevision)) {
-      stdio.printError('Warning! When providing an arbitrary revision, the contents of the cache may not');
-      stdio.printError('match the expected binaries in the conductor tool. It is preferred to check out');
-      stdio.printError('the desired revision and run that version of the conductor.\n');
+      stdio.printError(
+          'Warning! When providing an arbitrary revision, the contents of the cache may not');
+      stdio.printError(
+          'match the expected binaries in the conductor tool. It is preferred to check out');
+      stdio.printError(
+          'the desired revision and run that version of the conductor.\n');
       revision = argResults[kRevision] as String;
     } else {
       revision = (processManager.runSync(
         <String>['git', 'rev-parse', 'HEAD'],
         workingDirectory: framework.checkoutDirectory.path,
-      ).stdout as String).trim();
+      ).stdout as String)
+          .trim();
       assert(revision.isNotEmpty);
     }
 
@@ -158,7 +165,10 @@ class CodesignCommand extends Command<void> {
       'dart-sdk/bin/dart',
       'dart-sdk/bin/dartaotruntime',
       'dart-sdk/bin/utils/gen_snapshot',
-    ].map((String relativePath) => fileSystem.path.join(framework.cacheDirectory, relativePath)).toList();
+    ]
+        .map((String relativePath) =>
+            fileSystem.path.join(framework.cacheDirectory, relativePath))
+        .toList();
   }
 
   /// Binaries that are only expected to be codesigned.
@@ -178,7 +188,10 @@ class CodesignCommand extends Command<void> {
       'artifacts/engine/ios/Flutter.xcframework/ios-armv7_arm64/Flutter.framework/Flutter',
       'artifacts/engine/ios/Flutter.xcframework/ios-x86_64-simulator/Flutter.framework/Flutter',
       'artifacts/ios-deploy/ios-deploy',
-    ].map((String relativePath) => fileSystem.path.join(framework.cacheDirectory, relativePath)).toList();
+    ]
+        .map((String relativePath) =>
+            fileSystem.path.join(framework.cacheDirectory, relativePath))
+        .toList();
   }
 
   /// Verify the existence of all expected binaries in cache.
@@ -197,19 +210,27 @@ class CodesignCommand extends Command<void> {
       } else if (binariesWithoutEntitlements.contains(binaryPath)) {
         foundFiles.add(binaryPath);
       } else {
-        throw ConductorException('Found unexpected binary in cache: $binaryPath');
+        throw ConductorException(
+            'Found unexpected binary in cache: $binaryPath');
       }
     }
 
-    final List<String> allExpectedFiles = binariesWithEntitlements + binariesWithoutEntitlements;
+    final List<String> allExpectedFiles =
+        binariesWithEntitlements + binariesWithoutEntitlements;
     if (foundFiles.length < allExpectedFiles.length) {
-      final List<String> unfoundFiles = allExpectedFiles.where(
-        (String file) => !foundFiles.contains(file),
-      ).toList();
-      stdio.printError('Expected binaries not found in cache:\n\n${unfoundFiles.join('\n')}\n');
-      stdio.printError('If this commit is removing binaries from the cache, this test should be fixed by');
-      stdio.printError('removing the relevant entry from either the `binariesWithEntitlements` or');
-      stdio.printError('`binariesWithoutEntitlements` getters in dev/tools/lib/codesign.dart.');
+      final List<String> unfoundFiles = allExpectedFiles
+          .where(
+            (String file) => !foundFiles.contains(file),
+          )
+          .toList();
+      stdio.printError(
+          'Expected binaries not found in cache:\n\n${unfoundFiles.join('\n')}\n');
+      stdio.printError(
+          'If this commit is removing binaries from the cache, this test should be fixed by');
+      stdio.printError(
+          'removing the relevant entry from either the `binariesWithEntitlements` or');
+      stdio.printError(
+          '`binariesWithoutEntitlements` getters in dev/tools/lib/codesign.dart.');
       throw ConductorException('Did not find all expected binaries!');
     }
 
@@ -275,13 +296,15 @@ class CodesignCommand extends Command<void> {
     }
 
     if (unexpectedBinaries.isNotEmpty) {
-      stdio.printError('Found ${unexpectedBinaries.length} unexpected binaries in the cache:');
+      stdio.printError(
+          'Found ${unexpectedBinaries.length} unexpected binaries in the cache:');
       unexpectedBinaries.forEach(print);
     }
 
     // Finally, exit on any invalid state
     if (unsignedBinaries.isNotEmpty) {
-      throw ConductorException('Test failed because unsigned binaries detected.');
+      throw ConductorException(
+          'Test failed because unsigned binaries detected.');
     }
 
     if (wrongEntitlementBinaries.isNotEmpty) {
@@ -291,7 +314,8 @@ class CodesignCommand extends Command<void> {
     }
 
     if (unexpectedBinaries.isNotEmpty) {
-      throw ConductorException('Test failed because unexpected binaries found in the cache.');
+      throw ConductorException(
+          'Test failed because unexpected binaries found in the cache.');
     }
 
     stdio.printStatus(
@@ -300,6 +324,7 @@ class CodesignCommand extends Command<void> {
   }
 
   List<String> _allBinaryPaths;
+
   /// Find every binary file in the given [rootDirectory].
   List<String> findBinaryPaths(String rootDirectory) {
     if (_allBinaryPaths != null) {
@@ -356,7 +381,8 @@ class CodesignCommand extends Command<void> {
     bool passes = true;
     final String output = entitlementResult.stdout as String;
     for (final String entitlement in expectedEntitlements) {
-      final bool entitlementExpected = binariesWithEntitlements.contains(binaryPath);
+      final bool entitlementExpected =
+          binariesWithEntitlements.contains(binaryPath);
       if (output.contains(entitlement) != entitlementExpected) {
         stdio.printError(
             'File "$binaryPath" ${entitlementExpected ? 'does not have expected' : 'has unexpected'} '

dev/tools/lib/git.dart

@@ -19,6 +19,7 @@ class Git {
     List<String> args,
     String explanation, {
     @required String workingDirectory,
+    bool allowFailures = false,
   }) {
     final ProcessResult result = _run(args, workingDirectory);
     if (result.exitCode == 0) {
@@ -68,6 +69,15 @@ class Git {
       message.writeln('stdout from git:\n${result.stdout}\n');
     if ((result.stderr as String).isNotEmpty)
       message.writeln('stderr from git:\n${result.stderr}\n');
-    throw Exception(message);
+    throw GitException(message.toString());
   }
 }
+
+class GitException implements Exception {
+  GitException(this.message);
+
+  final String message;
+
+  @override
+  String toString() => 'Exception: $message';
+}

dev/tools/lib/globals.dart

@@ -2,20 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:args/args.dart';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
 import 'package:platform/platform.dart';
 
-const String kIncrement = 'increment';
-const String kCommit = 'commit';
-const String kRemoteName = 'remote';
-const String kJustPrint = 'just-print';
-const String kYes = 'yes';
-const String kForce = 'force';
-const String kSkipTagging = 'skip-tagging';
-
 const String kUpstreamRemote = 'https://github.com/flutter/flutter.git';
 
+const String gsutilBinary = 'gsutil.py';
+
 const List<String> kReleaseChannels = <String>[
   'stable',
   'beta',
@@ -23,6 +18,12 @@ const List<String> kReleaseChannels = <String>[
   'master',
 ];
 
+const String kReleaseDocumentationUrl = 'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
+
+final RegExp releaseCandidateBranchRegex = RegExp(
+  r'flutter-(\d+)\.(\d+)-candidate\.(\d+)',
+);
+
 /// Cast a dynamic to String and trim.
 String stdoutToString(dynamic input) {
   final String str = input as String;
@@ -86,3 +87,64 @@ bool assertsEnabled() {
   }());
   return assertsEnabled;
 }
+
+/// Either return the value from [env] or fall back to [argResults].
+///
+/// If the key does not exist in either the environment or CLI args, throws a
+/// [ConductorException].
+///
+/// The environment is favored over CLI args since the latter can have a default
+/// value, which the environment should be able to override.
+String getValueFromEnvOrArgs(
+  String name,
+  ArgResults argResults,
+  Map<String, String> env,
+) {
+  final String envName = fromArgToEnvName(name);
+  if (env[envName] != null ) {
+    return env[envName];
+  }
+  final String argValue = argResults[name] as String;
+  if (argValue != null) {
+    return argValue;
+  }
+
+  throw ConductorException(
+    'Expected either the CLI arg --$name or the environment variable $envName '
+    'to be provided!');
+}
+
+/// Return multiple values from the environment or fall back to [argResults].
+///
+/// Values read from an environment variable are assumed to be comma-delimited.
+///
+/// If the key does not exist in either the CLI args or environment, throws a
+/// [ConductorException].
+///
+/// The environment is favored over CLI args since the latter can have a default
+/// value, which the environment should be able to override.
+List<String> getValuesFromEnvOrArgs(
+  String name,
+  ArgResults argResults,
+  Map<String, String> env,
+) {
+  final String envName = fromArgToEnvName(name);
+  if (env[envName] != null && env[envName] != '') {
+    return env[envName].split(',');
+  }
+  final List<String> argValues = argResults[name] as List<String>;
+  if (argValues != null) {
+    return argValues;
+  }
+
+  throw ConductorException(
+    'Expected either the CLI arg --$name or the environment variable $envName '
+    'to be provided!');
+}
+
+/// Translate CLI arg names to env variable names.
+///
+/// For example, 'state-file' -> 'STATE_FILE'.
+String fromArgToEnvName(String argName) {
+  return argName.toUpperCase().replaceAll(r'-', r'_');
+}

dev/tools/lib/proto/README.md

+## Flutter Conductor Protocol Buffers
+
+This directory contains [conductor_state.proto](./conductor_state.proto), which
+defines the persistent state file the conductor creates. After changes to this
+file, you must run the [compile_proto.sh](./compile_proto.sh) script in this
+directory, which will re-generate the rest of the Dart files in this directory,
+format them, and prepend the license comment from
+[license_header.txt](./license_header.txt).

dev/tools/lib/proto/compile_proto.sh

+#!/usr/bin/env bash
+# Copyright 2014 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# //flutter/dev/tools/lib/proto
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+DARTFMT="$DIR/../../../../bin/cache/dart-sdk/bin/dartfmt"
+
+# Ensure dart-sdk is cached
+"$DIR/../../../../bin/dart" --version
+
+if ! type protoc >/dev/null 2>&1; then
+  PROTOC_LINK='https://grpc.io/docs/protoc-installation/'
+  echo "Error! \"protoc\" binary required on path."
+  echo "See $PROTOC_LINK for more information."
+  exit 1
+fi
+
+if ! type dart >/dev/null 2>&1; then
+  echo "Error! \"dart\" binary required on path."
+  exit 1
+fi
+
+# Pin protoc-gen-dart to pre-nullsafe version.
+dart pub global activate protoc_plugin 19.3.1
+
+protoc --dart_out="$DIR" --proto_path="$DIR" "$DIR/conductor_state.proto"
+
+for SOURCE_FILE in $(ls "$DIR"/*.pb*.dart); do
+  # Format in place file
+  "$DARTFMT" --overwrite --line-length 120 "$SOURCE_FILE"
+
+  # Create temp copy with the license header prepended
+  cp license_header.txt "${SOURCE_FILE}.tmp"
+
+  # Add an extra newline required by analysis (analysis also prevents
+  # license_header.txt from having the trailing newline)
+  echo '' >> "${SOURCE_FILE}.tmp"
+
+  cat "$SOURCE_FILE" >> "${SOURCE_FILE}.tmp"
+
+  # Move temp version (with license) over the original
+  mv "${SOURCE_FILE}.tmp" "$SOURCE_FILE"
+done

dev/tools/lib/proto/conductor_state.pbenum.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+///
+//  Generated code. Do not modify.
+//  source: conductor_state.proto
+//
+// @dart = 2.7
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
+
+// ignore_for_file: UNDEFINED_SHOWN_NAME
+import 'dart:core' as $core;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+class ReleasePhase extends $pb.ProtobufEnum {
+  static const ReleasePhase INITIALIZE =
+      ReleasePhase._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'INITIALIZE');
+  static const ReleasePhase APPLY_ENGINE_CHERRYPICKS =
+      ReleasePhase._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'APPLY_ENGINE_CHERRYPICKS');
+  static const ReleasePhase CODESIGN_ENGINE_BINARIES =
+      ReleasePhase._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CODESIGN_ENGINE_BINARIES');
+  static const ReleasePhase APPLY_FRAMEWORK_CHERRYPICKS = ReleasePhase._(
+      3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'APPLY_FRAMEWORK_CHERRYPICKS');
+  static const ReleasePhase PUBLISH_VERSION =
+      ReleasePhase._(4, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PUBLISH_VERSION');
+  static const ReleasePhase PUBLISH_CHANNEL =
+      ReleasePhase._(5, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PUBLISH_CHANNEL');
+  static const ReleasePhase VERIFY_RELEASE =
+      ReleasePhase._(6, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'VERIFY_RELEASE');
+
+  static const $core.List<ReleasePhase> values = <ReleasePhase>[
+    INITIALIZE,
+    APPLY_ENGINE_CHERRYPICKS,
+    CODESIGN_ENGINE_BINARIES,
+    APPLY_FRAMEWORK_CHERRYPICKS,
+    PUBLISH_VERSION,
+    PUBLISH_CHANNEL,
+    VERIFY_RELEASE,
+  ];
+
+  static final $core.Map<$core.int, ReleasePhase> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static ReleasePhase valueOf($core.int value) => _byValue[value];
+
+  const ReleasePhase._($core.int v, $core.String n) : super(v, n);
+}
+
+class CherrypickState extends $pb.ProtobufEnum {
+  static const CherrypickState PENDING =
+      CherrypickState._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PENDING');
+  static const CherrypickState PENDING_WITH_CONFLICT =
+      CherrypickState._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'PENDING_WITH_CONFLICT');
+  static const CherrypickState COMPLETED =
+      CherrypickState._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'COMPLETED');
+  static const CherrypickState ABANDONED =
+      CherrypickState._(3, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'ABANDONED');
+
+  static const $core.List<CherrypickState> values = <CherrypickState>[
+    PENDING,
+    PENDING_WITH_CONFLICT,
+    COMPLETED,
+    ABANDONED,
+  ];
+
+  static final $core.Map<$core.int, CherrypickState> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static CherrypickState valueOf($core.int value) => _byValue[value];
+
+  const CherrypickState._($core.int v, $core.String n) : super(v, n);
+}

dev/tools/lib/proto/conductor_state.pbjson.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+///
+//  Generated code. Do not modify.
+//  source: conductor_state.proto
+//
+// @dart = 2.7
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
+
+import 'dart:core' as $core;
+import 'dart:convert' as $convert;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use releasePhaseDescriptor instead')
+const ReleasePhase$json = const {
+  '1': 'ReleasePhase',
+  '2': const [
+    const {'1': 'INITIALIZE', '2': 0},
+    const {'1': 'APPLY_ENGINE_CHERRYPICKS', '2': 1},
+    const {'1': 'CODESIGN_ENGINE_BINARIES', '2': 2},
+    const {'1': 'APPLY_FRAMEWORK_CHERRYPICKS', '2': 3},
+    const {'1': 'PUBLISH_VERSION', '2': 4},
+    const {'1': 'PUBLISH_CHANNEL', '2': 5},
+    const {'1': 'VERIFY_RELEASE', '2': 6},
+  ],
+};
+
+/// Descriptor for `ReleasePhase`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List releasePhaseDescriptor = $convert.base64Decode(
+    'CgxSZWxlYXNlUGhhc2USDgoKSU5JVElBTElaRRAAEhwKGEFQUExZX0VOR0lORV9DSEVSUllQSUNLUxABEhwKGENPREVTSUdOX0VOR0lORV9CSU5BUklFUxACEh8KG0FQUExZX0ZSQU1FV09SS19DSEVSUllQSUNLUxADEhMKD1BVQkxJU0hfVkVSU0lPThAEEhMKD1BVQkxJU0hfQ0hBTk5FTBAFEhIKDlZFUklGWV9SRUxFQVNFEAY=');
+@$core.Deprecated('Use cherrypickStateDescriptor instead')
+const CherrypickState$json = const {
+  '1': 'CherrypickState',
+  '2': const [
+    const {'1': 'PENDING', '2': 0},
+    const {'1': 'PENDING_WITH_CONFLICT', '2': 1},
+    const {'1': 'COMPLETED', '2': 2},
+    const {'1': 'ABANDONED', '2': 3},
+  ],
+};
+
+/// Descriptor for `CherrypickState`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List cherrypickStateDescriptor = $convert.base64Decode(
+    'Cg9DaGVycnlwaWNrU3RhdGUSCwoHUEVORElORxAAEhkKFVBFTkRJTkdfV0lUSF9DT05GTElDVBABEg0KCUNPTVBMRVRFRBACEg0KCUFCQU5ET05FRBAD');
+@$core.Deprecated('Use remoteDescriptor instead')
+const Remote$json = const {
+  '1': 'Remote',
+  '2': const [
+    const {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'},
+    const {'1': 'url', '3': 2, '4': 1, '5': 9, '10': 'url'},
+  ],
+};
+
+/// Descriptor for `Remote`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List remoteDescriptor =
+    $convert.base64Decode('CgZSZW1vdGUSEgoEbmFtZRgBIAEoCVIEbmFtZRIQCgN1cmwYAiABKAlSA3VybA==');
+@$core.Deprecated('Use cherrypickDescriptor instead')
+const Cherrypick$json = const {
+  '1': 'Cherrypick',
+  '2': const [
+    const {'1': 'trunkRevision', '3': 1, '4': 1, '5': 9, '10': 'trunkRevision'},
+    const {'1': 'appliedRevision', '3': 2, '4': 1, '5': 9, '10': 'appliedRevision'},
+    const {'1': 'state', '3': 3, '4': 1, '5': 14, '6': '.conductor_state.CherrypickState', '10': 'state'},
+  ],
+};
+
+/// Descriptor for `Cherrypick`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List cherrypickDescriptor = $convert.base64Decode(
+    'CgpDaGVycnlwaWNrEiQKDXRydW5rUmV2aXNpb24YASABKAlSDXRydW5rUmV2aXNpb24SKAoPYXBwbGllZFJldmlzaW9uGAIgASgJUg9hcHBsaWVkUmV2aXNpb24SNgoFc3RhdGUYAyABKA4yIC5jb25kdWN0b3Jfc3RhdGUuQ2hlcnJ5cGlja1N0YXRlUgVzdGF0ZQ==');
+@$core.Deprecated('Use repositoryDescriptor instead')
+const Repository$json = const {
+  '1': 'Repository',
+  '2': const [
+    const {'1': 'candidateBranch', '3': 1, '4': 1, '5': 9, '10': 'candidateBranch'},
+    const {'1': 'startingGitHead', '3': 2, '4': 1, '5': 9, '10': 'startingGitHead'},
+    const {'1': 'currentGitHead', '3': 3, '4': 1, '5': 9, '10': 'currentGitHead'},
+    const {'1': 'checkoutPath', '3': 4, '4': 1, '5': 9, '10': 'checkoutPath'},
+    const {'1': 'upstream', '3': 5, '4': 1, '5': 11, '6': '.conductor_state.Remote', '10': 'upstream'},
+    const {'1': 'mirror', '3': 6, '4': 1, '5': 11, '6': '.conductor_state.Remote', '10': 'mirror'},
+    const {'1': 'cherrypicks', '3': 7, '4': 3, '5': 11, '6': '.conductor_state.Cherrypick', '10': 'cherrypicks'},
+  ],
+};
+
+/// Descriptor for `Repository`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List repositoryDescriptor = $convert.base64Decode(
+    'CgpSZXBvc2l0b3J5EigKD2NhbmRpZGF0ZUJyYW5jaBgBIAEoCVIPY2FuZGlkYXRlQnJhbmNoEigKD3N0YXJ0aW5nR2l0SGVhZBgCIAEoCVIPc3RhcnRpbmdHaXRIZWFkEiYKDmN1cnJlbnRHaXRIZWFkGAMgASgJUg5jdXJyZW50R2l0SGVhZBIiCgxjaGVja291dFBhdGgYBCABKAlSDGNoZWNrb3V0UGF0aBIzCgh1cHN0cmVhbRgFIAEoCzIXLmNvbmR1Y3Rvcl9zdGF0ZS5SZW1vdGVSCHVwc3RyZWFtEi8KBm1pcnJvchgGIAEoCzIXLmNvbmR1Y3Rvcl9zdGF0ZS5SZW1vdGVSBm1pcnJvchI9CgtjaGVycnlwaWNrcxgHIAMoCzIbLmNvbmR1Y3Rvcl9zdGF0ZS5DaGVycnlwaWNrUgtjaGVycnlwaWNrcw==');
+@$core.Deprecated('Use conductorStateDescriptor instead')
+const ConductorState$json = const {
+  '1': 'ConductorState',
+  '2': const [
+    const {'1': 'releaseChannel', '3': 1, '4': 1, '5': 9, '10': 'releaseChannel'},
+    const {'1': 'releaseVersion', '3': 2, '4': 1, '5': 9, '10': 'releaseVersion'},
+    const {'1': 'engine', '3': 4, '4': 1, '5': 11, '6': '.conductor_state.Repository', '10': 'engine'},
+    const {'1': 'framework', '3': 5, '4': 1, '5': 11, '6': '.conductor_state.Repository', '10': 'framework'},
+    const {'1': 'createdDate', '3': 6, '4': 1, '5': 3, '10': 'createdDate'},
+    const {'1': 'lastUpdatedDate', '3': 7, '4': 1, '5': 3, '10': 'lastUpdatedDate'},
+    const {'1': 'logs', '3': 8, '4': 3, '5': 9, '10': 'logs'},
+    const {'1': 'lastPhase', '3': 9, '4': 1, '5': 14, '6': '.conductor_state.ReleasePhase', '10': 'lastPhase'},
+    const {'1': 'conductor_version', '3': 10, '4': 1, '5': 9, '10': 'conductorVersion'},
+  ],
+};
+
+/// Descriptor for `ConductorState`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List conductorStateDescriptor = $convert.base64Decode(
+    'Cg5Db25kdWN0b3JTdGF0ZRImCg5yZWxlYXNlQ2hhbm5lbBgBIAEoCVIOcmVsZWFzZUNoYW5uZWwSJgoOcmVsZWFzZVZlcnNpb24YAiABKAlSDnJlbGVhc2VWZXJzaW9uEjMKBmVuZ2luZRgEIAEoCzIbLmNvbmR1Y3Rvcl9zdGF0ZS5SZXBvc2l0b3J5UgZlbmdpbmUSOQoJZnJhbWV3b3JrGAUgASgLMhsuY29uZHVjdG9yX3N0YXRlLlJlcG9zaXRvcnlSCWZyYW1ld29yaxIgCgtjcmVhdGVkRGF0ZRgGIAEoA1ILY3JlYXRlZERhdGUSKAoPbGFzdFVwZGF0ZWREYXRlGAcgASgDUg9sYXN0VXBkYXRlZERhdGUSEgoEbG9ncxgIIAMoCVIEbG9ncxI7CglsYXN0UGhhc2UYCSABKA4yHS5jb25kdWN0b3Jfc3RhdGUuUmVsZWFzZVBoYXNlUglsYXN0UGhhc2USKwoRY29uZHVjdG9yX3ZlcnNpb24YCiABKAlSEGNvbmR1Y3RvclZlcnNpb24=');

dev/tools/lib/proto/conductor_state.pbserver.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+///
+//  Generated code. Do not modify.
+//  source: conductor_state.proto
+//
+// @dart = 2.7
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
+
+export 'conductor_state.pb.dart';

dev/tools/lib/proto/conductor_state.proto

+syntax = "proto3";
+
+package conductor_state;
+
+// A git remote
+message Remote {
+  string name = 1;
+  string url = 2;
+}
+
+enum ReleasePhase {
+  // Release was started with `conductor start` and repositories cloned.
+  INITIALIZE = 0;
+  APPLY_ENGINE_CHERRYPICKS = 1;
+  CODESIGN_ENGINE_BINARIES = 2;
+  APPLY_FRAMEWORK_CHERRYPICKS = 3;
+
+  // Git tag applied to framework RC branch HEAD and pushed upstream.
+  PUBLISH_VERSION = 4;
+
+  // RC branch HEAD pushed to upstream release branch.
+  //
+  // For example, flutter-1.2-candidate.3 -> upstream/beta
+  PUBLISH_CHANNEL = 5;
+
+  // Package artifacts verified to exist on cloud storage.
+  VERIFY_RELEASE = 6;
+}
+
+enum CherrypickState {
+  // The cherrypick has not yet been applied.
+  PENDING = 0;
+
+  // The cherrypick has not been applied and will require manual resolution.
+  PENDING_WITH_CONFLICT = 1;
+
+  // The cherrypick has been successfully applied to the local checkout.
+  //
+  // This state requires Cherrypick.appliedRevision to also be set.
+  COMPLETED = 2;
+
+  // The cherrypick will NOT be applied in this release.
+  ABANDONED = 3;
+}
+
+message Cherrypick {
+  // The revision on trunk to cherrypick.
+  string trunkRevision = 1;
+
+  // Once applied, the actual commit revision of the cherrypick.
+  string appliedRevision = 2;
+
+  CherrypickState state = 3;
+}
+
+message Repository {
+  // The development git branch the release is based on.
+  //
+  // Must be of the form /flutter-(\d+)\.(\d+)-candidate\.(\d+)/
+  string candidateBranch = 1;
+
+  // The commit hash at the tip of the branch before cherrypicks were applied.
+  string startingGitHead = 2;
+
+  // The difference in commits between this and [startingGitHead] is the number
+  // of cherrypicks that have been currently applied.
+  string currentGitHead = 3;
+
+  // Path to the git checkout on local disk.
+  string checkoutPath = 4;
+
+  // The remote commits will be fetched from.
+  Remote upstream = 5;
+
+  // The remote cherrypicks will be pushed to to create a Pull Request.
+  //
+  // This should be a mirror owned by the user conducting the release.
+  Remote mirror = 6;
+
+  // Desired cherrypicks.
+  repeated Cherrypick cherrypicks = 7;
+}
+
+message ConductorState {
+  // One of 'stable', 'beta', or 'dev'
+  string releaseChannel = 1;
+
+  // The name of the release.
+  string releaseVersion = 2;
+
+  Repository engine = 4;
+  Repository framework = 5;
+  int64 createdDate = 6;
+  int64 lastUpdatedDate = 7;
+
+  repeated string logs = 8;
+
+  // The last [ReleasePhase] that was successfully completed.
+  ReleasePhase lastPhase = 9;
+
+  // Commit hash of the Conductor tool.
+  string conductor_version = 10;
+}

dev/tools/lib/proto/license_header.txt

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.

dev/tools/lib/roll_dev.dart

@@ -8,11 +8,18 @@ import 'package:file/file.dart';
 import 'package:meta/meta.dart';
 import 'package:platform/platform.dart';
 
-import './globals.dart';
 import './repository.dart';
 import './stdio.dart';
 import './version.dart';
 
+const String kIncrement = 'increment';
+const String kCommit = 'commit';
+const String kRemoteName = 'remote';
+const String kJustPrint = 'just-print';
+const String kYes = 'yes';
+const String kForce = 'force';
+const String kSkipTagging = 'skip-tagging';
+
 /// Create a new dev release without cherry picks.
 class RollDevCommand extends Command<void> {
   RollDevCommand({
@@ -57,7 +64,17 @@ class RollDevCommand extends Command<void> {
       help: 'Do not create tag and push to remote, only update release branch. '
       'For recovering when the script fails trying to git push to the release branch.'
     );
-    argParser.addFlag(kYes, negatable: false, abbr: 'y', help: 'Skip the confirmation prompt.');
+    argParser.addFlag(
+      kYes,
+      negatable: false,
+      abbr: 'y',
+      help: 'Skip the confirmation prompt.',
+    );
+    argParser.addOption(
+      kRemoteName,
+      help: 'Specifies which git remote to fetch from.',
+      defaultsTo: 'upstream',
+    );
   }
 
   final Checkouts checkouts;
@@ -92,8 +109,8 @@ bool rollDev({
   @required ArgResults argResults,
   @required Stdio stdio,
   @required FrameworkRepository repository,
-  String remoteName = 'origin',
 }) {
+  final String remoteName = argResults[kRemoteName] as String;
   final String level = argResults[kIncrement] as String;
   final String commit = argResults[kCommit] as String;
   final bool justPrint = argResults[kJustPrint] as bool;

dev/tools/lib/state.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:platform/platform.dart';
+
+import './globals.dart';
+import './proto/conductor_state.pb.dart' as pb;
+import './proto/conductor_state.pbenum.dart' show ReleasePhase;
+
+const String kStateFileName = '.flutter_conductor_state.json';
+
+String luciConsoleLink(String channel, String groupName) {
+  assert(
+    <String>['stable', 'beta', 'dev', 'master'].contains(channel),
+    'channel $channel not recognized',
+  );
+  assert(
+    <String>['framework', 'engine', 'devicelab'].contains(groupName),
+    'group named $groupName not recognized',
+  );
+  final String consoleName = channel == 'master' ? groupName : '${channel}_$groupName';
+  return 'https://ci.chromium.org/p/flutter/g/$consoleName/console';
+}
+
+String defaultStateFilePath(Platform platform) {
+  assert(platform.environment['HOME'] != null);
+  return <String>[
+    platform.environment['HOME'],
+    kStateFileName,
+  ].join(platform.pathSeparator);
+}
+
+String presentState(pb.ConductorState state) {
+  final StringBuffer buffer = StringBuffer();
+  buffer.writeln('Conductor version: ${state.conductorVersion}');
+  buffer.writeln('Release channel: ${state.releaseChannel}');
+  buffer.writeln('');
+  buffer.writeln(
+      'Release started at: ${DateTime.fromMillisecondsSinceEpoch(state.createdDate.toInt())}');
+  buffer.writeln(
+      'Last updated at: ${DateTime.fromMillisecondsSinceEpoch(state.lastUpdatedDate.toInt())}');
+  buffer.writeln('');
+  buffer.writeln('Engine Repo');
+  buffer.writeln('\tCandidate branch: ${state.engine.candidateBranch}');
+  buffer.writeln('\tStarting git HEAD: ${state.engine.startingGitHead}');
+  buffer.writeln('\tCurrent git HEAD: ${state.engine.currentGitHead}');
+  buffer.writeln('\tPath to checkout: ${state.engine.checkoutPath}');
+  buffer.writeln('\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'engine')}');
+  if (state.engine.cherrypicks.isNotEmpty) {
+    buffer.writeln('${state.engine.cherrypicks.length} Engine Cherrypicks:');
+    for (final pb.Cherrypick cherrypick in state.engine.cherrypicks) {
+      buffer.writeln('\t${cherrypick.trunkRevision} - ${cherrypick.state}');
+    }
+  } else {
+    buffer.writeln('0 Engine cherrypicks.');
+  }
+  buffer.writeln('Framework Repo');
+  buffer.writeln('\tCandidate branch: ${state.framework.candidateBranch}');
+  buffer.writeln('\tStarting git HEAD: ${state.framework.startingGitHead}');
+  buffer.writeln('\tCurrent git HEAD: ${state.framework.currentGitHead}');
+  buffer.writeln('\tPath to checkout: ${state.framework.checkoutPath}');
+  buffer.writeln('\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'framework')}');
+  buffer.writeln('\tDevicelab LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'devicelab')}');
+  if (state.framework.cherrypicks.isNotEmpty) {
+    buffer.writeln('${state.framework.cherrypicks.length} Framework Cherrypicks:');
+    for (final pb.Cherrypick cherrypick in state.framework.cherrypicks) {
+      buffer.writeln('\t${cherrypick.trunkRevision} - ${cherrypick.state}');
+    }
+  } else {
+    buffer.writeln('0 Framework cherrypicks.');
+  }
+  buffer.writeln('');
+  if (state.lastPhase == ReleasePhase.VERIFY_RELEASE) {
+    buffer.writeln(
+      '${state.releaseChannel} release ${state.releaseVersion} has been published and verified.\n',
+    );
+    return buffer.toString();
+  }
+  buffer.writeln('The next step is:');
+  buffer.writeln(presentPhases(state.lastPhase));
+
+  buffer.writeln(phaseInstructions(state));
+  buffer.writeln('');
+  buffer.writeln('Issue `conductor next` when you are ready to proceed.');
+  return buffer.toString();
+}
+
+String presentPhases(ReleasePhase lastPhase) {
+  final ReleasePhase nextPhase = getNextPhase(lastPhase);
+  final StringBuffer buffer = StringBuffer();
+  bool phaseCompleted = true;
+
+  for (final ReleasePhase phase in ReleasePhase.values) {
+    if (phase == nextPhase) {
+      // This phase will execute the next time `conductor next` is run.
+      buffer.writeln('> ${phase.name} (next)');
+      phaseCompleted = false;
+    } else if (phaseCompleted) {
+      // This phase was already completed.
+      buffer.writeln('✓ ${phase.name}');
+    } else {
+      // This phase has not been completed yet.
+      buffer.writeln('  ${phase.name}');
+    }
+  }
+  return buffer.toString();
+}
+
+String phaseInstructions(pb.ConductorState state) {
+  switch (state.lastPhase) {
+    case ReleasePhase.INITIALIZE:
+      if (state.engine.cherrypicks.isEmpty) {
+        return <String>[
+          'There are no engine cherrypicks, so issue `conductor next` to continue',
+          'to the next step.',
+        ].join('\n');
+      }
+      return <String>[
+        'You must now manually apply the following engine cherrypicks to the checkout',
+        'at ${state.engine.checkoutPath} in order:',
+        for (final pb.Cherrypick cherrypick in state.engine.cherrypicks)
+          '\t${cherrypick.trunkRevision}',
+        'See $kReleaseDocumentationUrl for more information.',
+      ].join('\n');
+    case ReleasePhase.APPLY_ENGINE_CHERRYPICKS:
+      return <String>[
+        'You must verify Engine CI builds are successful and then codesign the',
+        'binaries at revision ${state.engine.currentGitHead}.',
+      ].join('\n');
+    case ReleasePhase.CODESIGN_ENGINE_BINARIES:
+      return <String>[
+        'You must now manually apply the following framework cherrypicks to the checkout',
+        'at ${state.framework.checkoutPath} in order:',
+        for (final pb.Cherrypick cherrypick in state.framework.cherrypicks)
+          '\t${cherrypick.trunkRevision}',
+      ].join('\n');
+    case ReleasePhase.APPLY_FRAMEWORK_CHERRYPICKS:
+      return <String>[
+        'You must verify Framework CI builds are successful.',
+        'See $kReleaseDocumentationUrl for more information.',
+      ].join('\n');
+    case ReleasePhase.PUBLISH_VERSION:
+      return 'Issue `conductor next` to publish your release to the release branch.';
+    case ReleasePhase.PUBLISH_CHANNEL:
+      return <String>[
+        'Release archive packages must be verified on cloud storage. Issue',
+        '`conductor next` to check if they are ready.',
+      ].join('\n');
+    case ReleasePhase.VERIFY_RELEASE:
+      return 'This release has been completed.';
+  }
+  assert(false);
+  return ''; // For analyzer
+}
+
+/// Returns the next phase in the ReleasePhase enum.
+///
+/// Will throw a [ConductorException] if [ReleasePhase.RELEASE_VERIFIED] is
+/// passed as an argument, as there is no next phase.
+ReleasePhase getNextPhase(ReleasePhase previousPhase) {
+  assert(previousPhase != null);
+  if (previousPhase == ReleasePhase.VERIFY_RELEASE) {
+    throw ConductorException('There is no next ReleasePhase!');
+  }
+  return ReleasePhase.valueOf(previousPhase.value + 1);
+}

dev/tools/lib/status.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' show jsonDecode;
+
+import 'package:args/command_runner.dart';
+import 'package:file/file.dart';
+import 'package:meta/meta.dart';
+import 'package:platform/platform.dart';
+
+import './proto/conductor_state.pb.dart' as pb;
+import './repository.dart';
+import './state.dart';
+import './stdio.dart';
+
+const String kVerboseFlag = 'verbose';
+const String kStateOption = 'state-file';
+
+/// Command to print the status of the current Flutter release.
+class StatusCommand extends Command<void> {
+  StatusCommand({
+    @required this.checkouts,
+  })  : platform = checkouts.platform,
+        fileSystem = checkouts.fileSystem,
+        stdio = checkouts.stdio {
+    final String defaultPath = defaultStateFilePath(platform);
+    argParser.addOption(
+      kStateOption,
+      defaultsTo: defaultPath,
+      help: 'Path to persistent state file. Defaults to $defaultPath',
+    );
+    argParser.addFlag(
+      kVerboseFlag,
+      abbr: 'v',
+      defaultsTo: false,
+      help: 'Also print logs.',
+    );
+  }
+
+  final Checkouts checkouts;
+  final FileSystem fileSystem;
+  final Platform platform;
+  final Stdio stdio;
+
+  @override
+  String get name => 'status';
+
+  @override
+  String get description => 'Print status of current release.';
+
+  @override
+  void run() {
+    final File stateFile = checkouts.fileSystem.file(argResults[kStateOption]);
+    if (!stateFile.existsSync()) {
+      stdio.printStatus(
+          'No persistent state file found at ${argResults[kStateOption]}.');
+      return;
+    }
+    final pb.ConductorState state = pb.ConductorState();
+    state.mergeFromProto3Json(jsonDecode(stateFile.readAsStringSync()));
+    stdio.printStatus(presentState(state));
+    if (argResults[kVerboseFlag] as bool) {
+      stdio.printStatus('\nLogs:');
+      state.logs.forEach(stdio.printStatus);
+    }
+  }
+}

dev/tools/lib/stdio.dart

@@ -7,17 +7,31 @@ import 'dart:io' as io;
 import 'package:meta/meta.dart';
 
 abstract class Stdio {
+  final List<String> logs = <String>[];
+
   /// Error/warning messages printed to STDERR.
-  void printError(String message);
+  @mustCallSuper
+  void printError(String message) {
+    logs.add('[error] $message');
+  }
 
   /// Ordinary STDOUT messages.
-  void printStatus(String message);
+  @mustCallSuper
+  void printStatus(String message) {
+    logs.add('[status] $message');
+  }
 
   /// Debug messages that are only printed in verbose mode.
-  void printTrace(String message);
+  @mustCallSuper
+  void printTrace(String message) {
+    logs.add('[trace] $message');
+  }
 
   /// Write string to STDOUT without trailing newline.
-  void write(String message);
+  @mustCallSuper
+  void write(String message) {
+    logs.add('[write] $message');
+  }
 
   /// Read a line of text from STDIN.
   String readLineSync();
@@ -43,21 +57,25 @@ class VerboseStdio extends Stdio {
 
   @override
   void printError(String message) {
+    super.printError(message);
     stderr.writeln(message);
   }
 
   @override
   void printStatus(String message) {
+    super.printStatus(message);
     stdout.writeln(message);
   }
 
   @override
   void printTrace(String message) {
+    super.printTrace(message);
     stdout.writeln(message);
   }
 
   @override
   void write(String message) {
+    super.write(message);
     stdout.write(message);
   }
 

dev/tools/pubspec.yaml

@@ -12,12 +12,14 @@ dependencies:
   meta: 1.3.0
   path: 1.8.0
   process: 4.2.1
+  protobuf: 1.1.3
 
   charcode: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   clock: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 3.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 6.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  fixnum: 0.10.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_parser: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pedantic: 1.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   platform: 3.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -63,4 +65,4 @@ dev_dependencies:
   webkit_inspection_protocol: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 3.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: 8750
+# PUBSPEC CHECKSUM: e555

dev/tools/test/clean_test.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+import 'package:dev_tools/clean.dart';
+import 'package:dev_tools/repository.dart';
+import 'package:file/file.dart';
+import 'package:file/memory.dart';
+import 'package:platform/platform.dart';
+
+import '../../../packages/flutter_tools/test/src/fake_process_manager.dart';
+import './common.dart';
+
+void main() {
+  group('clean command', () {
+    const String flutterRoot = '/flutter';
+    const String checkoutsParentDirectory = '$flutterRoot/dev/tools/';
+
+    MemoryFileSystem fileSystem;
+    FakePlatform platform;
+    TestStdio stdio;
+    FakeProcessManager processManager;
+
+    setUp(() {
+      stdio = TestStdio();
+      fileSystem = MemoryFileSystem.test();
+    });
+
+    tearDown(() {
+      // Ensure these don't get re-used between tests
+      stdio = null;
+      fileSystem = null;
+      processManager = null;
+      platform = null;
+    });
+
+    CommandRunner<void> createRunner({
+      List<FakeCommand> commands,
+      String operatingSystem,
+    }) {
+      operatingSystem ??= const LocalPlatform().operatingSystem;
+      final String pathSeparator = operatingSystem == 'windows' ? r'\' : '/';
+
+      processManager = FakeProcessManager.list(commands ?? <FakeCommand>[]);
+      platform = FakePlatform(
+        environment: <String, String>{'HOME': '/path/to/user/home'},
+        pathSeparator: pathSeparator,
+      );
+      final Checkouts checkouts = Checkouts(
+        fileSystem: fileSystem,
+        parentDirectory: fileSystem.directory(checkoutsParentDirectory),
+        platform: platform,
+        processManager: processManager,
+        stdio: stdio,
+      );
+      final CleanCommand command = CleanCommand(
+        checkouts: checkouts,
+      );
+      return CommandRunner<void>('clean-test', '')..addCommand(command);
+    }
+
+    test('throws if no state file found', () async {
+      final CommandRunner<void> runner = createRunner();
+      const String stateFile = '/state-file.json';
+
+      await expectLater(
+        () async => runner.run(<String>[
+          'clean',
+          '--$kStateOption',
+          stateFile,
+          '--$kYesFlag',
+        ]),
+        throwsExceptionWith(
+          'No persistent state file found at $stateFile',
+        ),
+      );
+    });
+
+    test('deletes state file', () async {
+      final CommandRunner<void> runner = createRunner();
+      final File stateFile = fileSystem.file('/state-file.json');
+      stateFile.writeAsStringSync('{}');
+
+      await runner.run(<String>[
+        'clean',
+        '--$kStateOption',
+        stateFile.path,
+        '--$kYesFlag',
+      ]);
+
+      expect(stateFile.existsSync(), false);
+    });
+  }, onPlatform: <String, dynamic>{
+    'windows': const Skip('Flutter Conductor only supported on macos/linux'),
+  });
+}

dev/tools/test/codesign_integration_test.dart

@@ -21,11 +21,14 @@ void main() {
       () async {
     const Platform platform = LocalPlatform();
     const FileSystem fileSystem = LocalFileSystem();
+    final Directory tempDir = fileSystem.systemTempDirectory.createTempSync(
+      'conductor_integration_test',
+    );
     const ProcessManager processManager = LocalProcessManager();
     final TestStdio stdio = TestStdio(verbose: true);
     final Checkouts checkouts = Checkouts(
       fileSystem: fileSystem,
-      parentDirectory: localFlutterRoot.parent,
+      parentDirectory: tempDir,
       platform: platform,
       processManager: processManager,
       stdio: stdio,

dev/tools/test/codesign_test.dart

@@ -109,6 +109,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           'file://$flutterRoot/',
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -194,6 +196,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           'file://$flutterRoot/',
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -279,6 +283,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           'file://$flutterRoot/',
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -336,6 +342,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           'file://$flutterRoot/',
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',

dev/tools/test/common.dart

@@ -35,7 +35,7 @@ Matcher throwsExceptionWith(String messageSubString) {
   );
 }
 
-class TestStdio implements Stdio {
+class TestStdio extends Stdio {
   TestStdio({
     this.verbose = false,
     List<String> stdin,
@@ -43,36 +43,15 @@ class TestStdio implements Stdio {
     _stdin = stdin ?? <String>[];
   }
 
-  final StringBuffer _error = StringBuffer();
-  String get error => _error.toString();
+  String get error => logs.where((String log) => log.startsWith(r'[error] ')).join('\n');
+
+  String get stdout => logs.where((String log) {
+    return log.startsWith(r'[status] ') || log.startsWith(r'[trace] ');
+  }).join('\n');
 
-  final StringBuffer _stdout = StringBuffer();
-  String get stdout => _stdout.toString();
   final bool verbose;
   List<String> _stdin;
 
-  @override
-  void printError(String message) {
-    _error.writeln(message);
-  }
-
-  @override
-  void printStatus(String message) {
-    _stdout.writeln(message);
-  }
-
-  @override
-  void printTrace(String message) {
-    if (verbose) {
-      _stdout.writeln(message);
-    }
-  }
-
-  @override
-  void write(String message) {
-    _stdout.write(message);
-  }
-
   @override
   String readLineSync() {
     if (_stdin.isEmpty) {

dev/tools/test/roll_dev_integration_test.dart

@@ -7,7 +7,6 @@ import 'package:file/local.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import 'package:dev_tools/globals.dart';
 import 'package:dev_tools/roll_dev.dart' show rollDev;
 import 'package:dev_tools/repository.dart';
 import 'package:dev_tools/version.dart';
@@ -25,15 +24,17 @@ void main() {
     Checkouts checkouts;
     FrameworkRepository frameworkUpstream;
     FrameworkRepository framework;
+    Directory tempDir;
 
     setUp(() {
       platform = const LocalPlatform();
       fileSystem = const LocalFileSystem();
       processManager = const LocalProcessManager();
       stdio = TestStdio(verbose: true);
+      tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_conductor_checkouts');
       checkouts = Checkouts(
         fileSystem: fileSystem,
-        parentDirectory: localFlutterRoot.parent,
+        parentDirectory: tempDir,
         platform: platform,
         processManager: processManager,
         stdio: stdio,
@@ -45,7 +46,7 @@ void main() {
       framework = FrameworkRepository(
         checkouts,
         name: 'test-framework',
-        upstream: 'file://${frameworkUpstream.checkoutDirectory.path}/',
+        fetchRemote: Remote(name: RemoteName.upstream, url: 'file://${frameworkUpstream.checkoutDirectory.path}/'),
       );
     });
 
@@ -59,7 +60,7 @@ void main() {
         commit: latestCommit,
         // Ensure this test passes after a dev release with hotfixes
         force: true,
-        remote: 'origin',
+        remote: 'upstream',
       );
 
       expect(
@@ -96,7 +97,7 @@ void main() {
         commit: latestCommit,
         // Ensure this test passes after a dev release with hotfixes
         force: true,
-        remote: 'origin',
+        remote: 'upstream',
       );
 
       expect(
@@ -124,7 +125,7 @@ void main() {
       expect(finalVersion.m, 0);
       expect(finalVersion.n, 0);
       expect(finalVersion.commits, null);
-    }, skip: 'TODO(fujino): https://github.com/flutter/flutter/issues/80463');
+    });
   }, onPlatform: <String, dynamic>{
     'windows': const Skip('Flutter Conductor only supported on macos/linux'),
   });

dev/tools/test/roll_dev_test.dart

@@ -83,6 +83,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -131,6 +133,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -193,16 +197,16 @@ void main() {
         ),
         false,
       );
-      expect(stdio.stdout.contains(nextVersion), true);
+      expect(stdio.logs.join('').contains(nextVersion), true);
     });
 
-    test(
-        'exits with exception if --skip-tagging is provided but commit isn\'t '
-        'already tagged', () {
+    test("exits with exception if --skip-tagging is provided but commit isn't already tagged", () {
       processManager.addCommands(<FakeCommand>[
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -283,6 +287,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -356,6 +362,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -433,6 +441,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -526,6 +536,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
@@ -623,6 +635,8 @@ void main() {
         const FakeCommand(command: <String>[
           'git',
           'clone',
+          '--origin',
+          'upstream',
           '--',
           kUpstreamRemote,
           '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',

dev/tools/test/start_test.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' show jsonDecode;
+
+import 'package:args/command_runner.dart';
+import 'package:dev_tools/proto/conductor_state.pb.dart' as pb;
+import 'package:dev_tools/proto/conductor_state.pbenum.dart' show ReleasePhase;
+import 'package:dev_tools/start.dart';
+import 'package:dev_tools/state.dart';
+import 'package:dev_tools/repository.dart';
+import 'package:file/file.dart';
+import 'package:file/memory.dart';
+import 'package:platform/platform.dart';
+
+import '../../../packages/flutter_tools/test/src/fake_process_manager.dart';
+import './common.dart';
+
+void main() {
+  group('start command', () {
+    const String flutterRoot = '/flutter';
+    const String checkoutsParentDirectory = '$flutterRoot/dev/tools/';
+    const String frameworkMirror = 'https://github.com/user/flutter.git';
+    const String engineMirror = 'https://github.com/user/engine.git';
+    const String candidateBranch = 'flutter-1.2-candidate.3';
+    const String releaseChannel = 'stable';
+    const String revision = 'abcd1234';
+    Checkouts checkouts;
+    MemoryFileSystem fileSystem;
+    FakePlatform platform;
+    TestStdio stdio;
+    FakeProcessManager processManager;
+
+    setUp(() {
+      stdio = TestStdio();
+      fileSystem = MemoryFileSystem.test();
+    });
+
+    CommandRunner<void> createRunner({
+      Map<String, String> environment,
+      String operatingSystem,
+      List<FakeCommand> commands,
+    }) {
+      operatingSystem ??= const LocalPlatform().operatingSystem;
+      final String pathSeparator = operatingSystem == 'windows' ? r'\' : '/';
+      environment ??= <String, String>{
+        'HOME': '/path/to/user/home',
+      };
+      final Directory homeDir = fileSystem.directory(
+        environment['HOME'],
+      );
+      // Tool assumes this exists
+      homeDir.createSync(recursive: true);
+      platform = FakePlatform(
+        environment: environment,
+        operatingSystem: operatingSystem,
+        pathSeparator: pathSeparator,
+      );
+      processManager = FakeProcessManager.list(commands ?? <FakeCommand>[]);
+      checkouts = Checkouts(
+        fileSystem: fileSystem,
+        parentDirectory: fileSystem.directory(checkoutsParentDirectory),
+        platform: platform,
+        processManager: processManager,
+        stdio: stdio,
+      );
+      final StartCommand command = StartCommand(
+        checkouts: checkouts,
+        flutterRoot: fileSystem.directory(flutterRoot),
+      );
+      return CommandRunner<void>('codesign-test', '')..addCommand(command);
+    }
+
+    tearDown(() {
+      // Ensure we don't re-use these between tests.
+      processManager = null;
+      checkouts = null;
+      platform = null;
+    });
+
+    test('throws exception if run from Windows', () async {
+      final CommandRunner<void> runner = createRunner(
+        commands: <FakeCommand>[
+          const FakeCommand(
+            command: <String>['git', 'rev-parse', 'HEAD'],
+            stdout: revision,
+          ),
+        ],
+        operatingSystem: 'windows',
+      );
+      await expectLater(
+        () async => runner.run(<String>['start']),
+        throwsExceptionWith(
+          'Error! This tool is only supported on macOS and Linux',
+        ),
+      );
+    });
+
+    test('throws if --$kFrameworkMirrorOption not provided', () async {
+      final CommandRunner<void> runner = createRunner(
+        commands: <FakeCommand>[
+          const FakeCommand(
+            command: <String>['git', 'rev-parse', 'HEAD'],
+            stdout: revision,
+          ),
+        ],
+      );
+
+      await expectLater(
+        () async => runner.run(<String>['start']),
+        throwsExceptionWith(
+          'Expected either the CLI arg --$kFrameworkMirrorOption or the environment variable FRAMEWORK_MIRROR to be provided',
+        ),
+      );
+    });
+
+    test('creates state file if provided correct inputs', () async {
+      const String revision2 = 'def789';
+      const String revision3 = '123abc';
+
+      final List<FakeCommand> engineCommands = <FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            'git',
+            'clone',
+            '--origin',
+            'upstream',
+            '--',
+            EngineRepository.defaultUpstream,
+            fileSystem.path.join(
+              checkoutsParentDirectory,
+              'flutter_conductor_checkouts',
+              'engine',
+            ),
+          ],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'remote', 'add', 'mirror', engineMirror],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'fetch', 'mirror'],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'checkout', 'upstream/$candidateBranch'],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'rev-parse', 'HEAD'],
+          stdout: revision2,
+        ),
+        const FakeCommand(
+          command: <String>[
+            'git',
+            'checkout',
+            '-b',
+            'cherrypicks-$candidateBranch',
+          ],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'rev-parse', 'HEAD'],
+          stdout: revision2,
+        ),
+      ];
+      final List<FakeCommand> frameworkCommands = <FakeCommand>[
+        FakeCommand(
+          command: <String>[
+            'git',
+            'clone',
+            '--origin',
+            'upstream',
+            '--',
+            FrameworkRepository.defaultUpstream,
+            fileSystem.path.join(
+              checkoutsParentDirectory,
+              'flutter_conductor_checkouts',
+              'framework',
+            ),
+          ],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'remote', 'add', 'mirror', frameworkMirror],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'fetch', 'mirror'],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'checkout', 'upstream/$candidateBranch'],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'rev-parse', 'HEAD'],
+          stdout: revision3,
+        ),
+        const FakeCommand(
+          command: <String>[
+            'git',
+            'checkout',
+            '-b',
+            'cherrypicks-$candidateBranch',
+          ],
+        ),
+        const FakeCommand(
+          command: <String>['git', 'rev-parse', 'HEAD'],
+          stdout: revision3,
+        ),
+      ];
+      final CommandRunner<void> runner = createRunner(
+        commands: <FakeCommand>[
+          const FakeCommand(
+            command: <String>['git', 'rev-parse', 'HEAD'],
+            stdout: revision,
+          ),
+          ...engineCommands,
+          ...frameworkCommands,
+        ],
+      );
+
+      final String stateFilePath = fileSystem.path.join(
+        platform.environment['HOME'],
+        kStateFileName,
+      );
+
+      await runner.run(<String>[
+        'start',
+        '--$kFrameworkMirrorOption',
+        frameworkMirror,
+        '--$kEngineMirrorOption',
+        engineMirror,
+        '--$kCandidateOption',
+        candidateBranch,
+        '--$kReleaseOption',
+        releaseChannel,
+        '--$kStateOption',
+        stateFilePath,
+      ]);
+
+      final File stateFile = fileSystem.file(stateFilePath);
+
+      final pb.ConductorState state = pb.ConductorState();
+      state.mergeFromProto3Json(
+        jsonDecode(stateFile.readAsStringSync()),
+      );
+
+      expect(state.isInitialized(), true);
+      expect(state.releaseChannel, releaseChannel);
+      expect(state.engine.candidateBranch, candidateBranch);
+      expect(state.engine.startingGitHead, revision2);
+      expect(state.framework.candidateBranch, candidateBranch);
+      expect(state.framework.startingGitHead, revision3);
+      expect(state.lastPhase, ReleasePhase.INITIALIZE);
+      expect(state.conductorVersion, revision);
+    });
+  }, onPlatform: <String, dynamic>{
+    'windows': const Skip('Flutter Conductor only supported on macos/linux'),
+  });
+}