From 7fe9648ccc3feef436c610e5ef02b043b268d468 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 28 Aug 2024 09:57:42 +0300 Subject: [PATCH] wip --- .fixme-new/config | 2 -- fixme-new/lib/Fixme/Run.hs | 8 ++++++-- fixme-new/lib/Fixme/Types.hs | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.fixme-new/config b/.fixme-new/config index b93d67ca..c7b04870 100644 --- a/.fixme-new/config +++ b/.fixme-new/config @@ -21,8 +21,6 @@ fixme-value-set cat bug feat refactor fixme-value-set scope mvp-0 mvp-1 backlog -fixme-value-set type bug feature code - fixme-files **/*.txt docs/devlog.md fixme-files **/*.hs diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 821bf6c8..f4e0ce7d 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -139,7 +139,7 @@ runTop argz = do let dict = makeDict @C do - -- internalEntries + internalEntries entry $ bindMatch "--help" $ nil_ \case HelpEntryBound what -> helpEntry what @@ -194,7 +194,7 @@ runTop argz = do _ -> throwIO $ BadFormException @C nil entry $ bindMatch "fixme-value-set" $ nil_ \case - (StringLikeList (n:xs)) -> do + (StringLike n : StringLikeList xs) -> do t <- lift $ asks fixmeEnvAttribValues let name = fromString n let vals = fmap fromString xs & HS.fromList @@ -215,6 +215,10 @@ runTop argz = do entry $ bindMatch "env:show" $ nil_ $ const $ do lift printEnv + entry $ bindMatch "git:commits" $ const $ do + co <- lift listCommits <&> fmap (mkStr @C . view _1) + pure $ mkList co + entry $ bindMatch "init" $ nil_ $ const $ do lift init diff --git a/fixme-new/lib/Fixme/Types.hs b/fixme-new/lib/Fixme/Types.hs index 8401d12c..5df8b085 100644 --- a/fixme-new/lib/Fixme/Types.hs +++ b/fixme-new/lib/Fixme/Types.hs @@ -179,6 +179,9 @@ instance MkKey (FromFixmeKey Fixme) where maybe k2 (mappend "A" . LBS.toStrict . serialise) (HM.lookup "fixme-key" fixmeAttr) where k2 = mappend "A" $ serialise fx & LBS.toStrict +instance IsContext c => MkStr c GitHash where + mkStr ha = mkStr (show $ pretty ha) + instance IsContext c => MkStr c HashRef where mkStr ha = mkStr (show $ pretty ha)