From dd89b1a955afde683e1da909878dd0646e8841a5 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Tue, 10 Sep 2024 08:22:03 +0300 Subject: [PATCH] wip --- fixme-new/lib/Fixme/Run.hs | 2 +- fixme-new/lib/Fixme/Run/Internal.hs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 98adef2a..bbefdf79 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -412,7 +412,7 @@ runTop forms = do -- lift $ scanGitLocal mempty Nothing entry $ bindMatch "git:blobs" $ \_ -> do - blobs <- lift listRelevantBlobs + blobs <- lift (listBlobs Nothing) elems <- for blobs $ \(f,h) -> do pure $ mkList @C [ mkStr f, mkSym ".", mkStr h ] diff --git a/fixme-new/lib/Fixme/Run/Internal.hs b/fixme-new/lib/Fixme/Run/Internal.hs index c88a4cf4..0d1964a8 100644 --- a/fixme-new/lib/Fixme/Run/Internal.hs +++ b/fixme-new/lib/Fixme/Run/Internal.hs @@ -244,6 +244,8 @@ import_ = do let blobs = HM.fromList hashes + let isVersioned = maybe False (`HM.member` versioned) + withState $ transactional do for_ fxs $ \fme -> do let fn = fixmeGet "file" fme <&> Text.unpack . coerce @@ -252,10 +254,11 @@ import_ = do let blob = fn >>= flip HM.lookup blobs >>= \b -> pure (fixmeSet "blob" (fromString (show $ pretty $ b)) mempty) - notice $ "fixme" <+> pretty (fixmeKey fme) + notice $ "fixme" <+> pretty (fixmeKey fme) <+> pretty fn insertFixme (fromMaybe mempty blob <> fmeRich <> fme) -- TODO: add-scanned-only-on-commited + -- $workflow: test -- поведение: если файл в гите И закоммичен -- то -- добавляем в сканированные. -- @@ -265,8 +268,8 @@ import_ = do -- -- проверяем for_ fn $ \f -> do - let add = -- not (HM.member f versioned) - maybe False (`HS.member` commited) (HM.lookup f blobs) + let add = not (isVersioned fn) + || maybe False (`HS.member` commited) (HM.lookup f blobs) when add do notice $ red "SCANNED" <+> pretty f