345ee4f37c
As seen in this bug report, the lifted exception handling using the StateT monad throws away state changes when an action throws an exception. http://git-annex.branchable.com/bugs/git_annex_fork_bombs_on_gpg_file/ .. Which can result in cached values being redundantly calculated, or other possibly worse bugs when the annex state gets out of sync with reality. This switches from a StateT AnnexState to a ReaderT (MVar AnnexState). All changes to the state go via the MVar. So when an Annex action is running inside an exception handler, and it makes some changes, they immediately go into affect in the MVar. If it then throws an exception (or even crashes its thread!), the state changes are still in effect. The MonadCatchIO-transformers change is actually only incidental. I could have kept on using lifted-base for the exception handling. However, I'd have needed to write a new instance of MonadBaseControl for the new monad.. and I didn't write the old instance.. I begged Bas and he kindly sent it to me. Happily, MonadCatchIO-transformers is able to derive a MonadCatchIO instance for my monad. This is a deep level change. It passes the test suite! What could it break? Well.. The most likely breakage would be to code that runs an Annex action in an exception handler, and *wants* state changes to be thrown away. Perhaps the state changes leaves the state inconsistent, or wrong. Since there are relatively few places in git-annex that catch exceptions in the Annex monad, and the AnnexState is generally just used to cache calculated data, this is unlikely to be a problem. Oh yeah, this change also makes Assistant.Types.ThreadedMonad a bit redundant. It's now entirely possible to run concurrent Annex actions in different threads, all sharing access to the same state! The ThreadedMonad just adds some extra work on top of that, with its own MVar, and avoids such actions possibly stepping on one-another's toes. I have not gotten rid of it, but might try that later. Being able to run concurrent Annex actions would simplify parts of the Assistant code.
156 lines
4.3 KiB
Text
156 lines
4.3 KiB
Text
Name: git-annex
|
|
Version: 4.20130516
|
|
Cabal-Version: >= 1.8
|
|
License: GPL
|
|
Maintainer: Joey Hess <joey@kitenet.net>
|
|
Author: Joey Hess
|
|
Stability: Stable
|
|
Copyright: 2010-2013 Joey Hess
|
|
License-File: COPYRIGHT
|
|
Homepage: http://git-annex.branchable.com/
|
|
Build-type: Custom
|
|
Category: Utility
|
|
Synopsis: manage files with git, without checking their contents into git
|
|
Description:
|
|
git-annex allows managing files with git, without checking the file
|
|
contents into git. While that may seem paradoxical, it is useful when
|
|
dealing with files larger than git can currently easily handle, whether due
|
|
to limitations in memory, time, or disk space.
|
|
.
|
|
Even without file content tracking, being able to manage files with git,
|
|
move files around and delete files with versioned directory trees, and use
|
|
branches and distributed clones, are all very handy reasons to use git. And
|
|
annexed files can co-exist in the same git repository with regularly
|
|
versioned files, which is convenient for maintaining documents, Makefiles,
|
|
etc that are associated with annexed files but that benefit from full
|
|
revision control.
|
|
|
|
Flag S3
|
|
Description: Enable S3 support
|
|
|
|
Flag WebDAV
|
|
Description: Enable WebDAV support
|
|
|
|
Flag Inotify
|
|
Description: Enable inotify support
|
|
|
|
Flag Dbus
|
|
Description: Enable dbus support
|
|
|
|
Flag Assistant
|
|
Description: Enable git-annex assistant and watch command
|
|
|
|
Flag Webapp
|
|
Description: Enable git-annex webapp
|
|
|
|
Flag Pairing
|
|
Description: Enable pairing
|
|
|
|
Flag XMPP
|
|
Description: Enable notifications using XMPP
|
|
|
|
Flag DNS
|
|
Description: Enable the haskell DNS library for DNS lookup
|
|
|
|
Flag Production
|
|
Description: Enable production build (slower build; faster binary)
|
|
|
|
Flag Android
|
|
Description: Building for Android
|
|
Default: False
|
|
|
|
Flag TestSuite
|
|
Description: Embed the test suite into git-annex
|
|
|
|
Flag TDFA
|
|
Description: Use regex-tdfa for wildcards
|
|
|
|
Executable git-annex
|
|
Main-Is: git-annex.hs
|
|
Build-Depends: MissingH, hslogger, directory, filepath,
|
|
containers, utf8-string, network (>= 2.0), mtl (>= 2),
|
|
bytestring, old-locale, time, HTTP,
|
|
extensible-exceptions, dataenc, SHA, process, json,
|
|
base (>= 4.5 && < 4.8), monad-control, MonadCatchIO-transformers,
|
|
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
|
|
SafeSemaphore, uuid, random, dlist, unix-compat
|
|
-- Need to list these because they're generated from .hsc files.
|
|
Other-Modules: Utility.Touch Utility.Mounts
|
|
Include-Dirs: Utility
|
|
C-Sources: Utility/libdiskfree.c Utility/libmounts.c
|
|
CC-Options: -Wall
|
|
GHC-Options: -Wall
|
|
CPP-Options: -DWITH_CLIBS
|
|
Extensions: PackageImports
|
|
|
|
if flag(Production)
|
|
GHC-Options: -O2
|
|
|
|
if os(windows)
|
|
CPP-Options: -D__WINDOWS__
|
|
else
|
|
Build-Depends: unix
|
|
|
|
if flag(TestSuite)
|
|
Build-Depends: HUnit
|
|
CPP-Options: -DWITH_TESTSUITE
|
|
|
|
if flag(TDFA)
|
|
Build-Depends: regex-tdfa
|
|
CPP-Options: -DWITH_TDFA
|
|
|
|
if flag(S3)
|
|
Build-Depends: hS3
|
|
CPP-Options: -DWITH_S3
|
|
|
|
if flag(WebDAV)
|
|
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
|
|
CPP-Options: -DWITH_WEBDAV
|
|
|
|
if flag(Assistant) && ! os(windows) && ! os(solaris)
|
|
Build-Depends: async, stm (>= 2.3)
|
|
CPP-Options: -DWITH_ASSISTANT
|
|
GHC-Options: -threaded
|
|
|
|
if flag(Android)
|
|
Build-Depends: data-endian
|
|
CPP-Options: -D__ANDROID__
|
|
|
|
if os(linux) && flag(Inotify)
|
|
Build-Depends: hinotify
|
|
CPP-Options: -DWITH_INOTIFY
|
|
else
|
|
if os(darwin)
|
|
Build-Depends: hfsevents
|
|
CPP-Options: -DWITH_FSEVENTS
|
|
else
|
|
if (! os(windows) && ! os(solaris) && ! os(linux))
|
|
CPP-Options: -DWITH_KQUEUE
|
|
C-Sources: Utility/libkqueue.c
|
|
|
|
if os(linux) && flag(Dbus)
|
|
Build-Depends: dbus (>= 0.10.3)
|
|
CPP-Options: -DWITH_DBUS
|
|
|
|
if flag(Webapp)
|
|
Build-Depends: yesod (< 1.2), yesod-static, case-insensitive,
|
|
http-types, transformers, wai, wai-logger, warp, blaze-builder,
|
|
crypto-api, hamlet, clientsession, aeson, yesod-form,
|
|
template-haskell, yesod-default, data-default
|
|
CPP-Options: -DWITH_WEBAPP
|
|
|
|
if flag(Pairing)
|
|
Build-Depends: network-multicast, network-info
|
|
CPP-Options: -DWITH_PAIRING
|
|
|
|
if flag(XMPP)
|
|
Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types
|
|
CPP-Options: -DWITH_XMPP
|
|
|
|
if flag(DNS)
|
|
Build-Depends: dns
|
|
CPP-Options: -DWITH_DNS
|
|
|
|
source-repository head
|
|
type: git
|
|
location: git://git-annex.branchable.com/
|