Fix behaviour of branch command

unisonweb · Jul 2, 2024 · 6ae9f8b · 6ae9f8b
1 parent 5c675df
commit 6ae9f8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs b/codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs
@@ -3918,7 +3918,7 @@ setProjectBranchHead description projectId branchId causalHashId = do
         reason = description
       }
 
-expectProjectBranchHead :: ProjectId -> ProjectBranchId -> Transaction CausalHashId
+expectProjectBranchHead :: (HasCallStack) => ProjectId -> ProjectBranchId -> Transaction CausalHashId
 expectProjectBranchHead projectId branchId =
   queryOneCol
     [sql|

diff --git a/unison-cli/src/Unison/Codebase/Editor/HandleInput/Branch.hs b/unison-cli/src/Unison/Codebase/Editor/HandleInput/Branch.hs
@@ -105,17 +105,18 @@ createBranch description createFrom project getNewBranchName = do
   Cli.Env {codebase} <- ask
   (mayParentBranchId, newBranchCausalHashId) <- case createFrom of
     CreateFrom'ParentBranch parentBranch -> Cli.runTransaction do
-      Q.expectProjectBranchHead projectId (parentBranch ^. #branchId)
-      newBranchCausalHashId <- Q.expectProjectBranchHead projectId (parentBranch ^. #branchId)
-      pure (Just (parentBranch ^. #branchId), newBranchCausalHashId)
+      newBranchCausalHashId <- Q.expectProjectBranchHead parentBranch.projectId parentBranch.branchId
+      let parentBranchId = if parentBranch.projectId == projectId then Just parentBranch.branchId else Nothing
+      pure (parentBranchId, newBranchCausalHashId)
     CreateFrom'Nothingness -> Cli.runTransaction do
       (_, causalHashId) <- Codebase.emptyCausalHash
       pure (Nothing, causalHashId)
     CreateFrom'NamespaceWithParent parentBranch namespace -> do
       liftIO $ Codebase.putBranch codebase namespace
       Cli.runTransaction $ do
         newBranchCausalHashId <- Q.expectCausalHashIdByCausalHash (Branch.headHash namespace)
-        pure (Just (parentBranch ^. #branchId), newBranchCausalHashId)
+        let parentBranchId = if parentBranch.projectId == projectId then Just parentBranch.branchId else Nothing
+        pure (parentBranchId, newBranchCausalHashId)
     CreateFrom'Namespace branch -> do
       liftIO $ Codebase.putBranch codebase branch
       Cli.runTransaction $ do