filestore 0.6.3.1 → 0.6.3.2

raw patch · 4 files changed

+25/−16 lines, 4 filesdep ~HUnitdep ~directorydep ~processPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: HUnit, directory, process, time

API changes (from Hackage documentation)

Files

• CHANGES +7/−0
• Data/FileStore/Darcs.hs +6/−5
• filestore.cabal +5/−5
• tests/Tests.hs +7/−6

@@ -1,3 +1,10 @@+Version 0.6.3.2 released 10 Apr 2018++* Update version bounds for dependencies.+* Tweaked tests.  We no longer run darcs tests; they seem to+  depend too much on the details of the system and the darcs+  version.+ Version 0.6.3.1 released 13 Feb 2017  * Bump to 0.6.3.1, raise directory upper bound.

@@ -49,7 +49,7 @@   , directory       = darcsDirectory repo   , search          = darcsSearch repo   , idsMatch        = const hashsMatch repo }-                   + -- | Run a darcs command and return error status, error output, standard output.  The repository -- is used as working directory. runDarcsCommand :: FilePath -> String -> [String] -> IO (ExitCode, String, B.ByteString)@@ -187,13 +187,14 @@   let opts = case mbId of               Nothing    -> ["contents", name]               Just revid -> ["contents", "--match=hash " ++ revid, name]-  (status, err, output) <- runDarcsCommand repo "query" opts+  (status, err, output) <- runDarcsCommand repo "show" opts   if B.null output      then do-       (_, _, out) <- runDarcsCommand repo "query" (["files", "--no-directories"] ++ opts)+       (_, _, out) <- runDarcsCommand repo "show" (["files", "--no-directories"] ++ opts)        if B.null out || null (filter (== name) . getNames $ output)-         then throwIO NotFound else return ()-         else return ()+          then throwIO NotFound+          else return ()+     else return ()   if status == ExitSuccess      then return $ fromByteString output      else throwIO $ UnknownError $ "Error in darcs query contents:\n" ++ err

@@ -1,5 +1,5 @@ Name:                filestore-Version:             0.6.3.1+Version:             0.6.3.2 Cabal-Version:       >= 1.10 Build-type:          Custom Synopsis:            Interface for versioning file stores.@@ -35,8 +35,8 @@                          filepath >= 1.1 && < 1.5,                          directory >= 1.0 && < 1.4,                          parsec >= 2 && < 3.2,-                         process >= 1.0 && < 1.5,-                         time >= 1.1 && < 1.7,+                         process >= 1.0 && < 1.7,+                         time >= 1.1 && < 1.10,                          xml >= 1.3 && < 1.4,                          split >= 0.1 && < 0.3,                          Diff >= 0.2 && < 0.4,@@ -65,11 +65,11 @@     Main-is:        Tests.hs     Default-Language:  Haskell98     Build-depends:  base >= 4 && < 5,-                    HUnit >= 1.2 && < 1.4,+                    HUnit >= 1.2 && < 1.7,                     mtl,                     time,                     Diff >= 0.2 && < 0.4,                     filepath >= 1.1 && < 1.5,-                    directory >= 1.1 && < 1.3,+                    directory >= 1.1 && < 1.4,                     filestore 

@@ -15,13 +15,14 @@  main = do   gc <- testFileStore (gitFileStore "tmp/gitfs") Git-  dc <- testFileStore (darcsFileStore "tmp/darcsfs") Darcs+  -- dc <- testFileStore (darcsFileStore "tmp/darcsfs") Darcs   mc <- testFileStore (mercurialFileStore "tmp/mercurialfs") Mercurial   removeDirectoryRecursive "tmp"-  let counts = Counts{ cases = cases gc  + cases dc + cases mc,-                       tried = tried gc + tried dc + tried mc,-                       failures = failures gc + failures dc + failures mc,-                       errors = errors gc + errors dc + errors mc }+  let counts = Counts{ cases = cases gc {- + cases dc -} + cases mc,+                       tried = tried gc {- + tried dc -} + tried mc,+                       failures = failures gc {- + failures dc -}+                                    + failures mc,+                       errors = errors gc {- + errors dc -} + errors mc }   let errorCode = failures counts + errors counts   putStrLn $ "Total " ++ showCounts counts   exitWith $ if errorCode == 0@@ -71,7 +72,7 @@ nonasciiTestTitle = "αβγ"  subdirNonasciiTestTitle :: String-subdirNonasciiTestTitle = "Fooé/bar"+subdirNonasciiTestTitle = "α/bar"  -- index and directory for noexisting repository should raise error: