Add experimental.commit.preview

Author: ChrisPenner

unison-cli/src/Unison/Codebase/Editor/HandleInput.hs

@@ -37,7 +37,6 @@ import Unison.Builtin qualified as Builtin
 import Unison.Builtin.Terms qualified as Builtin
 import Unison.Cli.Monad (Cli)
 import Unison.Cli.Monad qualified as Cli
-import Unison.Cli.MonadUtils (getCurrentBranch0)
 import Unison.Cli.MonadUtils qualified as Cli
 import Unison.Cli.NamesUtils qualified as Cli
 import Unison.Cli.PrettyPrintUtils qualified as Cli
@@ -737,23 +736,20 @@ loop loadMode e = do
               let sr = Slurp.slurpFile uf vars Slurp.AddOp currentNames
               previewResponse sourceName sr uf
             CommitI mayScratchFile -> do
-              uf <- handleLoad True LoadForCommit mayScratchFile
+              uf <- handleLoad False LoadForCommit mayScratchFile
               currentPath <- Cli.getCurrentPath
               libNames <-
                 Cli.getCurrentBranch0
                   <&> Branch.onlyLib
                   <&> Branch.toNames
               let sr = Slurp.slurpFile uf mempty Slurp.AddOp libNames
               let adds = SlurpResult.adds sr
-              beforeBranch0 <- Cli.getCurrentBranch0
               Cli.Env {codebase} <- ask
               Cli.runTransaction . Codebase.addDefsToCodebase codebase $ uf
               description <- inputDescription input
               Cli.stepAt description (Path.unabsolute currentPath, doSlurpAdds adds uf . Branch.onlyLib)
-              afterBranch0 <- getCurrentBranch0
-              (ppe, diff) <- diffHelper beforeBranch0 afterBranch0
-              currentPath <- Cli.getCurrentPath
-              Cli.respondNumbered $ ShowDiffNamespace (Right currentPath) (Right currentPath) ppe diff
+            CommitPreviewI mayScratchFile -> do
+              void $ handleLoad False LoadForCommit mayScratchFile
             UpdateI optionalPatch requestedNames -> handleUpdate input optionalPatch requestedNames
             Update2I -> handleUpdate2
             PreviewUpdateI requestedNames -> do
@@ -1073,7 +1069,8 @@ inputDescription input =
         DeleteTarget'ProjectBranch _ -> wat
         DeleteTarget'Project _ -> wat
     AddI _selection -> pure "add"
-    CommitI mayScratchFile -> pure ("commit" <> maybe "" Text.pack mayScratchFile)
+    CommitI mayScratchFile -> pure ("experimental.commit" <> maybe "" Text.pack mayScratchFile)
+    CommitPreviewI mayScratchFile -> pure ("experimental.commit.preview" <> maybe "" Text.pack mayScratchFile)
     UpdateI p0 _selection -> do
       p <-
         case p0 of

unison-cli/src/Unison/Codebase/Editor/Input.hs

@@ -148,6 +148,7 @@ data Input
   | AddI (Set Name)
   | PreviewAddI (Set Name)
   | CommitI (Maybe FilePath)
+  | CommitPreviewI (Maybe FilePath)
   | UpdateI OptionalPatch (Set Name)
   | Update2I
   | PreviewUpdateI (Set Name)

unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -19,6 +19,7 @@ module Unison.CommandLine.InputPatterns
     clear,
     clone,
     commit,
+    commitPreview,
     compileScheme,
     createAuthor,
     debugClearWatchCache,
@@ -191,8 +192,8 @@ import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)
 import Unison.NameSegment qualified as NameSegment
-import Unison.Prelude hiding (view)
 import Unison.Parser.Ann (Ann)
+import Unison.Prelude hiding (view)
 import Unison.Project
   ( ProjectAndBranch (..),
     ProjectAndBranchNames (..),
@@ -817,6 +818,20 @@ commit =
       [file] -> Input.LoadI . Just <$> unsupportedStructuredArgument "a file name" file
       _ -> Left (I.help load)
 
+commitPreview :: InputPattern
+commitPreview =
+  InputPattern
+    "experimental.commit.preview"
+    []
+    I.Visible
+    [("scratch file", Optional, filePathArg)]
+    ( "`experimental.commit.preview` shows the diff which would be applied if you were to run " <> patternName commit
+    )
+    \case
+      [] -> pure $ Input.CommitI Nothing
+      [file] -> Input.LoadI . Just <$> unsupportedStructuredArgument "a file name" file
+      _ -> Left (I.help load)
+
 update :: InputPattern
 update =
   InputPattern