darcs-beta 2.2.98.3 → 2.2.98.4
raw patch · 9 files changed
+32/−40 lines, 9 filesdep ~basedep ~hashed-storage
Dependency ranges changed: base, hashed-storage
Files
- Distribution/ShellHarness.hs +1/−1
- darcs-beta.cabal +6/−17
- release/distributed-context +1/−1
- src/ByteStringUtils.hs +3/−11
- src/Darcs/Gorsvet.hs +1/−1
- src/Darcs/Repository/Prefs.lhs +7/−2
- src/Darcs/RunCommand.hs +1/−0
- src/Darcs/TheCommands.hs +1/−0
- src/win32/System/Posix/Files.hsc +11/−7
Distribution/ShellHarness.hs view
@@ -48,8 +48,8 @@ Nothing -> get_darcs_path Just x -> return x let myenv = [("HOME",cwd)- ,("APPDATA",cwd) -- the Windows analogue of $HOME. ,("TESTS_WD",cwd)+ ,("DARCS_TESTING_PREFS_DIR",cwd </> ".darcs") ,("EMAIL","tester") ,("DARCSEMAIL","tester") ,("PATH",(darcs_path++":"++path))
darcs-beta.cabal view
@@ -1,5 +1,5 @@ Name: darcs-beta-version: 2.2.98.3+version: 2.2.98.4 License: GPL License-file: COPYING Author: David Roundy <droundy@darcs.net>, <darcs-users@darcs.net>@@ -111,8 +111,6 @@ flag mmap description: Compile with mmap support. -flag base3- flag test description: Compile unit tests (requires QuickCheck >= 2.1.0.0). default: False@@ -318,21 +316,18 @@ html == 1.0.*, filepath == 1.1.*, haskeline >= 0.6.1 && < 0.7,- hashed-storage >= 0.3.5 && < 0.4+ hashed-storage >= 0.3.6 && < 0.4 if !os(windows) build-depends: unix >= 1.0 && < 2.4 - if flag(base3)- build-depends: base >= 3,+ build-depends: base >= 3, old-time == 1.0.*, directory == 1.0.*, process == 1.0.*, containers >= 0.1 && < 0.3, array >= 0.1 && < 0.3, random == 1.0.*- else- build-depends: base < 3 -- We need optimizations, regardless of what Hackage says ghc-options: -Wall -O2 -funbox-strict-fields@@ -451,21 +446,18 @@ html == 1.0.*, filepath == 1.1.*, haskeline >= 0.6.1 && < 0.7,- hashed-storage >= 0.3.5 && < 0.4+ hashed-storage >= 0.3.6 && < 0.4 if !os(windows) build-depends: unix >= 1.0 && < 2.4 - if flag(base3)- build-depends: base >= 3,+ build-depends: base >= 3, old-time == 1.0.*, directory == 1.0.*, process == 1.0.*, containers >= 0.1 && < 0.3, array >= 0.1 && < 0.3, random == 1.0.*- else- build-depends: base < 3 if flag(curl) extra-libraries: curl@@ -593,16 +585,13 @@ if !os(windows) build-depends: unix >= 1.0 && < 2.4 - if flag(base3)- build-depends: base >= 3,+ build-depends: base >= 3, old-time == 1.0.*, directory == 1.0.*, process == 1.0.*, containers >= 0.1 && < 0.3, array >= 0.1 && < 0.3, random == 1.0.*- else- build-depends: base < 3 if flag(mmap) && !os(windows) build-depends: mmap >= 0.2
release/distributed-context view
@@ -1,1 +1,1 @@-Just "\nContext:\n\n[TAG 2.2.98.3\nPetr Rockai <me@mornfall.net>**20090710143916\n Ignore-this: 58721594f0f0779473e3e88e9fc4bb29\n] \n"+Just "\nContext:\n\n[TAG 2.2.98.4\nPetr Rockai <me@mornfall.net>**20090715100830\n Ignore-this: a5b37c42d10dd5a17b6d00420643aa9f\n] \n"
src/ByteStringUtils.hs view
@@ -412,22 +412,14 @@ Nothing -> mmapFilePS f Just len -> #ifdef HAVE_HASKELL_ZLIB- -- Passing the length to gzDecompress means that it produces produces one chunk,+ do -- Passing the length to gzDecompress means that it produces produces one chunk, -- which in turn means that B.concat won't need to copy data. -- If the length is wrong this will just affect efficiency, not correctness let doDecompress buf = let (res, bad) = gzDecompress (Just len) buf in do when bad $ addCRCWarning f return res- in fmap B.concat . (doDecompress =<<) $-#ifdef HAVE_OLD_BYTESTRING- -- bytestring < 0.9.1 had a bug where it did not know to close handles upon EOF- -- performance would be better with a newer bytestring and lazy- -- readFile below -- ratify readFile: comment- fmap (BL.fromChunks . (:[])) $- B.readFile f -- ratify readFile: immediately consumed-#else- BL.readFile f -- ratify readFile: immediately consumed by the conversion to a strict bytestring-#endif+ compressed <- (BL.fromChunks . return) `fmap` mmapFilePS f+ B.concat `fmap` doDecompress compressed #else withCString f $ \fstr-> withCString "rb" $ \rb-> do gzf <- c_gzopen fstr rb
src/Darcs/Gorsvet.hs view
@@ -163,7 +163,7 @@ _ -> choose_touching pre_files pending return relevant -applyToTree :: (Apply p) => p -> Tree -> IO Tree+applyToTree :: (Apply p) => p C(x y) -> Tree -> IO Tree applyToTree patch t = snd `fmap` virtualTreeIO (apply [] patch) t unrecordedChanges :: (RepoPatch p) => [DarcsFlag] -> Repository p C(r u t)
src/Darcs/Repository/Prefs.lhs view
@@ -42,6 +42,7 @@ import Data.List ( nub, isPrefixOf, union ) import System.Directory ( getAppUserDataDirectory ) import System.FilePath ( (</>) )+import System.Environment ( getEnvironment ) import Darcs.Flags ( DarcsFlag( NoCache, NoSetDefault, DryRun, Ephemeral, RemoteRepo ) ) import Darcs.RepoPath ( AbsolutePath, ioAbsolute, toFilePath, getCurrentDirectory )@@ -241,8 +242,12 @@ -- | The path of the global preference directory; @~/.darcs@ on Unix, -- and @%APPDATA%/darcs@ on Windows. global_prefs_dir :: IO (Maybe FilePath)-global_prefs_dir = (getAppUserDataDirectory "darcs" >>= return.Just)- `catchall` (return Nothing)+global_prefs_dir = do+ env <- getEnvironment+ case lookup "DARCS_TESTING_PREFS_DIR" env of+ Just d -> return (Just d)+ Nothing -> (getAppUserDataDirectory "darcs" >>= return.Just)+ `catchall` (return Nothing) environmentHelpHome :: ([String], [String]) environmentHelpHome = (["HOME", "APPDATA"], [
src/Darcs/RunCommand.hs view
@@ -15,6 +15,7 @@ -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- Boston, MA 02110-1301, USA. +{-# LANGUAGE CPP #-} module Darcs.RunCommand ( run_the_command ) where import Control.Monad ( unless, when )
src/Darcs/TheCommands.hs view
@@ -15,6 +15,7 @@ -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- Boston, MA 02110-1301, USA. +{-# LANGUAGE CPP #-} module Darcs.TheCommands ( command_control_list ) where import Darcs.Commands.Add ( add )
src/win32/System/Posix/Files.hsc view
@@ -11,7 +11,7 @@ ( FDType, CStat, c_fstat, lstat, sizeof_stat, statGetType, st_mode, st_size, st_mtime,- s_isreg, s_isdir, s_isfifo, )+ s_isreg, s_isdir, s_isfifo, c_stat ) import System.Posix.Types ( Fd(..), CMode, EpochTime, FileMode ) import Data.Bits ( (.|.) )@@ -69,12 +69,9 @@ fileSize :: FileStatus -> FileOffset fileSize = fst_size -fileMode :: () -> ()+fileMode :: a -> () fileMode _ = () -getFileStatus :: FilePath -> IO ()-getFileStatus _ = return ()- setFileMode :: FilePath -> () -> IO () setFileMode _ _ = return () @@ -82,11 +79,18 @@ stdFileMode :: FileMode stdFileMode = (#const S_IRUSR) .|. (#const S_IWUSR) -+getFileStatus :: FilePath -> IO FileStatus+getFileStatus fp =+ do_stat (\p -> (fp `withCString` (`c_stat` p))) +-- lstat is broken on win32 with at least GHC 6.10.3 getSymbolicLinkStatus :: FilePath -> IO FileStatus-getSymbolicLinkStatus fp = +##if mingw32_HOST_OS+getSymbolicLinkStatus = getFileStatus+##else+getSymbolicLinkStatus fp = do_stat (\p -> (fp `withCString` (`lstat` p)))+##endif #define _WIN32_WINNT 0x0500 foreign import stdcall "winbase.h CreateHardLinkW" c_CreateHardLink :: CWString -> CWString -> Ptr a -> IO CInt