filestore 0.6.0.6 → 0.6.1

raw patch · 3 files changed

+50/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGES +11/−2
• Data/FileStore/Git.hs +38/−4
• filestore.cabal +1/−1

@@ -1,9 +1,18 @@-Version 0.6.0.6 released 2 April 2014+Version 0.6.1 released 27 July 2015 +* Create `.git/hooks` directory if missing on initialize+  (jgm/gitit#505).++* Set git username, email.++* Added preliminary symlink handling (Jeffrey David Johnson).++Version 0.6.0.6 released 2 April 2015+ * Added compatibility module Data.FileStore.Compat.Locale   so that filestore will compile against time 1.5. -Version 0.6.0.5 released 2 April 2014+Version 0.6.0.5 released 2 April 2015  * Mark post-update as a bash script (not a generic shell script). 

@@ -1,3 +1,5 @@+{-# LANGUAGE ScopedTypeVariables #-}+ {- |    Module      : Data.FileStore.Git    Copyright   : Copyright (C) 2009 John MacFarlane@@ -17,7 +19,7 @@            ) where import Data.FileStore.Types-import Data.Maybe (mapMaybe)+import Data.Maybe (fromMaybe, mapMaybe) import Data.List.Split (endByOneOf) import System.Exit import Data.Time.Clock.POSIX (posixSecondsToUTCTime)@@ -25,10 +27,11 @@ import Data.ByteString.Lazy.UTF8 (toString) import qualified Data.ByteString.Lazy.Char8 as B import Control.Monad (when)-import System.FilePath ((</>))+import System.FilePath ((</>), splitFileName) import System.Directory (createDirectoryIfMissing, doesDirectoryExist, executable, getPermissions, setPermissions) import Control.Exception (throwIO) import Paths_filestore+import qualified Control.Exception as E  -- | Return a filestore implemented using the git distributed revision control system -- (<http://git-scm.com/>).@@ -69,7 +72,9 @@        -- will be reflected in the working directory.        postupdatepath <- getDataFileName $ "extra" </> "post-update"        postupdatecontents <- B.readFile postupdatepath-       let postupdate = repo </> ".git" </> "hooks" </> "post-update"+       let postupdatedir = repo </> ".git" </> "hooks"+       createDirectoryIfMissing True postupdatedir+       let postupdate = postupdatedir </> "post-update"        B.writeFile postupdate postupdatecontents        perms <- getPermissions postupdate        setPermissions postupdate (perms {executable = True})@@ -101,6 +106,21 @@      then gitCommit repo [name] author logMsg      else throwIO $ UnknownError $ "Could not git add '" ++ name ++ "'\n" ++ errAdd +isSymlink :: FilePath -> FilePath -> Maybe RevisionId -> IO Bool+isSymlink repo name revid = do+  (_, _, out) <- runGitCommand repo "ls-tree" [fromMaybe "HEAD" revid, name]+  -- see http://stackoverflow.com/questions/737673+  return $ (take 6 $ B.unpack out) == "120000"++targetContents :: Contents a => FilePath -> FilePath -> a -> IO (Maybe a)+targetContents repo linkName linkContent = do+  let (dirName, _) = splitFileName linkName+      targetName   = repo </> dirName </> (B.unpack $ toByteString linkContent)+  result <- E.try $ B.readFile targetName+  case result of+    Left (_ :: E.SomeException) -> return Nothing+    Right contents -> return $ Just (fromByteString contents)+ -- | Retrieve contents from resource. gitRetrieve :: Contents a             => FilePath@@ -116,7 +136,21 @@   when (take 4 (toString output) /= "blob") $ throwIO NotFound   (status', err', output') <- runGitCommand repo "cat-file" ["-p", objectName]   if status' == ExitSuccess-     then return $ fromByteString output'+     then do+       isLink <- isSymlink repo name revid+       if isLink+        then do+          contents <- targetContents repo name output'+          case contents of+            -- ideal output on Nothing would be something like+            -- "broken symlink: <output'>", but I couldn't figure+            -- out the bytestring types to do that.+            -- also didn't bother trying to get the browser+            -- to display the error as text if the symlink is to some+            -- other format.+            Nothing -> return $ fromByteString output'+            Just bs -> return $ fromByteString bs+        else return $ fromByteString output'      else throwIO $ UnknownError $ "Error in git cat-file:\n" ++ err'  -- | Delete a resource from the repository.

@@ -1,5 +1,5 @@ Name:                filestore-Version:             0.6.0.6+Version:             0.6.1 Cabal-Version:       >= 1.10 Build-type:          Custom Synopsis:            Interface for versioning file stores.