Commit graph

222 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawlQ7ZdQxAps4v0cl5J3wKGWD8243Gy8-m0
2ef63c6d80 Added a comment: PPA Package Pinning 2013-05-23 21:18:14 +00:00
Joey Hess
668e073829 fix link to windows autobuild 2013-05-21 14:28:12 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
ddd99d3296 Added a comment 2013-05-20 15:53:25 +00:00
Joey Hess
66fe5beac2 update 2013-05-19 18:03:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
77d01941a4 Add note about no webapp in Raring 2013-05-19 21:57:27 +00:00
Joey Hess
345ee4f37c Switch to MonadCatchIO-transformers for better handling of state while catching exceptions.
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.
2013-05-19 14:16:36 -04:00
Joey Hess
83db599b6e remove old comments, there is a build script now 2013-05-17 14:36:47 -04:00
Joey Hess
51592944a2 fix link 2013-05-17 14:36:16 -04:00
Joey Hess
ddf98cd644 update 2013-05-17 13:45:33 -04:00
Joey Hess
4ba6a88aba update with autobuilder 2013-05-17 13:38:45 -04:00
Joey Hess
ebe10edf67 add dep needed with newer ghc 2013-05-17 11:24:07 -04:00
http://joeyh.name/
47a035b748 Added a comment 2013-05-16 16:17:52 +00:00
Joey Hess
4f8b21a0d5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-16 10:44:52 -04:00
Joey Hess
96ec715292 typo 2013-05-15 22:31:56 -04:00
http://joeyh.name/
8a265448b7 Added a comment 2013-05-16 02:29:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
a97a6d6792 Added a comment 2013-05-16 02:22:26 +00:00
Joey Hess
aba49995b6 Merge branch 'master' into windows 2013-05-15 19:18:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
758537d329 Added a comment 2013-05-15 18:29:19 +00:00
Joey Hess
9a8fec717f update 2013-05-14 20:12:13 -04:00
Joey Hess
dc66b1f27d Merge branch 'master' into windows
Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs
2013-05-14 15:37:24 -04:00
Joey Hess
49e9296d5f update 2013-05-14 15:14:11 -04:00
Joey Hess
b28358509f update
No need to edit Makefile to disable webapp build anymore; just build w/o
dependencies installed.
2013-05-13 13:47:11 -04:00
Joey Hess
f6fee49227 update for Windows 2013-05-13 13:46:03 -04:00
Joey Hess
cd928eeed8 reorg 2013-05-13 13:40:41 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlJemqsekZTC5dvc-MAByUWaBvsYE-mFUo
98a5005455 Added a comment: Cabal dependencies 2013-05-12 12:52:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlJemqsekZTC5dvc-MAByUWaBvsYE-mFUo
c633334241 removed 2013-05-12 12:44:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlJemqsekZTC5dvc-MAByUWaBvsYE-mFUo
831825fb5d Added a comment: Cabal dependencies 2013-05-12 12:02:43 +00:00
Joey Hess
924ed999c5 add unix-compat to deps 2013-05-11 17:21:12 -04:00
Joey Hess
d935314473 last few fixes to install-haskell-packages 2013-05-08 22:33:30 -04:00
Joey Hess
0a84e2b142 update 2013-05-08 16:18:27 -04:00
Joey Hess
2e50754661 Android page 2013-05-03 12:29:52 -04:00
Joey Hess
8bf07b530f update 2013-04-27 11:21:58 -04:00
Joey Hess
4d5d8c2f85 update, add fmarier PPA 2013-04-27 11:21:48 -04:00
Joey Hess
25aabf4ffe add TList, built on DList 2013-04-24 16:01:01 -04:00
http://edheil.wordpress.com/
6ce3003afe Added a comment 2013-04-18 02:05:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc
7e177f3e5f Added a comment: Can't update 2013-04-18 00:58:21 +00:00
Joey Hess
7d11511d54 new build dep 2013-04-16 19:00:44 -04:00
http://joeyh.name/
0d938c0f02 Added a comment 2013-04-16 20:31:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc
ca340097d1 Added a comment: Snow Leopard Issues 2013-04-14 20:17:17 +00:00
Joey Hess
0a77d4b716 fix link 2013-04-06 16:55:07 -04:00
Joey Hess
8519a06ac4 link to gitannex-install 2013-04-06 16:23:30 -04:00
Joey Hess
c3895c05ca amd64 autobuild 2013-04-02 20:08:05 -04:00
EskildHustvedt
d440fbacc0 Added instructions on using cabal to install git-annex on Fedora 18 2013-04-02 15:22:44 +00:00
https://launchpad.net/~wincus
ca4db7af99 Added a comment: git annex on Snow Leopard 2013-03-26 16:02:55 +00:00
http://adamspiers.myopenid.com/
30ba38a43c update openSUSE install info 2013-03-23 01:16:51 +00:00
Joey Hess
ff912832c0 reorganize osx app, so it can be put in PATH
Move all the binaries and libraries under a bundle/ subdirectory;
so when it's in PATH only git-annex, runshell, and git-annex-webapp
will be available.
2013-03-20 14:01:05 -04:00
Joey Hess
36b3c4c757 improve linux standalone bundle instuctions, mentioning the PATH setup option 2013-03-20 13:40:57 -04:00
Joey Hess
cd9ad7902d link 2013-03-19 14:16:42 -04:00
Joey Hess
3d4e76b616 typo 2013-03-19 14:15:29 -04:00
Joey Hess
400b844577 add OSX runshell documentation 2013-03-19 14:12:47 -04:00