Add pull.v2 command

Author: ChrisPenner

Diff for: unison-cli/package.yaml

@@ -20,6 +20,7 @@ library:
     - condition: "!os(windows)"
       dependencies: unix
   dependencies:
+    - attoparsec
     - Diff
     - IntervalMap
     - ListLike

Diff for: unison-cli/src/Unison/Cli/DownloadUtils.hs

@@ -19,6 +19,7 @@ import Unison.Cli.Monad (Cli)
 import Unison.Cli.Monad qualified as Cli
 import Unison.Cli.Share.Projects qualified as Share
 import Unison.Codebase.Editor.HandleInput.AuthLogin (ensureAuthenticatedWithCodeserver)
+import Unison.Codebase.Editor.Input (SyncVersion (..))
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Codebase.Editor.RemoteRepo (ReadShareLooseCode, shareUserHandleToText)
 import Unison.Codebase.Editor.RemoteRepo qualified as RemoteRepo
@@ -36,8 +37,6 @@ import Unison.Sync.Common qualified as Sync.Common
 import Unison.Sync.Types qualified as Share
 import Unison.SyncV2.Types qualified as SyncV2
 
-data SyncVersion = SyncV1 | SyncV2
-
 -- | Download a project/branch from Share.
 downloadProjectBranchFromShare ::
   (HasCallStack) =>

Diff for: unison-cli/src/Unison/Codebase/Editor/HandleInput.hs

@@ -687,7 +687,7 @@ loop e = do
               _ <- Cli.updateAtM description pp \destb ->
                 liftIO (Branch.merge'' (Codebase.lca codebase) Branch.RegularMerge srcb destb)
               Cli.respond Success
-            PullI sourceTarget pullMode -> handlePull sourceTarget pullMode
+            PullI syncVersion sourceTarget pullMode -> handlePull syncVersion sourceTarget pullMode
             PushRemoteBranchI pushRemoteBranchInput -> handlePushRemoteBranch pushRemoteBranchInput
             SyncToFileI syncFileDest projectBranchName -> SyncV2.handleSyncToFile syncFileDest projectBranchName
             SyncFromFileI syncFileSrc projectBranchName -> do

Diff for: unison-cli/src/Unison/Codebase/Editor/HandleInput/Pull.hs

@@ -46,8 +46,8 @@ import Unison.Prelude
 import Unison.Project (ProjectAndBranch (..), ProjectBranchNameOrLatestRelease (..), ProjectName)
 import Witch (unsafeFrom)
 
-handlePull :: PullSourceTarget -> PullMode -> Cli ()
-handlePull unresolvedSourceAndTarget pullMode = do
+handlePull :: SyncVersion -> PullSourceTarget -> PullMode -> Cli ()
+handlePull syncVersion unresolvedSourceAndTarget pullMode = do
   let includeSquashed = case pullMode of
         Input.PullWithHistory -> Share.NoSquashedHead
         Input.PullWithoutHistory -> Share.IncludeSquashedHead
@@ -59,7 +59,7 @@ handlePull unresolvedSourceAndTarget pullMode = do
       ReadShare'LooseCode repo -> downloadLooseCodeFromShare repo & onLeftM (Cli.returnEarly . Output.ShareError)
       ReadShare'ProjectBranch remoteBranch ->
         downloadProjectBranchFromShare
