Hi David.
Some more patches. I plan do do more work on URL module to integrate HTTP.hs
support in it.
Regards,
Dmitry
Fri Aug 15 15:41:05 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* Resolve issue995: changes --context : {--human-readable,--xml-output} have
no effect.
Fri Aug 15 19:44:21 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* Rename catchInt to catchInterrupt, better message when get is interrupted.
Sat Aug 16 02:12:45 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* Spacing in Darcs/Commands/Changes.lhs
Sat Aug 16 11:01:47 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* URL.hs: debug messages.
Sat Aug 16 11:02:13 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* URL.hs: call debugFail when download fails.
Sun Aug 17 16:11:01 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* URL.hs: always import debugFail, again.
Sun Aug 17 16:18:34 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* Do not compile curl support if libwww is enabled.
Sun Aug 17 16:48:16 MSD 2008 Dmitry Kurochkin <[EMAIL PROTECTED]>
* URL module refactoring.
New patches:
[Resolve issue995: changes --context : {--human-readable,--xml-output} have no effect.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815114105] hunk ./src/Darcs/Commands/Changes.lhs 31
-import Darcs.Arguments ( DarcsFlag(Context, MachineReadable, Interactive,
- OnlyChangesToFiles, Count, NumberPatches,
- XMLOutput, Summary, Reverse, Verbose, Debug),
+import Darcs.Arguments ( DarcsFlag(Context, HumanReadable, MachineReadable,
+ Interactive, OnlyChangesToFiles, Count,
+ NumberPatches, XMLOutput, Summary,
+ Reverse, Verbose, Debug),
hunk ./src/Darcs/Commands/Changes.lhs 271
- where opts' = MachineReadable : opts
+ where opts' = if HumanReadable `elem` opts || XMLOutput `elem` opts
+ then opts
+ else MachineReadable : opts
[Rename catchInt to catchInterrupt, better message when get is interrupted.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815154421] hunk ./src/Darcs/Commands/Get.lhs 57
-import Darcs.SignalHandler ( catchInt )
+import Darcs.SignalHandler ( catchInterrupt )
hunk ./src/Darcs/Commands/Get.lhs 173
- copy_repo `catchInt` (putInfo $ text "Interrupted!")
+ copy_repo `catchInterrupt` (putInfo $ text "Using lazy repository.")
hunk ./src/Darcs/SignalHandler.lhs 22
- catchInt, catchNonSignal,
+ catchInterrupt, catchNonSignal,
hunk ./src/Darcs/SignalHandler.lhs 109
-catchInt :: IO a -> IO a -> IO a
-catchInt job handler =
+catchInterrupt :: IO a -> IO a -> IO a
+catchInterrupt job handler =
[Spacing in Darcs/Commands/Changes.lhs
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815221245] hunk ./src/Darcs/Commands/Changes.lhs 36
- possibly_remote_repo_dir, get_repourl,
- working_repo_dir, only_to_files,
- summary, changes_reverse,
- match_several_or_range,
- all_interactive, showFriendly,
- ssh_cm, disablePipelining
+ possibly_remote_repo_dir, get_repourl,
+ working_repo_dir, only_to_files,
+ summary, changes_reverse,
+ match_several_or_range,
+ all_interactive, showFriendly,
+ ssh_cm, disablePipelining
hunk ./src/Darcs/Commands/Changes.lhs 96
- changes_format,
- summary,
- changes_reverse,
- possibly_remote_repo_dir,
- working_repo_dir,
- all_interactive]}
+ changes_format,
+ summary,
+ changes_reverse,
+ possibly_remote_repo_dir,
+ working_repo_dir,
+ all_interactive]}
[URL.hs: debug messages.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080816070147] hunk ./src/URL.hs 154
- " -> "++f++")")
+ " -> "++f++")")
hunk ./src/URL.hs 169
+ debugMessage ("URL.copyUrlWithPriority ("++u++"\n"++
+ " -> "++f++")")
hunk ./src/URL.hs 211
- debugMessage $ "waitUrl "++u
+ debugMessage $ "URL.waitUrl "++u
[URL.hs: call debugFail when download fails.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080816070213] hunk ./src/URL.hs 213
- Just var -> takeMVar var
+ Just var -> do
+ e <- takeMVar var
+ when (not $ null e) (debugFail $ "Failed to download URL "++u++": "++e)
[URL.hs: always import debugFail, again.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817121101] hunk ./src/URL.hs 22
-import Darcs.Progress ( debugMessage )
+import Darcs.Progress ( debugFail, debugMessage )
hunk ./src/URL.hs 27
-import Darcs.Progress ( debugFail )
[Do not compile curl support if libwww is enabled.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817121834] hunk ./configure.ac 461
+dnl Find libwww and other libraries needed by hswww.c
+
+AC_ARG_WITH(libwww,
+ AS_HELP_STRING([--with-libwww],[use libwww]))
+
+if test "$with_libwww" == "yes"; then
+ AC_MSG_CHECKING([for libwww])
+ if eval libwww-config --version 2>/dev/null >/dev/null; then
+ CPPFLAGS="$CPPFLAGS -DHAVE_LIBWWW"
+ WWWVERSION=`libwww-config --version`
+ LIBS="$LIBS `libwww-config --libs`"
+ CFLAGS="$CFLAGS `libwww-config --cflags`"
+ have_libwww=yes
+ AC_MSG_RESULT($WWWVERSION)
+ else
+ AC_MSG_RESULT(FAILED)
+ AC_MSG_WARN([libwww-config was not found])
+ fi
+fi
+
hunk ./configure.ac 491
-if test "$with_libcurl" != "no"; then
+if test "$with_libcurl" != "no" -a "$have_libwww" != "yes"; then
hunk ./configure.ac 541
-dnl Find libwww and other libraries needed by hswww.c
-
-AC_ARG_WITH(libwww,
- AS_HELP_STRING([--with-libwww],[use libwww]))
-
-if test "$with_libwww" == "yes"; then
- AC_MSG_CHECKING([for libwww])
- if eval libwww-config --version 2>/dev/null >/dev/null; then
- CPPFLAGS="$CPPFLAGS -DHAVE_LIBWWW"
- WWWVERSION=`libwww-config --version`
- LIBS="$LIBS `libwww-config --libs`"
- CFLAGS="$CFLAGS `libwww-config --cflags`"
- AC_MSG_RESULT($WWWVERSION)
- else
- AC_MSG_RESULT(FAILED)
- AC_MSG_WARN([libwww-config was not found])
- fi
-fi
-
[URL module refactoring.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817124816] hunk ./src/URL.hs 17
-import Autoconf ( have_libcurl, have_libwww )
hunk ./src/URL.hs 18
-import Foreign.C.String ( withCString, peekCString, CString )
hunk ./src/URL.hs 21
-import Darcs.Global ( atexit )
hunk ./src/URL.hs 23
-#if !defined(HAVE_CURL) || !defined(HAVE_LIBWWW)
-import Foreign.Ptr ( nullPtr )
+#if defined(HAVE_CURL) || defined(HAVE_LIBWWW)
+import Darcs.Global ( atexit )
+import Foreign.C.String ( withCString, peekCString, CString )
hunk ./src/URL.hs 71
- if have_libwww then 100
-#ifdef CURL_PIPELINING
- else 100
+#if defined(HAVE_LIBWWW) || defined(CURL_PIPELINING)
+ 100
hunk ./src/URL.hs 74
- else 1
+ 1
hunk ./src/URL.hs 140
- err <- liftIO $ requestUrl u f c
- when (not $ null err) (dbg $ "Failed to start download URL "++u++": "++err)
+ dbg ("URL.request_url ("++u++"\n"++
+ " -> "++f++")")
+ err <- liftIO $ request_url u f c
+ if null err
+ then dbg "URL.request_url succeeded"
+ else (dbg $ "Failed to start download URL "++u++": "++err)
hunk ./src/URL.hs 149
- where requestUrl u f cache =
- withCString u $ \ustr ->
- withCString (f++"-new") $ \fstr -> do
- atexit $ removeFileMayNotExist (f++"-new")
- debugMessage ("URL.requestUrl ("++u++"\n"++
- " -> "++f++")")
- let fn = if have_libwww then libwww_request_url
- else curl_request_url
- err <- fn ustr fstr (cachableToInt cache) >>= peekCString
- when (null err) (debugMessage "URL.requestUrl succeeded")
- return err
hunk ./src/URL.hs 171
- e <- liftIO $ waitNextUrl'
- u <- liftIO $ lastUrl'
+ (u, e) <- liftIO $ wait_next_url
hunk ./src/URL.hs 188
- where waitNextUrl' = let fn = if have_libwww then libwww_wait_next_url
- else curl_wait_next_url
- in fn >>= peekCString
- lastUrl' = let fn = if have_libwww then libwww_last_url
- else curl_last_url
- in fn >>= peekCString
hunk ./src/URL.hs 204
+#if defined(HAVE_CURL) || defined(HAVE_LIBWWW)
hunk ./src/URL.hs 209
-
-setDebugHTTP :: IO ()
-setDebugHTTP | have_libwww = libwww_enable_debug
- | have_libcurl = curl_enable_debug
- | otherwise = debugMessage ("URL.setDebugHttp works only with curl and libwww")
+#endif
hunk ./src/URL.hs 214
-#ifdef HAVE_CURL
-foreign import ccall "hscurl.h curl_request_url"
- curl_request_url :: CString -> CString -> CInt -> IO CString
-
-foreign import ccall "hscurl.h curl_wait_next_url"
- curl_wait_next_url :: IO CString
-
-foreign import ccall "hscurl.h curl_last_url"
- curl_last_url :: IO CString
-
-foreign import ccall "hscurl.h curl_enable_debug"
- curl_enable_debug :: IO ()
-#else
-no_curl :: IO ()
-no_curl = debugFail "There is no libcurl!"
+setDebugHTTP :: IO ()
+request_url :: String -> FilePath -> Cachable -> IO String
+wait_next_url :: IO (String, String)
hunk ./src/URL.hs 218
-curl_request_url :: CString -> CString -> CInt -> IO CString
-curl_request_url _ _ _ = no_curl >> return nullPtr
+#if defined(HAVE_LIBWWW)
hunk ./src/URL.hs 220
-curl_wait_next_url :: IO CString
-curl_wait_next_url = no_curl >> return nullPtr
+setDebugHTTP = libwww_enable_debug
hunk ./src/URL.hs 222
-curl_last_url :: IO CString
-curl_last_url = no_curl >> return nullPtr
+request_url u f cache =
+ withCString u $ \ustr ->
+ withCString (f++"-new") $ \fstr -> do
+ atexit $ removeFileMayNotExist (f++"-new")
+ err <- libwww_request_url ustr fstr (cachableToInt cache) >>= peekCString
+ return err
hunk ./src/URL.hs 229
-curl_enable_debug :: IO ()
-curl_enable_debug = no_curl
-#endif
+wait_next_url = do
+ e <- libwww_wait_next_url >>= peekCString
+ u <- libwww_last_url >>= peekCString
+ return (u, e)
hunk ./src/URL.hs 234
-#ifdef HAVE_LIBWWW
hunk ./src/URL.hs 245
-#else
-no_libwww :: IO ()
-no_libwww = debugFail "There is no libwww!"
hunk ./src/URL.hs 246
-libwww_request_url :: CString -> CString -> CInt -> IO CString
-libwww_request_url _ _ _ = no_libwww >> return nullPtr
+#elif defined(HAVE_CURL)
+
+setDebugHTTP = curl_enable_debug
+
+request_url u f cache =
+ withCString u $ \ustr ->
+ withCString (f++"-new") $ \fstr -> do
+ atexit $ removeFileMayNotExist (f++"-new")
+ err <- curl_request_url ustr fstr (cachableToInt cache) >>= peekCString
+ return err
hunk ./src/URL.hs 257
-libwww_wait_next_url :: IO CString
-libwww_wait_next_url = no_libwww >> return nullPtr
+wait_next_url = do
+ e <- curl_wait_next_url >>= peekCString
+ u <- curl_last_url >>= peekCString
+ return (u, e)
+
+foreign import ccall "hscurl.h curl_request_url"
+ curl_request_url :: CString -> CString -> CInt -> IO CString
+
+foreign import ccall "hscurl.h curl_wait_next_url"
+ curl_wait_next_url :: IO CString
+
+foreign import ccall "hscurl.h curl_last_url"
+ curl_last_url :: IO CString
+
+foreign import ccall "hscurl.h curl_enable_debug"
+ curl_enable_debug :: IO ()
+
+#else
hunk ./src/URL.hs 276
-libwww_last_url :: IO CString
-libwww_last_url = no_libwww >> return nullPtr
+setDebugHTTP = debugMessage "URL.setDebugHttp works only with curl and libwww"
+request_url _ _ _ = debugFail "URL.request_url: there is no curl or libwww!"
+wait_next_url = debugFail "URL.wait_next_url: there is no curl or libwww!"
hunk ./src/URL.hs 280
-libwww_enable_debug :: IO ()
-libwww_enable_debug = no_libwww
Context:
[Resolve issue823: do not exit on keyboard interrupt when getting patches.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815070943
And give a chance for go_to_chosen_version to run.
]
[fix buggy comments in bugs/identical-patches.sh.
David Roundy <[EMAIL PROTECTED]>**20080814135322]
[Add Ian's identical-patch test case.
Eric Kow <[EMAIL PROTECTED]>**20080813171032]
[Add (failing) test for issue944.
Eric Kow <[EMAIL PROTECTED]>**20080814055903
This appears to be a reggression from darcs 1.0.9, and was submitted by
Wolfgang Lux on the bug tracker. Interestingly, only the old format
repositories are affected, not the hashed ones.
]
[add type witnesses to TouchesFiles
Jason Dagit <[EMAIL PROTECTED]>**20080810063403]
[add type witnesses to Patch/Choices.lhs
Jason Dagit <[EMAIL PROTECTED]>**20080809000237]
[Split Cache mostly out of Darsc/Repository/Prefs into its own file (take 2)
[EMAIL PROTECTED]
[Make Darcs.Repository.Prefs export the cache hash function
[EMAIL PROTECTED]
[remove a few unsightly functions
Jason Dagit <[EMAIL PROTECTED]>**20080813061256]
[URL.hs: store only URL in waitToStart queue.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813122246]
[Fix URL module bug with pipelining enabled.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813081218]
[Minor change to URL module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813074218]
[Enable pipelining by default, add --disable-pipelining option (issue838).
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813011342]
[Generalize HashRepo.clean_pristine to HashIO.clean_hashdir.
[EMAIL PROTECTED]
[Add writeSlurpy to roll out a copy of slurpy into a filesystem.
[EMAIL PROTECTED]
[fix breakage in URL.
David Roundy <[EMAIL PROTECTED]>**20080812141220]
[Parametrize "pristine.hashed" in a bunch of functions.
[EMAIL PROTECTED]
[Rework URL module for multi threading.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080811221209]
[Print a warning when the remote end does not have darcs 2.
Eric Kow <[EMAIL PROTECTED]>**20080811100933
Two reasons:
(1) right now people get a scary warning from ssh when it can't fetch
some non-essential files (it used to be that we would send stderr from ssh
to /dev/null, but that has other problems...)
(2) darcs transfer-mode more widely deployed could help a lot of people
wrt darcs performance
]
[Added a beware note to the unrecord command
[EMAIL PROTECTED]
[Fixed typo
[EMAIL PROTECTED]
[make Convert.lhs compile.
David Roundy <[EMAIL PROTECTED]>**20080810201725]
[improve type safety of Darcs.Repository.Internal.
Jason Dagit <[EMAIL PROTECTED]>**20080810051109]
[Refactor `darcs convert' warning at kowey's request.
Trent W. Buck <[EMAIL PROTECTED]>**20080810110014]
[Expand formats text based in part on suggestions from darcs-users
Max Battcher <[EMAIL PROTECTED]>**20080809184043]
[Fixes to global cache text based on darcs-users suggestions
Max Battcher <[EMAIL PROTECTED]>**20080809181424]
[Add user-focused documentation of repository format options
Max Battcher <[EMAIL PROTECTED]>**20080807195429]
[Highlight the global cache as a best practice
Max Battcher <[EMAIL PROTECTED]>**20080807193918]
[Describe best practice in `darcs convert --help'.
Trent W. Buck <[EMAIL PROTECTED]>**20080810110615]
[add type witnesses to Population
Jason Dagit <[EMAIL PROTECTED]>**20080808053252]
[add type witnesses to CommandsAux
Jason Dagit <[EMAIL PROTECTED]>**20080808052738]
[Add type witnesses to more modules, rounding out Darcs/Repository/*
Jason Dagit <[EMAIL PROTECTED]>**20080808050947]
[fixed a bug in identity_commutes property
Jason Dagit <[EMAIL PROTECTED]>**20080808023025
In the right identity check the patch order should have gone from
(identity :> p) to (p2 :> i2). I added a rigid type context too
so that ghc 6.8 and newer would type the definition.
]
[Make Darcs.Repository.Internal compile with type witnesses.
Jason Dagit <[EMAIL PROTECTED]>**20080808015343]
[Add thread synchronization to URL module and resume select() if interrupted by signal in curl module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080810092810]
[Handle error case with empty URL in URL.waitNextUrl function.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809221755]
[Better debug messages in URL module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809215247]
[Add --debug-http flag to enable curl and libwww debug at run-time instead of compile-time.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809154834]
[UF8.lhs: remove unusued functions/imports/docs
[EMAIL PROTECTED]
[Resolve issue974 : do not pass both -optc-g and -opta-g to GHC
Eric Kow <[EMAIL PROTECTED]>**20080807073620]
[make this test more cross-platform
Simon Michael <[EMAIL PROTECTED]>**20080807103433]
[document how to run unit tests
Simon Michael <[EMAIL PROTECTED]>**20080807030416]
[move (most) failing tests to bugs for clean test output
Simon Michael <[EMAIL PROTECTED]>**20080806191336]
[fix an old spelling error
Simon Michael <[EMAIL PROTECTED]>**20080806170432]
[make searching for "test:" in makefile work
Simon Michael <[EMAIL PROTECTED]>**20080805222241]
[run only normal (expected to pass) tests by default
Simon Michael <[EMAIL PROTECTED]>**20080805222108]
[Downplay quantum mechanics link.
Eric Kow <[EMAIL PROTECTED]>**20080806124109
Besides, darcs has far more than 3 users by now.
]
[Make patch theory intro more inviting to math people.
Eric Kow <[EMAIL PROTECTED]>**20080806123411]
[cleanup and slight rewrite of the test docs
Simon Michael <[EMAIL PROTECTED]>**20080806165949]
[make order of running tests consistent
Simon Michael <[EMAIL PROTECTED]>**20080806172123]
[small makefile refactoring: allow just the normal tests to be run, without bugs/*
Simon Michael <[EMAIL PROTECTED]>**20080805203242]
[Rectify dist help
[EMAIL PROTECTED]
Removed the "make dist" suggestion, the manual is a better place for that.
Instead, make clear that it operates on a clean copy of the tree, and
mention the "predist" functionality.
]
[website: explain that darcs 2 is required to get the darcs source.
Simon Michael <[EMAIL PROTECTED]>**20080803181216]
[Canonize Gaetan Lehmann and Daniel Buenzli.
Eric Kow <[EMAIL PROTECTED]>**20080730104357
(for Daniel B, avoid an accent in his name)
]
[configure: check for packages needed with split base.
Eric Kow <[EMAIL PROTECTED]>**20080730103840
Now that all packages must be used explicitly.
]
[fix type witness compile errors specific to ghc 6.8
Jason Dagit <[EMAIL PROTECTED]>**20080722182729]
[avoid import of unused function fromMaybe.
David Roundy <[EMAIL PROTECTED]>**20080729172825]
[configure: suggest regex-compat before text
Eric Kow <[EMAIL PROTECTED]>**20080725095336]
[configure: mention Haskell in 'try installing' suggestion
Eric Kow <[EMAIL PROTECTED]>**20080725095015]
[Typo (Text.Regex)
Eric Kow <[EMAIL PROTECTED]>**20080715121708]
[Use haskeline to have a readline-like behavior when asking something to the user
[EMAIL PROTECTED]
Unlike the implementations using readline or editline packages, this code
code doesn't break the Ctrl-C behavior.
]
[Improve generic rules for English plurals.
Eric Kow <[EMAIL PROTECTED]>**20080604123728]
[add configure check for Network.URI.
David Roundy <[EMAIL PROTECTED]>**20080711011914]
[add -hide-all-packages to default GHCFLAGS.
David Roundy <[EMAIL PROTECTED]>**20080711010952]
[add support for outputting patch numbers in darcs changes.
David Roundy <[EMAIL PROTECTED]>**20080710011211]
[add support for matching single patches by index.
David Roundy <[EMAIL PROTECTED]>**20080710004512]
[add support for matching ranges of patches (counting back from present).
David Roundy <[EMAIL PROTECTED]>**20080710003225]
[Better avoid silly manpage error.
Trent W. Buck <[EMAIL PROTECTED]>**20080704024920
It turned out only initialize's help string used 'quotes', so just
remove them. This makes init's docstring consistent with the others.
]
[Missing period at end of sentence.
Trent W. Buck <[EMAIL PROTECTED]>**20080704024232]
[darcs --overview no longer works, so don't document it.
Trent W. Buck <[EMAIL PROTECTED]>**20080704030804]
[Avoid silly manpage error.
Trent W. Buck <[EMAIL PROTECTED]>**20080703010733
man (nroff) treats an apostrophe in the first column specially,
resulting in a syntax error without this patch.
Ideally, all cases of 'foo' in the manpage (i.e. docstrings) should
become `foo', since man -Tps turns ` and ' into left and right single
quotes respectively.
]
[obliterate whitespace in Darcs.Commands.Get
[EMAIL PROTECTED]
'twas causing lhs/haddock difficulties where a \end{code} wasn't getting recognized.
]
[rm haddock CPP business
[EMAIL PROTECTED]
Try as I might, I can't see any reason to special-case some Haddock CPP logic to deal with some *commented-out guards*, unless CPP magically restores and uncomments the code if Haddock isn't being run.
]
[make pull less verbose when --verbose flag is given.
David Roundy <[EMAIL PROTECTED]>**20080624170035]
[fix makefile to remember to regenerate version information after running configure.
David Roundy <[EMAIL PROTECTED]>**20080624170001]
[TAG 2.0.2
David Roundy <[EMAIL PROTECTED]>**20080624012041]
Patch bundle hash:
4d5222db9ae7648636f16df8f57722d94960de2f
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
