Ensure we show messages on the final causal

Author: ChrisPenner

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

@@ -32,16 +32,22 @@ handleHistory resultsCap diffCap from = do
     doHistory :: Int -> Int -> Branch IO -> [(CausalHash, Maybe Text, Names.Diff)] -> Cli.Cli NumberedOutput
     doHistory schLength !n b acc =
       if maybe False (n >=) resultsCap
-        then pure (History diffCap schLength acc (PageEnd (Branch.headHash b) n))
+        then do
+          mayComment <- getComment $ Branch.headHash b
+          pure (History diffCap schLength acc (mayComment, PageEnd (Branch.headHash b) n))
         else case Branch._history b of
-          Causal.One {} -> pure (History diffCap schLength acc (EndOfLog $ Branch.headHash b))
-          Causal.Merge _ _ _ tails ->
-            pure (History diffCap schLength acc (MergeTail (Branch.headHash b) $ Map.keys tails))
+          Causal.One {} -> do
+            mayComment <- getComment $ Branch.headHash b
+            pure (History diffCap schLength acc (mayComment, EndOfLog $ Branch.headHash b))
+          Causal.Merge _ _ _ tails -> do
+            mayComment <- getComment $ Branch.headHash b
+            pure (History diffCap schLength acc (mayComment, MergeTail (Branch.headHash b) $ Map.keys tails))
           Causal.Cons _ _ _ tail -> do
             b' <- liftIO $ fmap Branch.Branch $ snd tail
             let causalHash = Branch.headHash b
-            mayComment <- Cli.runTransaction $ do
-              causalHashId <- Q.expectCausalHashIdByCausalHash causalHash
-              fmap snd <$> Q.getLatestCausalAnnotation causalHashId
+            mayComment <- getComment causalHash
             let elem = (causalHash, mayComment, Branch.namesDiff b' b)
             doHistory schLength (n + 1) b' (elem : acc)
+    getComment ch = Cli.runTransaction $ do
+      causalHashId <- Q.expectCausalHashIdByCausalHash ch
+      fmap snd <$> Q.getLatestCausalAnnotation causalHashId

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

@@ -134,7 +134,7 @@ data NumberedOutput
       (Maybe Int) -- Amount of history to print
       HashLength
       [(CausalHash, Maybe Text {- change comments -}, Names.Diff)]
-      HistoryTail -- 'origin point' of this view of history.
+      (Maybe Text, HistoryTail) -- 'origin point' of this view of history.
   | ListProjects [Sqlite.Project]
   | ListBranches ProjectName [(ProjectBranchName, [(URI, ProjectName, ProjectBranchName)])]
   | AmbiguousSwitch ProjectName (ProjectAndBranch ProjectName ProjectBranchName)

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

@@ -319,33 +319,40 @@ notifyNumbered = \case
       reversedHistory = reverse history
       showNum :: Int -> Pretty
       showNum n = P.shown n <> ". "
+      displayComment prefixSpacer mayComment = case mayComment of
+        Nothing -> []
+        Just comment ->
+          Monoid.whenM prefixSpacer [""] <> [P.indentN 2 (P.yellow $ P.text comment) <> P.newline]
       handleTail :: Int -> (Pretty, [CausalHash])
       handleTail n = case tail of
-        E.EndOfLog h ->
-          ( P.lines
+        (mayComment, E.EndOfLog h) ->
+          ( P.lines $
               [ "□ " <> showNum n <> prettySCH (toSCH h) <> " (start of history)"
-              ],
+              ]
+                <> displayComment True mayComment,
             [h]
           )
-        E.MergeTail h hs ->
-          ( P.lines
+        (mayComment, E.MergeTail h hs) ->
+          ( P.lines $
               [ P.wrap $ "This segment of history starts with a merge." <> ex,
                 "",
-                "⊙ " <> showNum n <> prettySCH (toSCH h),
-                "⑃",
-                P.lines (hs & imap \i h -> showNum (n + 1 + i) <> prettySCH (toSCH h))
-              ],
+                "⊙ " <> showNum n <> prettySCH (toSCH h)
+              ]
+                <> displayComment True mayComment
+                <> [ "⑃",
+                     P.lines (hs & imap \i h -> showNum (n + 1 + i) <> prettySCH (toSCH h))
+                   ],
             h : hs
           )
-        E.PageEnd h _n ->
-          ( P.lines
+        (mayComment, E.PageEnd h _n) ->
+          ( P.lines $
               [ P.wrap $ "There's more history before the versions shown here." <> ex,
                 "",
                 dots,
                 "",
-                "⊙ " <> showNum n <> prettySCH (toSCH h),
-                ""
-              ],
+                "⊙ " <> showNum n <> prettySCH (toSCH h)
+              ]
+                <> displayComment True mayComment,
             [h]
           )
       dots = "⠇"
@@ -354,12 +361,7 @@ notifyNumbered = \case
           [ "⊙ " <> showNum i <> prettySCH sch,
             ""
           ]
-            <> case mayComment of
-              Nothing -> []
-              Just comment ->
-                [ P.indentN 2 (P.yellow $ P.text comment),
-                  ""
-                ]
+            <> displayComment False mayComment
             <> [ P.indentN 2 $ prettyDiff diff
                ]
       ex =