fix up merge compilation errors

and formatting differences

parser-typechecker/src/Unison/Codebase/IntegrityCheck.hs

@@ -23,6 +23,7 @@ import qualified Data.Text.Lazy as TL
 import qualified Data.Text.Lazy.IO as TL
 import Data.Void
 import Text.Pretty.Simple
+import U.Codebase.HashTags (BranchHash (..))
 import qualified U.Codebase.Sqlite.Branch.Full as DBBranch
 import qualified U.Codebase.Sqlite.DbId as DB
 import qualified U.Codebase.Sqlite.Operations as Ops
@@ -51,11 +52,11 @@ data IntegrityError
   | -- (causal hash, branch hash)
     DetectedCausalsWithoutCorrespondingBranchObjects (NESet (Hash, Hash))
   | DetectedCausalsWithCausalHashAsBranchHash (NESet Hash)
-  | DetectedBranchErrors Hash (NESet BranchError)
+  | DetectedBranchErrors BranchHash (NESet BranchError)
   deriving stock (Show, Eq, Ord)
 
 data BranchError
-  = IncorrectHashForBranch Hash Hash
+  = IncorrectHashForBranch BranchHash BranchHash
   | MismatchedObjectForChild Hash DB.BranchObjectId DB.BranchObjectId
   | MissingObjectForChildCausal Hash
   | MissingObject DB.BranchObjectId
@@ -151,7 +152,7 @@ integrityCheckAllBranches = do
     integrityCheckBranch objId = do
       dbBranch <- Ops.expectDbBranch objId
       expectedBranchHash <- Helpers.dbBranchHash dbBranch
-      actualBranchHash <- Q.expectPrimaryHashByObjectId (DB.unBranchObjectId objId)
+      actualBranchHash <- BranchHash <$> Q.expectPrimaryHashByObjectId (DB.unBranchObjectId objId)
       branchHashCheck <- assertExpectedBranchHash expectedBranchHash actualBranchHash
       branchChildChecks <- flip foldMapM (toListOf DBBranch.childrenHashes_ dbBranch) $ \(childObjId, childCausalHashId) -> do
         let checks =
@@ -164,7 +165,7 @@ integrityCheckAllBranches = do
         Nothing -> pure NoIntegrityErrors
         Just errs -> pure . IntegrityErrorDetected . NESet.singleton $ DetectedBranchErrors actualBranchHash errs
       where
-        assertExpectedBranchHash :: Hash -> Hash -> Sqlite.Transaction (Set BranchError)
+        assertExpectedBranchHash :: BranchHash -> BranchHash -> Sqlite.Transaction (Set BranchError)
         assertExpectedBranchHash expectedBranchHash actualBranchHash = do
           if (expectedBranchHash /= actualBranchHash)
             then do
@@ -201,9 +202,9 @@ integrityCheckAllBranches = do
               pure (Set.singleton $ MissingObjectForChildCausal ch)
             Just foundBranchId
               | foundBranchId /= branchObjId -> do
-                failure $ "Expected child branch object to match canonical object ID for causal hash's namespace: " <> pShow (causalHashId, foundBranchId, branchObjId)
-                ch <- Q.expectHash (DB.unCausalHashId causalHashId)
-                pure (Set.singleton $ MismatchedObjectForChild ch branchObjId foundBranchId)
+                  failure $ "Expected child branch object to match canonical object ID for causal hash's namespace: " <> pShow (causalHashId, foundBranchId, branchObjId)
+                  ch <- Q.expectHash (DB.unCausalHashId causalHashId)
+                  pure (Set.singleton $ MismatchedObjectForChild ch branchObjId foundBranchId)
               | otherwise -> pure mempty
 
 failure :: TL.Text -> Sqlite.Transaction ()
@@ -214,34 +215,34 @@ prettyPrintIntegrityErrors :: Foldable f => f IntegrityError -> P.Pretty P.Color
 prettyPrintIntegrityErrors xs
   | null xs = mempty
   | otherwise =
