Commit graph

11056 commits

Author SHA1 Message Date
Joey Hess
0bc43407e5 do a clean build if incremental fails 2013-05-19 20:35:33 -04:00
Joey Hess
b5433c3a9d Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 18:26:15 -04:00
Joey Hess
2f8bfaea4e blog for the day 2013-05-19 18:20:48 -04:00
Joey Hess
796c2f6bc8 remove unnecessary bracketIO 2013-05-19 18:15:29 -04:00
http://joeyh.name/
4186a6f40c Added a comment 2013-05-19 22:03:57 +00:00
Joey Hess
66fe5beac2 update 2013-05-19 18:03:38 -04:00
Joey Hess
d5ba9cb728 Allow building with gpg2. 2013-05-19 17:59:58 -04:00
Joey Hess
8688f08804 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 17:59:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
97ca0eb516 removed 2013-05-19 21:57:40 +00: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
29d8cc8b76 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 17:57:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
1061eed106 Added a comment: Official Raring build also does not have the Assistant enabled 2013-05-19 21:52:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
0f4af3cbe7 Added a comment 2013-05-19 21:35:37 +00:00
Joey Hess
c552336621 idea 2013-05-19 17:29:20 -04:00
http://me.tinco.nl/
05dad9325d Added a comment 2013-05-19 21:24:48 +00:00
Joey Hess
7b2bb513a0 moreinfo 2013-05-19 17:24:13 -04:00
http://joeyh.name/
cf9c7f3153 Added a comment 2013-05-19 21:13:41 +00:00
http://joeyh.name/
7a2fba971b Added a comment 2013-05-19 21:09:54 +00:00
Joey Hess
db6ff0f688 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 16:58:57 -04:00
Joey Hess
3f2739086e close; was wrong password 2013-05-19 16:57:47 -04:00
http://joeyh.name/
f1d241a465 Added a comment 2013-05-19 20:56:25 +00:00
http://joeyh.name/
40a0f4c6e4 removed 2013-05-19 20:50:52 +00:00
http://joeyh.name/
20f5790cf3 Added a comment 2013-05-19 20:49:06 +00:00
http://me.tinco.nl/
3fb592fe7e Added a comment 2013-05-19 20:45:53 +00:00
Joey Hess
02a92f8066 move todo item that wasn't to the forum, with a better title 2013-05-19 16:45:08 -04:00
http://joeyh.name/
471927b767 Added a comment 2013-05-19 20:43:44 +00:00
http://joeyh.name/
bc46148517 Added a comment 2013-05-19 20:29:25 +00:00
http://joeyh.name/
9f14f054c7 Added a comment 2013-05-19 20:18:13 +00:00
http://joeyh.name/
b43d3dfbc2 Added a comment 2013-05-19 20:12:18 +00:00
Joey Hess
051ac16a55 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 16:08:44 -04:00
http://joeyh.name/
9de4cbfd86 Added a comment 2013-05-19 20:06:56 +00:00
tomas
268f20e49b Added a comment: Problems syncing with box.com 2013-05-19 19:56:09 +00:00
http://joeyh.name/
f761a854f3 Added a comment 2013-05-19 19:53:04 +00:00
Joey Hess
96923819e7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 15:52:57 -04:00
Joey Hess
1c72e0709b Fix a zombie that could result when running a process like gpg to read and write to it. 2013-05-19 15:52:22 -04:00
http://joeyh.name/
59407ddc43 Added a comment 2013-05-19 19:46:14 +00:00
http://joeyh.name/
977bc4da51 Added a comment 2013-05-19 19:35:51 +00:00
http://me.tinco.nl/
95ff77ebef Added a comment 2013-05-19 19:27:03 +00:00
http://joeyh.name/
328c38d472 Added a comment 2013-05-19 19:12:59 +00:00
Joey Hess
6d7d5f1be9 close 2013-05-19 15:10:08 -04:00
http://joeyh.name/
3db2dceaa1 Added a comment 2013-05-19 18:50:07 +00:00
Joey Hess
21d5489bd3 typo 2013-05-19 14:46:48 -04:00
GLITTAH
63777dfb1b 2013-05-19 18:43:59 +00:00
GLITTAH
3460119a31 2013-05-19 18:41:34 +00:00
Joey Hess
7eb6af07b9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 14:25:08 -04: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
630a8b9ad2 warning 2013-05-19 12:43:44 -04:00
http://joeyh.name/
4e082feb8c Added a comment 2013-05-19 16:39:45 +00:00
http://me.tinco.nl/
870a77fa26 Added a comment 2013-05-19 15:37:24 +00:00
http://me.tinco.nl/
300646eb6a Added a comment 2013-05-19 15:35:27 +00:00