From 68129e67821fa892d2344c4708292519056e00eb Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 5 Oct 2017 09:14:01 +0100 Subject: [PATCH] Dedup DefaultCommands and allBasicCommands The command component's BasicCommands.allBasicCommands is a subset of main component's BuiltinCommands.DefaultCommands, so I deduplicated. --- main/src/main/scala/sbt/Main.scala | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 47a67a0fd..248d0fc6f 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -161,9 +161,6 @@ object BuiltinCommands { def DefaultCommands: Seq[Command] = Seq( - ignore, - help, - completionsCommand, about, tasks, settingsCommand, @@ -171,9 +168,6 @@ object BuiltinCommands { templateCommand, projects, project, - reboot, - read, - history, set, sessionCommand, inspect, @@ -184,36 +178,21 @@ object BuiltinCommands { PluginCross.pluginCross, PluginCross.pluginSwitch, Cross.crossRestoreSession, - setOnFailure, - clearOnFailure, - stashOnFailure, - popOnFailure, setLogLevel, plugin, plugins, writeSbtVersion, notifyUsersAboutShell, - ifLast, - multi, shell, - oldshell, startServer, - BasicCommands.client, - continuous, eval, - alias, - append, last, lastGrep, export, boot, - nop, - call, - exit, - early, initialize, act - ) ++ compatCommands + ) ++ allBasicCommands def DefaultBootCommands: Seq[String] = WriteSbtVersion :: LoadProject :: NotifyUsersAboutShell :: s"$IfLast $Shell" :: Nil