-    xs
-      & toList
-      & fmap
-        ( \case
-            DetectedObjectsWithoutCorrespondingHashObjects objs ->
-              P.hang
-                "Detected objects without any corresponding hash_object. Object IDs:"
-                (P.commas (prettyObjectId <$> NESet.toList objs))
-            DetectedCausalsWithoutCorrespondingBranchObjects hashes ->
-              P.hang
-                "Detected causals without a corresponding branch object:\n"
-                ( P.column2Header
-                    "Causal Hash"
-                    "Branch Hash"
-                    (toList hashes <&> bimap prettyHash prettyHash)
-                )
-            DetectedCausalsWithCausalHashAsBranchHash ns ->
-              P.hang
-                "Detected causals with the same causal hash as branch hash:"
-                (P.commas (prettyHash <$> toList ns))
-            DetectedBranchErrors bh errs ->
-              P.hang
-                ("Detected errors in branch: " <> prettyHash bh)
-                (P.lines . fmap (<> "\n") . fmap prettyBranchError . toList $ errs)
-        )
-      & fmap (<> "\n")
-      & P.lines
-      & P.warnCallout
+      xs
+        & toList
+        & fmap
+          ( \case
+              DetectedObjectsWithoutCorrespondingHashObjects objs ->
+                P.hang
+                  "Detected objects without any corresponding hash_object. Object IDs:"
+                  (P.commas (prettyObjectId <$> NESet.toList objs))
+              DetectedCausalsWithoutCorrespondingBranchObjects hashes ->
+                P.hang
+                  "Detected causals without a corresponding branch object:\n"
+                  ( P.column2Header
+                      "Causal Hash"
+                      "Branch Hash"
+                      (toList hashes <&> bimap prettyHash prettyHash)
+                  )
+              DetectedCausalsWithCausalHashAsBranchHash ns ->
+                P.hang
+                  "Detected causals with the same causal hash as branch hash:"
+                  (P.commas (prettyHash <$> toList ns))
+              DetectedBranchErrors bh errs ->
+                P.hang
+                  ("Detected errors in branch: " <> prettyHash (unBranchHash bh))
+                  (P.lines . fmap (<> "\n") . fmap prettyBranchError . toList $ errs)
+          )
+        & fmap (<> "\n")
+        & P.lines
+        & P.warnCallout
   where
     prettyHash :: Hash -> P.Pretty P.ColorText
     prettyHash h = P.blue . P.text $ ("#" <> Hash.toBase32HexText h)
@@ -252,7 +253,7 @@ prettyPrintIntegrityErrors xs
     prettyBranchError :: BranchError -> P.Pretty P.ColorText
     prettyBranchError =
       P.wrap . \case
-        IncorrectHashForBranch expected actual -> "The Branch hash for this branch is incorrect. Expected Hash: " <> prettyHash expected <> ", Actual Hash: " <> prettyHash actual
+        IncorrectHashForBranch expected actual -> "The Branch hash for this branch is incorrect. Expected Hash: " <> prettyHash (unBranchHash expected) <> ", Actual Hash: " <> prettyHash (unBranchHash actual)
         MismatchedObjectForChild ha obj1 obj2 ->
           "The child with causal hash: " <> prettyHash ha <> " is mapped to object ID " <> prettyBranchObjectId obj1 <> " but should map to " <> prettyBranchObjectId obj2 <> "."
         MissingObjectForChildCausal ha ->

parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations.hs

@@ -43,7 +43,7 @@ migrations getDeclType termBuffer declBuffer =
     [ (2, migrateSchema1To2 getDeclType termBuffer declBuffer),
       (3, migrateSchema2To3),
       (4, migrateSchema3To4),
-      (5, migrateSchema4To5),
+      (5, migrateSchema4To5)
     ]
 
 -- | Migrates a codebase up to the most recent version known to ucm.

parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema3To4.hs