-          SyncV1
+          syncVersion
           ( case pullMode of
               Input.PullWithHistory -> Share.NoSquashedHead
               Input.PullWithoutHistory -> Share.IncludeSquashedHead

Diff for: unison-cli/src/Unison/Codebase/Editor/HandleInput/SyncV2.hs

@@ -8,11 +8,14 @@ where
 
 import Control.Lens
 import Control.Monad.Reader (MonadReader (..))
+import U.Codebase.HashTags (CausalHash)
 import U.Codebase.Sqlite.Queries qualified as Q
+import Unison.Cli.DownloadUtils (SyncVersion (..), downloadProjectBranchFromShare)
 import Unison.Cli.Monad (Cli)
 import Unison.Cli.Monad qualified as Cli
 import Unison.Cli.MonadUtils qualified as Cli
 import Unison.Cli.ProjectUtils qualified as Project
+import Unison.Cli.Share.Projects qualified as Projects
 import Unison.Codebase (CodebasePath)
 import Unison.Codebase qualified as Codebase
 import Unison.Codebase.Editor.Output qualified as Output
@@ -22,7 +25,6 @@ import Unison.Prelude
 import Unison.Project (ProjectAndBranch (..), ProjectBranchName, ProjectName)
 import Unison.Share.SyncV2 qualified as SyncV2
 import Unison.SyncV2.Types (BranchRef)
-import Unison.Cli.DownloadUtils (SyncVersion, downloadProjectBranchFromShare)
 
 handleSyncToFile :: FilePath -> ProjectAndBranch (Maybe ProjectName) (Maybe ProjectBranchName) -> Cli ()
 handleSyncToFile destSyncFile branchToSync = do
@@ -72,30 +74,5 @@ handleSyncFromCodebase description srcCodebasePath srcBranch destBranch = do
     Right (Right (Left syncErr)) -> do
       Cli.respond (Output.SyncPullError syncErr)
 
-handleSyncFromCodebase :: Text -> CodebasePath -> ProjectAndBranch ProjectName ProjectBranchName -> ProjectAndBranch (Maybe ProjectName) ProjectBranchName -> Cli ()
-handleSyncFromCodebase description srcCodebasePath srcBranch destBranch = do
-  Cli.Env {codebase} <- ask
-  pp <- Cli.getCurrentProjectPath
-  projectBranch <- Project.resolveProjectBranchInProject (pp ^. #project) (over #branch Just destBranch)
-  r <- liftIO $ Init.withOpenCodebase SqliteCodebase.init "sync-src" srcCodebasePath Init.DontLock (Init.MigrateAfterPrompt Init.Backup Init.Vacuum) \srcCodebase -> do
-    Codebase.withConnection srcCodebase \srcConn -> do
-      maySrcCausalHash <- Codebase.runTransaction srcCodebase $ do
-        let ProjectAndBranch srcProjName srcBranchName = srcBranch
-        runMaybeT do
-          project <- MaybeT (Q.loadProjectByName srcProjName)
-          branch <- MaybeT (Q.loadProjectBranchByName (project ^. #projectId) srcBranchName)
-          lift $ Project.getProjectBranchCausalHash branch
-      case maySrcCausalHash of
-        Nothing -> pure $ Left (error "Todo proper error")
-        Just srcCausalHash -> do
-          let shouldValidate = True
-          fmap (const srcCausalHash) <$> liftIO (SyncV2.syncFromCodebase shouldValidate srcConn codebase srcCausalHash)
-
-  case r of
-    Left _err -> pure $ error "Todo proper error"
-    Right (Left syncErr) -> Cli.respond (Output.SyncPullError syncErr)
-    Right (Right causalHash) -> do
-      Cli.setProjectBranchRootToCausalHash (projectBranch ^. #branch) description causalHash
-
-handleSyncFromCodeserver :: SyncVersion -> Projects.IncludeSquashedHead -> Projects.RemoteProjectBranch -> Cli (Either Output.ShareError CausalHash)
-handleSyncFromCodeserver = downloadProjectBranchFromShare
+handleSyncFromCodeserver :: Projects.IncludeSquashedHead -> Projects.RemoteProjectBranch -> Cli (Either Output.ShareError CausalHash)
+handleSyncFromCodeserver = downloadProjectBranchFromShare SyncV2

Diff for: unison-cli/src/Unison/Codebase/Editor/Input.hs

@@ -27,6 +27,7 @@ module Unison.Codebase.Editor.Input
     IsGlobal,
     DeleteOutput (..),
     DeleteTarget (..),
+    SyncVersion (..),
   )
 where
 
@@ -55,6 +56,9 @@ data Event
   = UnisonFileChanged SourceName Source
   deriving stock (Show)
 
+data SyncVersion = SyncV1 | SyncV2
+  deriving (Eq, Show)
+
 type Source = Text -- "id x = x\nconst a b = a"
 
 type SourceName = Text -- "foo.u" or "buffer 7"
@@ -124,7 +128,7 @@ data Input
     MergeLocalBranchI BranchRelativePath (Maybe BranchRelativePath) Branch.MergeMode
   | PreviewMergeLocalBranchI BranchRelativePath (Maybe BranchRelativePath)
   | DiffNamespaceI BranchId2 BranchId2 -- old new
-  | PullI !PullSourceTarget !PullMode
+  | PullI !SyncVersion !PullSourceTarget !PullMode
   | PushRemoteBranchI PushRemoteBranchInput
   | SyncToFileI FilePath (ProjectAndBranch (Maybe ProjectName) (Maybe ProjectBranchName))
   | SyncFromFileI FilePath UnresolvedProjectBranch

Diff for: unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -92,6 +92,7 @@ module Unison.CommandLine.InputPatterns
     projectSwitch,
     projectsInputPattern,
     pull,
+    pullV2,
     pullWithoutHistory,
     push,
     pushCreate,
@@ -1783,7 +1784,11 @@ reset =
 
 pull :: InputPattern
 pull =
-  pullImpl "pull" [] Input.PullWithHistory ""
+  pullImpl "pull" [] Input.PullWithHistory "" Input.SyncV1
+
+pullV2 :: InputPattern
+pullV2 =
+  pullImpl "pull.v2" [] Input.PullWithHistory "" Input.SyncV2
 
 pullWithoutHistory :: InputPattern
 pullWithoutHistory =
@@ -1792,9 +1797,10 @@ pullWithoutHistory =
     []
     Input.PullWithoutHistory
     "without including the remote's history. This usually results in smaller codebase sizes."
+    Input.SyncV1
 
-pullImpl :: String -> [String] -> Input.PullMode -> P.Pretty CT.ColorText -> InputPattern
-pullImpl name aliases pullMode addendum = do
+pullImpl :: String -> [String] -> Input.PullMode -> P.Pretty CT.ColorText -> Input.SyncVersion -> InputPattern
+pullImpl name aliases pullMode addendum syncVersion = do
   self
   where
     self =
@@ -1838,18 +1844,18 @@ pullImpl name aliases pullMode addendum = do
                 explainRemote Pull
               ],
           parse = \case
-            [] -> pure $ Input.PullI Input.PullSourceTarget0 pullMode
+            [] -> pure $ Input.PullI syncVersion Input.PullSourceTarget0 pullMode
             [sourceArg] -> do
               source <- handlePullSourceArg sourceArg
-              pure (Input.PullI (Input.PullSourceTarget1 source) pullMode)
+              pure (Input.PullI syncVersion (Input.PullSourceTarget1 source) pullMode)
             [sourceArg, targetArg] ->
               -- You used to be able to pull into a path, so this arg parser is a little complicated, because
               -- we want to provide helpful suggestions if you are doing a deprecated or invalid thing.
               case ( handlePullSourceArg sourceArg,
                      handleMaybeProjectBranchArg targetArg,
                      handlePath'Arg targetArg
                    ) of
-                (Right source, Right target, _) -> Right (Input.PullI (Input.PullSourceTarget2 source target) pullMode)
+                (Right source, Right target, _) -> Right (Input.PullI syncVersion (Input.PullSourceTarget2 source target) pullMode)
                 (Left err, _, _) -> Left err
                 -- Parsing as a path didn't work either; just show the branch parse error
                 (Right _, Left err, Left _) -> Left err
@@ -3795,6 +3801,7 @@ validInputs =
       projectSwitch,
       projectsInputPattern,
       pull,
+      pullV2,
       pullWithoutHistory,
       push,
       pushCreate,

Diff for: unison-cli/unison-cli.cabal

@@ -201,6 +201,7 @@ library
     , aeson-pretty
     , ansi-terminal
     , async
+    , attoparsec
     , base
     , bytestring
     , cmark