diff --git a/.fixme-new/config b/.fixme-new/config index 4694309c..e0b7b243 100644 --- a/.fixme-new/config +++ b/.fixme-new/config @@ -30,19 +30,15 @@ fixme-file-comments "*.scm" ";" fixme-comments ";" "--" -;(fixme-play-log-action -; (import ".fixme-new/log") -;) - -(fixme-play-log-action - (play-git-log-file-all ".fixme-new/log") +(update-action + (import-git-logs ".fixme-new/log") ) -(fixme-play-log-action +(update-action (export ".fixme-new/fixme.log") ) -(fixme-play-log-action +(update-action (hello kitty) ) diff --git a/.fixme-new/fixme.log b/.fixme-new/fixme.log index 35eff787..7da39544 100644 Binary files a/.fixme-new/fixme.log and b/.fixme-new/fixme.log differ diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 0c0ebecc..282eabf1 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -328,6 +328,7 @@ exportToLog fn = do compactStorageClose sto + cleanStage importFromLog :: FixmePerks m => CompactStorage HbSync -> FixmeM m () importFromLog sto = do @@ -624,15 +625,15 @@ runForms ss = for_ ss $ \s -> do atomically $ modifyTVar t (<> [action]) - ListVal (SymbolVal "fixme-play-log-action" : xs) -> do - debug $ "fixme-play-log-action" <+> pretty xs + ListVal (SymbolVal "update-action" : xs) -> do + debug $ "update-action" <+> pretty xs env <- ask t <- asks fixmeEnvReadLogActions let action = ReadLogAction @c $ \_ -> liftIO (withFixmeEnv env (runForms xs)) atomically $ modifyTVar t (<> [action]) - ListVal [SymbolVal "play-git-log-file-all", StringLike fn] -> do - warn $ red "play-git-log-file-all" <+> pretty fn + ListVal [SymbolVal "import-git-logs", StringLike fn] -> do + warn $ red "import-git-logs" <+> pretty fn scanGitLogLocal fn importFromLog ListVal [SymbolVal "import", StringLike fn] -> do