Implement config.get

Author: ChrisPenner

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

@@ -50,7 +50,7 @@ import Unison.Codebase.Editor.HandleInput.BranchRename (handleBranchRename)
 import Unison.Codebase.Editor.HandleInput.BranchSquash (handleBranchSquash)
 import Unison.Codebase.Editor.HandleInput.Branches (handleBranches)
 import Unison.Codebase.Editor.HandleInput.Cancel (handleCancel)
-import Unison.Codebase.Editor.HandleInput.ConfigSet (handleConfigSet)
+import Unison.Codebase.Editor.HandleInput.Config (handleConfigGet, handleConfigSet)
 import Unison.Codebase.Editor.HandleInput.DebugDefinition qualified as DebugDefinition
 import Unison.Codebase.Editor.HandleInput.DebugFoldRanges qualified as DebugFoldRanges
 import Unison.Codebase.Editor.HandleInput.DebugSynhashTerm (handleDebugSynhashTerm)
@@ -719,6 +719,7 @@ loop e = do
         BranchRenameI name -> handleBranchRename name
         BranchesI name -> handleBranches name
         CloneI remoteNames localNames -> handleClone remoteNames localNames
+        ConfigGetI key -> handleConfigGet key
         ConfigSetI key value -> handleConfigSet key value
         BranchSquashI branchToSquash destBranch -> handleBranchSquash branchToSquash destBranch
         ReleaseDraftI semver -> handleReleaseDraft semver
@@ -802,6 +803,7 @@ inputDescription input =
     ClearI {} -> wat
     CloneI {} -> wat
     ConfigSetI {} -> wat
+    ConfigGetI {} -> wat
     CreateMessage {} -> wat
     DebugClearWatchI {} -> wat
     DebugDoctorI {} -> wat

unison-cli/src/Unison/Codebase/Editor/HandleInput/ConfigSet.hs renamed to unison-cli/src/Unison/Codebase/Editor/HandleInput/Config.hs

@@ -1,11 +1,17 @@
-module Unison.Codebase.Editor.HandleInput.ConfigSet (handleConfigSet) where
+module Unison.Codebase.Editor.HandleInput.Config (handleConfigSet, handleConfigGet) where
 
 import U.Codebase.Config (ConfigKey)
 import U.Codebase.Sqlite.Queries qualified as Q
 import Unison.Cli.Monad (Cli)
 import Unison.Cli.Monad qualified as Cli
+import Unison.Codebase.Editor.Output (Output (..))
 import Unison.Prelude
 
 handleConfigSet :: ConfigKey -> Text -> Cli ()
 handleConfigSet key value = do
   Cli.runTransaction $ Q.setConfigValue key value
+
+handleConfigGet :: ConfigKey -> Cli ()
+handleConfigGet key = do
+  mayValue <- Cli.runTransaction $ Q.getConfigValue key
+  Cli.respond $ ConfigValueGet key mayValue

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

@@ -249,6 +249,7 @@ data Input
   | BranchSquashI (ProjectAndBranch (Maybe ProjectName) ProjectBranchName) (ProjectAndBranch (Maybe ProjectName) ProjectBranchName)
   | CancelI
   | ConfigSetI ConfigKey Text
+  | ConfigGetI ConfigKey
   deriving (Eq, Show)
 
 -- | The source of a `branch` command: what to make the new branch from.

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

@@ -27,6 +27,7 @@ import Servant.Client qualified as Servant (ClientError)
 import System.Console.Haskeline qualified as Completion
 import System.Exit (ExitCode)
 import U.Codebase.Branch.Diff (NameChanges)
+import U.Codebase.Config (ConfigKey)
 import U.Codebase.HashTags (CausalHash)
 import U.Codebase.Sqlite.HistoryComment (HistoryComment)
 import U.Codebase.Sqlite.Project qualified as Sqlite
@@ -458,6 +459,7 @@ data Output
   | CommentedSuccessfully
   | CommentAborted
   | AuthorNameRequired
+  | ConfigValueGet ConfigKey (Maybe Text)
 
 data MoreEntriesThanShown = MoreEntriesThanShown | AllEntriesShown
   deriving (Eq, Show)
@@ -703,6 +705,7 @@ isFailure o = case o of
   CommentedSuccessfully {} -> False
   CommentAborted {} -> True
   AuthorNameRequired {} -> True
+  ConfigValueGet {} -> False
 
 isNumberedFailure :: NumberedOutput -> Bool
 isNumberedFailure = \case

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

@@ -16,6 +16,7 @@ module Unison.CommandLine.InputPatterns
     clear,
     clone,
     configSet,
+    configGet,
     createAuthor,
     debugClearWatchCache,
     debugDoctor,
@@ -2478,6 +2479,33 @@ configSet =
         args -> wrongArgsLength "exactly two arguments" args
     }
 