@@ -12,7 +12,6 @@ import Data.Semigroup
 import qualified Data.Set as Set
 import Data.Set.Lens (setOf)
 import Data.String.Here.Uninterpolated (here)
-import qualified U.Codebase.HashTags as H
 import qualified U.Codebase.Sqlite.Branch.Format as S.BranchFormat
 import qualified U.Codebase.Sqlite.Branch.Full as DBBranch
 import qualified U.Codebase.Sqlite.DbId as DB
@@ -230,7 +229,7 @@ rehashAndCanonicalizeNamespace causalHashId possiblyIncorrectNamespaceHashId obj
     liftT $ replaceBranch objId remappedBranch
   correctNamespaceHash <- liftT $ Helpers.dbBranchHash remappedBranch
   liftT . debugLog $ "Correct namespace hash: " <> show correctNamespaceHash
-  correctNamespaceHashId <- liftT $ Q.saveBranchHash (H.BranchHash correctNamespaceHash)
+  correctNamespaceHashId <- liftT $ Q.saveBranchHash correctNamespaceHash
 
   when (correctNamespaceHashId == possiblyIncorrectNamespaceHashId) $ do
     -- If the existing hash for this namespace was already correct, we don't need to
@@ -251,17 +250,17 @@ rehashAndCanonicalizeNamespace causalHashId possiblyIncorrectNamespaceHashId obj
     -- that one.
     Just canonicalObjectId
       | canonicalObjectId /= objId -> do
-        -- Found an existing but different object with this hash, so the current object is a duplicate and
-        -- needs to be deleted.
-        liftT . debugLog $ "Mapping objID: " <> show objId <> " to canonical: " <> show canonicalObjectId
-        liftT . debugLog $ "Unilaterally deleting: " <> show objId
-        -- Remove possible foreign-key references before deleting the objects themselves
-        liftT $ Sqlite.execute deleteHashObjectsByObjectId (Sqlite.Only objId)
-        liftT $ Sqlite.execute deleteObjectById (Sqlite.Only objId)
-        pure canonicalObjectId
+          -- Found an existing but different object with this hash, so the current object is a duplicate and
+          -- needs to be deleted.
+          liftT . debugLog $ "Mapping objID: " <> show objId <> " to canonical: " <> show canonicalObjectId
+          liftT . debugLog $ "Unilaterally deleting: " <> show objId
+          -- Remove possible foreign-key references before deleting the objects themselves
+          liftT $ Sqlite.execute deleteHashObjectsByObjectId (Sqlite.Only objId)
+          liftT $ Sqlite.execute deleteObjectById (Sqlite.Only objId)
+          pure canonicalObjectId
       | otherwise -> do
-        -- This should be impossible.
-        error $ "We proved that the new hash is different from the existing one, but somehow found the same object for each hash. Please report this as a bug." <> show (objId, canonicalObjectId)
+          -- This should be impossible.
+          error $ "We proved that the new hash is different from the existing one, but somehow found the same object for each hash. Please report this as a bug." <> show (objId, canonicalObjectId)
     Nothing -> do
       -- There's no existing canonical object, this object BECOMES the canonical one by
       -- reassigning its primary hash.

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

@@ -2271,7 +2271,7 @@ importRemoteShareBranch ReadShareRemoteNamespace {server, repo, path} =
     liftIO (Share.pull authHTTPClient (shareRepoToBaseUrl server) connection shareFlavoredPath) >>= \case
       Left e -> pure (Left (Output.ShareErrorPull e))
       Right causalHash -> do
-        (eval . Eval) (Codebase.getBranchForHash codebase (Cv.branchHash2to1 causalHash)) >>= \case
+        (eval . Eval) (Codebase.getBranchForHash codebase (Cv.causalHash2to1 causalHash)) >>= \case
           Nothing -> error $ reportBug "E412939" "`pull` \"succeeded\", but I can't find the result in the codebase. (This is a bug.)"
           Just branch -> pure (Right branch)