gitlib-libgit2 3.1.0.5 → 3.1.1

raw patch · 3 files changed

+19/−41 lines, 3 filesdep −monad-loggerdep ~gitlibdep ~gitlib-libgit2dep ~hlibgit2PVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies removed: monad-logger

Dependency ranges changed: gitlib, gitlib-libgit2, hlibgit2

API changes (from Hackage documentation)

Files

• Git/Libgit2.hs +14/−33
• Git/Libgit2/Types.hs +1/−2
• gitlib-libgit2.cabal +4/−6

@@ -35,7 +35,6 @@        , checkResult        , lgBuildPackIndex        , lgFactory-       , lgFactoryLogger        , lgForEachObject        , lgExcTrap        , lgBuildPackFile@@ -64,7 +63,6 @@ --import           Control.Exception.Lifted import           Control.Monad hiding (forM, forM_, mapM, mapM_, sequence) import           Control.Monad.Catch-import           Control.Monad.Logger import           Control.Monad.Loops import           Control.Monad.Reader.Class import           Control.Monad.Trans.Control@@ -113,14 +111,11 @@ import qualified System.IO.Unsafe as SU import           Unsafe.Coerce -defaultLoc :: Loc-defaultLoc = Loc "<unknown>" "<unknown>" "<unknown>" (0,0) (0,0)--lgDebug :: MonadLogger m => String -> m ()-lgDebug = monadLoggerLog defaultLoc "Git" LevelDebug . pack+lgDebug :: MonadIO m => String -> m ()+lgDebug = liftIO . putStrLn . ("[DEBUG] " ++) -lgWarn :: MonadLogger m => String -> m ()-lgWarn = monadLoggerLog defaultLoc "Git" LevelWarn . pack+lgWarn :: MonadIO m => String -> m ()+lgWarn = liftIO . putStrLn . ("[WARN] " ++)  withFilePath :: Git.RawFilePath -> (CString -> IO a) -> IO a withFilePath = B.useAsCString@@ -181,7 +176,7 @@     oid1 == oid2 = oid1 `compare` oid2 == EQ  instance (Applicative m, MonadExcept m,-          MonadBaseControl IO m, MonadIO m, MonadLogger m)+          MonadBaseControl IO m, MonadIO m)          => Git.MonadGit LgRepo (ReaderT LgRepo m) where     type Oid LgRepo = OidPtr     data Tree LgRepo =@@ -1278,7 +1273,7 @@ lift_ :: (Monad m, Functor (t m), MonadTrans t) => m a -> t m () lift_ = void . lift -lgBuildPackIndex :: (MonadIO m, MonadBaseControl IO m, MonadLogger m)+lgBuildPackIndex :: (MonadIO m, MonadBaseControl IO m)                  => FilePath -> BL.ByteString -> m (Text, FilePath, FilePath) lgBuildPackIndex dir bytes = do     sha <- go dir bytes@@ -1390,8 +1385,7 @@         checkResult r "c'git_odb_writepack'commit failed"  lgLoadPackFileInMemory-    :: (MonadBaseControl IO m, MonadIO m, MonadLogger m,-        MonadExcept m)+    :: (MonadBaseControl IO m, MonadIO m, MonadExcept m)     => FilePath     -> Ptr (Ptr C'git_odb_backend)     -> Ptr (Ptr C'git_odb)@@ -1422,26 +1416,22 @@      return odbPtr -lgOpenPackFile :: (MonadBaseControl IO m, MonadIO m, MonadLogger m,-                   MonadExcept m)+lgOpenPackFile :: (MonadBaseControl IO m, MonadIO m, MonadExcept m)                => FilePath -> m (Ptr C'git_odb) lgOpenPackFile idxPath = control $ \run ->     alloca $ \odbPtrPtr ->     alloca $ \backendPtrPtr -> run $         lgLoadPackFileInMemory idxPath backendPtrPtr odbPtrPtr -lgClosePackFile :: (MonadBaseControl IO m, MonadIO m, MonadLogger m,-                    MonadExcept m)+lgClosePackFile :: (MonadBaseControl IO m, MonadIO m, MonadExcept m)                => Ptr C'git_odb -> m () lgClosePackFile = liftIO . c'git_odb_free -lgWithPackFile :: (MonadBaseControl IO m, MonadIO m, MonadLogger m,-                   MonadExcept m)+lgWithPackFile :: (MonadBaseControl IO m, MonadIO m, MonadExcept m)                => FilePath -> (Ptr C'git_odb -> m a) -> m a lgWithPackFile idxPath = bracket (lgOpenPackFile idxPath) lgClosePackFile -lgReadFromPack :: (MonadBaseControl IO m, MonadIO m, MonadLogger m,-                   MonadExcept m)+lgReadFromPack :: (MonadBaseControl IO m, MonadIO m, MonadExcept m)                => Ptr C'git_odb -> Git.SHA -> Bool                -> m (Maybe (C'git_otype, CSize, ByteString)) lgReadFromPack odbPtr sha metadataOnly = liftIO $ do@@ -1503,19 +1493,10 @@         checkResult r2 "c'git_remote_download failed"  lgFactory :: MonadIO m-          => Git.RepositoryFactory-              (ReaderT LgRepo (NoLoggingT m)) m LgRepo+          => Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo lgFactory = Git.RepositoryFactory-    { Git.openRepository   = runNoLoggingT . openLgRepository-    , Git.runRepository    = \c m ->-        runNoLoggingT $ runLgRepository c m-    }--lgFactoryLogger :: (MonadIO m, MonadLogger m)-                => Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo-lgFactoryLogger = Git.RepositoryFactory-    { Git.openRepository   = openLgRepository-    , Git.runRepository    = runLgRepository+    { Git.openRepository = openLgRepository+    , Git.runRepository  = runLgRepository     }  runLgRepository :: LgRepo -> ReaderT LgRepo m a -> m a

@@ -12,7 +12,6 @@ import           Control.Applicative import           Control.Monad.Catch import           Control.Monad.IO.Class-import           Control.Monad.Logger import           Control.Monad.Trans.Control import           Data.IORef import           Foreign.ForeignPtr@@ -55,6 +54,6 @@ type MonadExcept m = (MonadThrow m, MonadCatch m, MonadMask m)  type MonadLg m = (Applicative m, MonadExcept m,-                  MonadIO m, MonadBaseControl IO m, MonadLogger m)+                  MonadIO m, MonadBaseControl IO m)  -- Types.hs

