wip

.fixme-new/config

@@ -54,5 +54,8 @@ fixme-comments ";" "--"
 
 (define (ls) (report))
 
+(define (ls:wip) (report workflow ~ wip))
+
 (define (stage) (fixme:stage:show))
 
+

fixme-new/examples/config

@@ -52,3 +52,10 @@ fixme-comments ";" "--"
 
 (set-template default short)
 
+(define (ls) (report))
+
+(define (ls:wip) (report workflow ~ wip))
+
+(define (stage) (fixme:stage:show))
+
+

fixme-new/lib/Fixme/Run.hs

@@ -114,7 +114,7 @@ readConfig = do
     try @_ @IOException (liftIO $ readFile conf)
       <&> fromRight mempty
       <&> parseTop
-      <&> fromRight mempty
+      >>= either (error.show) pure
 
   pure $ mconcat w
 
@@ -318,7 +318,6 @@ runTop forms = do
 
        entry $ bindMatch "define-template" $ nil_ $ \case
          [SymbolVal who, IsSimpleTemplate body ] -> do
-          -- notice $ red "define-template" <+> pretty who <+> pretty what
           t <- lift $ asks fixmeEnvTemplates
           atomically $ modifyTVar t (HM.insert who (Simple (SimpleTemplate body)))
 

fixme-new/lib/Fixme/Run/Internal.hs

@@ -217,6 +217,7 @@ importFromLog fn = do
 
 list_ :: (FixmePerks m, HasPredicate a) => Maybe Id -> a -> FixmeM m ()
 list_ tpl a = do
+
   tpl <- asks fixmeEnvTemplates >>= readTVarIO
             <&> HM.lookup (fromMaybe "default" tpl)
 

fixme-new/lib/Fixme/State.hs

@@ -537,6 +537,7 @@ with s1 as (
   select  m.hash as hash
         , cast(json_group_object(m.attr,m.value) as blob) as json
   from fixmestagemod m
+  where not exists (select null from fixmestagedel d where d.hash = m.hash)
 ),
 
 s2 as