+configGet :: InputPattern
+configGet =
+  InputPattern
+    { patternName = "config.get",
+      aliases = [],
+      visibility = I.Visible,
+      params = Parameters [("key", configKeyArg), ("value", noCompletionsArg)] $ Optional [] Nothing,
+      help =
+        P.lines
+          [ P.wrap $
+              "Gets the value of the provided configuration key. E.g.",
+            "",
+            (makeExample configGet [P.text $ Config.keyToText Config.AuthorNameKey]),
+            "",
+            P.hang
+              "Configuration options include:"
+              (P.wrap . P.text $ Text.intercalate ", " $ Config.allKeysText)
+          ],
+      parse = \case
+        [key] -> do
+          key' <- unsupportedStructuredArgument configSet "a config key" key
+          case Config.keyFromText (Text.pack key') of
+            Nothing -> Left . P.text $ "I don't recognize that config key. Available keys are: " <> Text.intercalate ", " Config.allKeysText
+            Just pkey -> Right $ Input.ConfigGetI pkey
+        args -> wrongArgsLength "exactly one argument" args
+    }
+
 edit :: InputPattern
 edit =
   InputPattern
@@ -3658,6 +3686,7 @@ validInputs =
       cd,
       clear,
       clone,
+      configGet,
       configSet,
       createAuthor,
       debugAliasTermForce,

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

@@ -164,6 +164,7 @@ import Unison.Var (Var)
 import Unison.Var qualified as Var
 import Unison.WatchKind qualified as WK
 import Witch (unsafeFrom)
+import qualified U.Codebase.Config as Config
 
 reportBugURL :: Pretty
 reportBugURL = "https://github.com/unisonweb/unison/issues/new"
@@ -2372,6 +2373,16 @@ notifyUser dir issueFn = \case
           [ "You can do so with: ",
             IP.makeExampleNoBackticks IP.configSet ["author.name", "<your name>"]
           ]
+  ConfigValueGet key value ->
+    case value of
+      Nothing -> pure $
+        P.wrap $
+          P.text (Config.keyToText key)
+            <> " is unset"
+      Just value ->
+        pure $ P.wrap $
+          P.text (Config.keyToText key)
+            <> " = " <> P.text value
   where
     iveCreatedATemporaryBranch scratchFile =
       P.wrap $

unison-cli/unison-cli.cabal

@@ -53,7 +53,7 @@ library
       Unison.Codebase.Editor.HandleInput.BranchRename
       Unison.Codebase.Editor.HandleInput.BranchSquash
       Unison.Codebase.Editor.HandleInput.Cancel
-      Unison.Codebase.Editor.HandleInput.ConfigSet
+      Unison.Codebase.Editor.HandleInput.Config
       Unison.Codebase.Editor.HandleInput.DebugDefinition
       Unison.Codebase.Editor.HandleInput.DebugFoldRanges
       Unison.Codebase.Editor.HandleInput.DebugSynhashTerm

unison-src/transcripts-using-base/serial-test-05.output.md

@@ -21,7 +21,7 @@ mkTestCase = do
 
   + f          : (Nat, Nat, Nat) -> Nat
   + g          : Map Nat ((Nat, Nat, Nat) ->{g} Nat) ->{g} Text
-  + m          : Map Nat ((Nat, Nat, Nat) ->{g} Nat)
+  + m          : Map Nat ((Nat, Nat, Nat) ->{g1, g} Nat)
   + mkTestCase : '{IO, Exception} ()
 
   Run `update` to apply these changes to your codebase.

unison-src/transcripts/idempotent/help.md

@@ -19,11 +19,6 @@
   alias.type
   `alias.type Foo Bar` introduces `Bar` with the same definition as `Foo`.
 
-  annotate
-  `annotate`        Annotates the head of the current branch.
-  `annotate /main`  Annotates the current head of the `main`
-                    branch.
-
   api
   `api` provides details about the API.
 
@@ -99,11 +94,18 @@
                        Said execution will have the effect of
                        running `!main`.
 
+  config.get
+  Gets the value of the provided configuration key. E.g.
+
+  `config.get author.name`
+
+  Configuration options include: author.name
+
   config.set
   The `config.set` command sets the configuration key to the
   provided value. E.g.
 
-  `config.set author.name Author Name`
+  `config.set author.name "Author Name"`
 
   Configuration options include: author.name
 
@@ -510,6 +512,12 @@
                                 namespace with the given hash.
                                 The full hash must be provided.
 
+  history.comment (or comment, comment.history)
+  `history.comment`        Creates a comment after the head of
+                           the current branch.
+  `history.comment /main`  Creates a comment after the head of
+                           the `main` branch.
+
   io.test (or test.io)
   `io.test mytest`  Runs `!mytest`, where `mytest` is a delayed
                     test that can use the `IO` and `Exception`