@@ -1,5 +1,5 @@ Name:                gitlib-libgit2-Version:             3.1.0.5+Version:       3.1.1 Synopsis:            Libgit2 backend for gitlib License-file:        LICENSE License:             MIT@@ -23,13 +23,12 @@     Hs-source-dirs: test     Build-depends:            base >=3-        , gitlib             >= 3.0.0+        , gitlib             >= 3.1.1         , gitlib-test        >= 3.0.0-        , gitlib-libgit2     >= 3.0.0+        , gitlib-libgit2     >= 3.1.1         , HUnit              >= 1.2.5         , hspec              >= 1.4.4         , hspec-expectations >= 0.3-        , monad-logger       >= 0.3.4.1         , exceptions         >= 0.6         , transformers       >= 0.3.0.0 @@ -39,7 +38,7 @@     ghc-options: -Wall     build-depends:           base                 >= 3 && < 5-        , gitlib               >= 3.0.0+        , gitlib               >= 3.1.1         , hlibgit2             >= 0.18.0.11         , bytestring           >= 0.9.2.1         , conduit              >= 1.1.0@@ -53,7 +52,6 @@         , lifted-base          >= 0.2.0.2         , mmorph               >= 1.0.0         , monad-control        >= 1.0-        , monad-logger         >= 0.3.4.1         , monad-loops          >= 0.3.3.0         , mtl                  >= 2.1.2         , resourcet            >= 1.1.0