wtf

hbs2-git3/app/Main.hs

@@ -64,6 +64,7 @@ import Data.ByteString.Lazy (ByteString)
 import Data.ByteString.Builder as Builder
 import Text.InterpolatedString.Perl6 (qc)
 import Data.Set qualified as Set
+import Data.Map qualified as Map
 import Data.HashSet qualified as HS
 import Data.HashSet (HashSet(..))
 import Data.HashMap.Strict qualified as HM
@@ -907,9 +908,10 @@ data WState =
 traverseToCBlock :: forall m . MonadIO m
            => AnyStorage
            -> HashRef
+           -> ( HashRef -> m Bool )
            -> ( Int -> HashRef -> [HashRef] -> m () )
            -> m ()
-traverseToCBlock sto cblock action = do
+traverseToCBlock sto cblock dig process = do
 
   q <- newTVarIO ( HPSQ.empty @HashRef @Int @() )
   done <- newTVarIO ( mempty :: HashSet HashRef )
@@ -934,28 +936,33 @@ traverseToCBlock sto cblock action = do
     WReadSBlock prio h -> do
       debug $ "WReadSBlock" <+> pretty h
 
-      sections <- cached cache h $ S.toList_ (readCBlock sto h S.yield)
+      deeper <- dig h
 
-      for_ sections $ \case
+      if not deeper then
-        CBlockData _ -> none
+        next WNextSBlock
-        CBlockParents p -> do
+      else do
-          debug $ "parents" <+> pretty p
+        sections <- cached cache h $ S.toList_ (readCBlock sto h S.yield)
-          next =<< atomically do
-            d <- readTVar done
-            for_ (zip [1..] p) $ \(i,x) -> do
-              unless (HS.member x d) do
-                modifyTVar q (HPSQ.insert x (prio-i) ())
 
-            let hDone = HS.member h d
+        for_ sections $ \case
+          CBlockData _ -> none
+          CBlockParents p -> do
+            debug $ "parents" <+> pretty p
+            next =<< atomically do
+              d <- readTVar done
+              for_ (zip [1..] p) $ \(i,x) -> do
+                unless (HS.member x d) do
+                  modifyTVar q (HPSQ.insert x (prio-i) ())
 
-            unless hDone do
+              let hDone = HS.member h d
-              modifyTVar q (HPSQ.insert h prio ())
 
-            qq <- readTVar q
+              unless hDone do
-            if not (any (`HPSQ.member` qq) p) && not hDone then do
+                modifyTVar q (HPSQ.insert h prio ())
-              pure $ WProcessCBlock prio h
+
-            else do
+              qq <- readTVar q
-              pure WNextSBlock
+              if not (any (`HPSQ.member` qq) p) && not hDone then do
+                pure $ WProcessCBlock prio h
+              else do
+                pure WNextSBlock
 
     WProcessCBlock i h -> do
       what <- cached cache h $ S.toList_ (readCBlock sto h S.yield)
@@ -969,10 +976,30 @@ traverseToCBlock sto cblock action = do
           none
 
         CBlockData hrefs -> do
-          action i h hrefs
+          process i h hrefs
 
       next $ WNextSBlock
 
+-- FIXME: move-to-suckless-script
+splitOpts :: [(Id,Int)]
+          -> [Syntax C]
+          -> ([Syntax C], [Syntax C])
+
+splitOpts def opts' = flip fix (mempty, opts) $ \go -> \case
+  (acc, []) -> acc
+  ( (o,a), r@(StringLike x) : rs ) -> do
+    case HM.lookup (fromString x) omap of
+      Nothing -> go ((o, a <> [r]), rs)
+      Just n  -> do
+        let (w, rest) = L.splitAt n rs
+        let result = mkList @C ( r : w )
+        go ( (o <> [result], a), rest )
+  ( (o,a), r : rs ) -> do
+      go ((o, a <> [r]), rs)
+
+  where
+    omap = HM.fromList [ (p, x) | (p,x) <- def ]
+    opts = opts'
 
 theDict :: forall m . ( HBS2GitPerks m
                       , HasClientAPI PeerAPI UNIX m
@@ -1077,12 +1104,37 @@ theDict = do
 
           _ -> throwIO (BadFormException @C nil)
 
+        entry $ bindMatch "test:git:cblock:import" $ nil_ $ \syn -> lift do
+          let opts = splitOpts [("--deep",0),("--shallow",0),("--dry",0)] syn
+
+          debug $ pretty opts
+
+          cb  <- [ x | HashLike x <- snd opts ] & headMay & orThrowUser "import: cblock not set"
+
+          let shallow = or [ True | ListVal [StringLike "--shallow"] <- fst opts ]
+          let deep    = or [ True | ListVal [StringLike "--deep"]    <- fst opts ] && not shallow
+
+          debug $ "cblock" <+> pretty deep <+> pretty cb
+
+          sto <- getStorage
+
+          let whatever _ = do
+                -- shallow:
+                -- 1. get commit
+                -- 2. if all commits here -> stop
+                pure True
+
+          traverseToCBlock sto cb whatever  $ \i h _ -> do
+            debug $ green "process cblock data" <+> pretty i <+> pretty h
+
         entry $ bindMatch "test:git:cblock:scan" $ nil_ $ \case
           [ HashLike cblock ] -> lift do
 
             sto <- getStorage
 
-            traverseToCBlock sto cblock $ \i h _ -> do
+            let whatever _ = pure True
+
+            traverseToCBlock sto cblock whatever  $ \i h _ -> do
               debug $ green "process cblock data" <+> pretty i <+> pretty h
 
           _ -> throwIO (BadFormException @C nil)

hbs2-git3/lib/HBS2/Git3/State/Direct.hs

@@ -46,6 +46,7 @@ create table if not exists
 cblock
   ( kommit  text not null primary key
   , cblock  text not null
+  , unique (kommit,cblock)
   )
 |]
 
@@ -73,6 +74,7 @@ insertCBlock co cblk = do
   insert [qc|
     insert into cblock (kommit, cblock) values(?,?)
     on conflict (kommit) do update set cblock = excluded.cblock
+    on conflict (kommit,cblock) do nothing
          |] (co, cblk)
 
 selectCBlock :: MonadIO m => GitHash -> DBPipeM m (Maybe HashRef)

hbs2-tests/hbs2-tests.cabal

@@ -1176,7 +1176,6 @@ executable test-scripts
         , text
         , time
         , zstd
-        , bzlib