darcs 2.1.98.2 → 2.1.99.0

raw patch · 4 files changed

+14/−12 lines, 4 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Setup.lhs +1/−1
• darcs.cabal +7/−7
• release/distributed-context +1/−1
• src/Darcs/Commands/WhatsNew.lhs +5/−3

@@ -227,7 +227,7 @@     ,"context :: String"     ,"context = " ++ case ctx of                        Just x -> show x-                       Nothing -> "context not available"+                       Nothing -> show "context not available"     ]  context :: Verbosity -> Version -> IO (Maybe String)

@@ -1,5 +1,5 @@ Name:           darcs-version:        2.1.98.2+version:        2.1.99.0 License:        GPL License-file:   COPYING Author:         David Roundy <droundy@darcs.net>, <darcs-users@darcs.net>@@ -306,7 +306,7 @@     extra-libraries:   curl     cpp-options:       -DHAVE_CURL     c-sources:         src/hscurl.c-    cc-options:        -DHAVE_CURL -DPACKAGE_VERSION="2.1.98.2"+    cc-options:        -DHAVE_CURL -DPACKAGE_VERSION="2.1.99.0"      if flag(curl-pipelining)       -- curl 7.19.1 has bug-free pipelining@@ -318,14 +318,14 @@     if flag(libwww)       build-tools:    libwww-config >= 5.0       c-sources:      src/hslibwww.c-      cc-options:     -DHAVE_LIBWWW -DPACKAGE_VERSION="2.1.98.2"+      cc-options:     -DHAVE_LIBWWW -DPACKAGE_VERSION="2.1.99.0"       cpp-options:    -DHAVE_LIBWWW       x-have-libwww:     else       if flag(http)         build-depends:    network == 2.2.*,                           HTTP    >= 3000.0 && < 3001.1-        cpp-options:      -DHAVE_HTTP -DPACKAGE_VERSION="2.1.98.2"+        cpp-options:      -DHAVE_HTTP -DPACKAGE_VERSION="2.1.99.0"         x-have-http:    if flag(external-bytestring)@@ -445,7 +445,7 @@     extra-libraries:   curl     cpp-options:       -DHAVE_CURL     c-sources:         src/hscurl.c-    cc-options:        -DHAVE_CURL -DPACKAGE_VERSION="2.1.98.2"+    cc-options:        -DHAVE_CURL -DPACKAGE_VERSION="2.1.99.0"      if flag(curl-pipelining)       -- curl 7.19.1 has bug-free pipelining@@ -457,14 +457,14 @@     if flag(libwww)       build-tools:    libwww-config >= 5.0       c-sources:      src/hslibwww.c-      cc-options:     -DHAVE_LIBWWW -DPACKAGE_VERSION="2.1.98.2"+      cc-options:     -DHAVE_LIBWWW -DPACKAGE_VERSION="2.1.99.0"       cpp-options:    -DHAVE_LIBWWW       x-have-libwww:     else       if flag(http)         build-depends:    network == 2.2.*,                           HTTP    >= 3000.0 && < 3001.1-        cpp-options:      -DHAVE_HTTP -DPACKAGE_VERSION="2.1.98.2"+        cpp-options:      -DHAVE_HTTP -DPACKAGE_VERSION="2.1.99.0"         x-have-http:    if flag(external-bytestring)

@@ -1,1 +1,1 @@-Just "\nContext:\n\n[TAG 2.1.98.2\nPetr Rockai <me@mornfall.net>**20090104102526] \n"+Just "\nContext:\n\n[TAG 2.1.99.0\nPetr Rockai <me@mornfall.net>**20090110090422] \n"

@@ -25,7 +25,7 @@  module Darcs.Commands.WhatsNew ( whatsnew ) where import System.Exit ( ExitCode(..), exitWith )-import System.Directory ( doesFileExist )+import System.Directory ( doesFileExist, doesDirectoryExist ) import Data.List ( sort ) import Control.Monad ( when ) @@ -156,8 +156,10 @@ warn_if_bogus :: (Slurpy,Slurpy) -> [SubPath] -> IO() warn_if_bogus _ [] = return () warn_if_bogus (rec, pend) (f:fs) =-    do exist <- doesFileExist file-       if exist then when (not (slurp_has fp rec) || (slurp_has fp pend))$+    do exist1 <- doesFileExist file+       exist2 <- doesDirectoryExist file+       let exist = exist1 || exist2+       if exist then when (not (slurp_has fp rec || slurp_has fp pend)) $                        putStrLn $ "WARNING: File '"                          ++file++"' not in repository!"                 else putStrLn $ "WARNING: File '"++file++"' does not exist!"