Commit graph

240 commits

Author SHA1 Message Date
https://openid.fmarier.org/
29d5bb94b4 Added a comment: New PPA only contains git-annex 2013-06-15 07:45:14 +00:00
https://openid.fmarier.org/
d073482cb2 update to my new git-annex PPA 2013-06-15 07:44:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9J51AO9t75xN5k0sJgg8taUo4y0a4hpQ
49ea56e81c 2013-06-11 19:04:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9J51AO9t75xN5k0sJgg8taUo4y0a4hpQ
89969b2622 Added cabal bin path for brew 2013-06-10 19:00:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnEgT3Gxm4AAK4zu3ft5-PsUmY6dr1F-gE
f33b0421bd Added a comment: OSX app bundle 2013-06-05 17:35:49 +00:00
Joey Hess
8100cad9d5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-30 21:49:36 -04:00
http://hands.com/~phil/
739e492487 Added a comment 2013-05-30 19:56:07 +00:00
http://joeyh.name/
02cd242ca0 Added a comment 2013-05-30 19:42:05 +00:00
Joey Hess
13bf70107e update 2013-05-30 15:17:26 -04:00
http://hands.com/~phil/
2e0f464aee Added a comment: any chance of a wheezy-backports upload? 2013-05-30 18:43:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
83f20a1174 Added a comment: Some errors after the build 2013-05-30 16:38:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
1f132810a2 Added a comment: Re: Comment 3 2013-05-30 16:29:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
bc63a5be57 Added a comment: Re: Comment 3 2013-05-30 15:48:44 +00:00
http://joeyh.name/
a18ff3defc Added a comment 2013-05-30 15:25:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
fb0a917e01 Added a comment: E: Unable to locate package libghc-libxml-sax-dev 2013-05-30 15:05:47 +00:00
http://joeyh.name/
a358dc8206 Added a comment 2013-05-29 16:23:12 +00:00
http://mey.vn/
2b61bcbfc0 Added a comment: libc6 dep version on amd64 2013-05-28 15:28:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs
7298f95a76 Added a step I had to do on my own OS X machine with 10.6 in order for the build to work. 2013-05-25 18:36:37 +00:00
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