mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12628 commits 13 branches 442 tags 103 MiB
Commit graph

268 commits

Author SHA1 Message Date
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
Joey Hess
a2d94bd627 Switch from using regex-compat to regex-tdfa, as the C regex library is rather buggy. 2013-03-08 15:29:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
850cad1cef fixed autobuild download link to point at apk instead of i386 tarball 2013-03-01 23:45:23 +00:00
Joey Hess
f3294fb84e better build instructions 2013-03-01 01:27:56 -04:00
Joey Hess
0151f42cdf Stop depending on testpack. 2013-02-27 23:23:41 -04:00
Joey Hess
18aa64179e adjust linux tarball tree 2013-02-27 18:02:19 -04:00
Joey Hess
0d7bc874b9 Android autobuild 2013-02-26 00:03:55 -04:00
Joey Hess
7af2227fe0 linux daily builds now available 2013-02-22 18:18:28 -04:00
Joey Hess
4971a2b99c link to new app 2013-02-21 16:57:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmCmNS-oUgYfNg85-LPuxzTZJUp0sIgprM
e20aaa8a35 Added a comment: more homebrew 2013-02-16 19:46:47 +00:00
Joey Hess
63f5284949 update; android tarball 2013-02-13 14:32:16 -04:00
Joey Hess
521398cc3d Now uses the Haskell Glob library, rather than pcre-light, avoiding the need to install libpcre. Currently done only for Cabal or when the Makefile is made to use -DWITH_GLOB 2013-02-11 11:47:53 -04:00
Joey Hess
f202d997f4 Now uses the Haskell uuid library, rather than needing a uuid program. 
Been meaning to do this for some time; Android port was last straw.

Note that newer versions of the uuid library have a Data.UUID.V4 that
generates random UUIDs slightly more cleanly, but Debian has an old version
of the library, so I do it slightly round-about.
 2013-02-10 14:52:54 -04:00
http://joeyh.name/
689b8136b3 Added a comment 2013-02-05 19:46:29 +00:00
Joey Hess
d3d791c7e7 addurl --fast: Use curl, rather than haskell HTTP library, to support https. 2013-01-27 09:30:53 +11:00
Joey Hess
9ba8abffc6 depend on both wget and curl 
wget is used due to having better progress output, but curl is used
in some cases where wget is not appropriate.
 2013-01-27 08:48:16 +11:00
Joey Hess
1713ed95f7 use async to track and manage threads 2013-01-26 14:14:32 +11:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
8b8c9fdeed Added a comment: git annex on Snow Leopard 2013-01-25 14:36:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmyFvkaewo432ELwtCoecUGou4v3jCP0Pc
42d01d1a8c Added a comment: Updating to latest build 2013-01-25 06:05:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
70c2dc1755 Added a comment: Segmentation Fault 2013-01-19 16:10:08 +00:00
http://joeyh.name/
0f61b31bcb Added a comment 2013-01-19 16:02:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
7540d642bc Added a comment: I couldn't install it on Snow Leopard 2013-01-19 15:04:27 +00:00
http://joeyh.name/
8a802f0f43 Added a comment 2013-01-18 20:16:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
ff11d735fb Added a comment: Snow Leopard 2013-01-18 17:57:40 +00:00
http://joeyh.name/
e1d44f8f6c Added a comment 2013-01-18 17:25:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
e9be487dcc Added a comment: Snow Leopard 2013-01-18 15:51:48 +00:00
Joey Hess
6241d4d085 ubuntu ppa 2013-01-16 15:41:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlDDW-g2WLLsLpcnCm4LykAquFY_nwbIrU
f9ec512c8f Added a comment 2013-01-15 15:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlDDW-g2WLLsLpcnCm4LykAquFY_nwbIrU
bdb0a4a3a3 Add missing depends to MacPorts port install call 2013-01-15 10:40:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawldeLGDQtdqk7f0EbvSv48XRWEKFxzdYmU
07a42c6404 removed 2013-01-02 22:50:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawldeLGDQtdqk7f0EbvSv48XRWEKFxzdYmU
0ed8cb7997 Added a comment: macports 2013-01-02 22:47:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
e610c36276 sudo should not be used with homebrew 2012-12-26 01:34:47 +00:00
Joey Hess
da8fbb9e3e adjust path for logs 2012-12-21 15:06:22 -04:00
Joey Hess
f878141286 moved my autobuild 2012-12-21 15:05:08 -04:00
Joey Hess
0846d60c3c new autobuilder 2012-12-17 19:47:39 -04:00
Joey Hess
00fd541304 OSX Mountian Lion builds now available 2012-12-17 12:59:18 -04:00
Joey Hess
2bfaa8a647 move away 2 old comments that I think are now addressed in the install instructions 2012-12-14 22:27:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
63ae950f9e Added a comment 2012-12-10 17:00:44 +00:00
Joey Hess
0a52db2ea9 improve cabal instructions to handle installing c2hs 2012-12-09 11:51:45 -04:00
Joey Hess
38d94539ac add libxml2 to brew instructions 2012-12-06 18:18:06 -04:00
Joey Hess
4f7530afd9 update cabal install instructions to get c2hs installed for gnuidn 2012-11-28 14:03:35 -04:00
Joey Hess
c9f293e18b reorg OSX bugs 2012-11-26 13:35:43 -04:00
Joey Hess
66c0da1fa9 build-depend on a recent mtl 
Old versions have an insufficiently generic definition of reader,
which only works on ReaderT and not on newtypes made of it, or something
like that.
 2012-11-25 16:24:05 -04:00
http://svend.ciffer.net/
17f6022868 Added a comment 2012-11-23 21:38:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk3eiQwrpDGJ3MJb9NWB84m4tzQ6XjVZnY
636c06e88b Added a comment: wheezy support 2012-11-23 20:47:58 +00:00
http://edheil.wordpress.com/
2dd397fd9a Added a comment: No luck running it on OS X Lion. 2012-11-21 06:07:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkN91jAhoesnVI9TtWANaBPaYjd1V9Pag8
1721df0a02 Added a comment: Package for older OS X 2012-11-17 12:36:46 +00:00
Joey Hess
35e1aef2b8 Merge branch 'master' into webdav 2012-11-16 18:14:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkp-1EQboBDqZ05MxOHNkwNQDM4luWYioA
3424a00414 Added a comment 2012-11-15 13:26:57 +00:00
Joey Hess
0cba0cb2dd skeltal webdav special remote 
Doesn't actually store anything yet, but initremote works and tests the
server.
 2012-11-14 20:25:31 -04:00
Joey Hess
cf565c0098 remove async build dep 
Not needed.. At least for now..
 2012-11-14 11:53:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBEsNDl_6O4rHb2en3I0-fg-6fUxglaRQ
b68071ff9d Added a comment: Recent install for OS X 2012-11-13 04:40:07 +00:00
Joey Hess
b312e54ba7 added a runTimeout function 
This adds a dep on haskell's async library, but since that's been
added to the recent haskell platform release, it should not be
much hardship to my poor long-suffering library chasing users.
 2012-11-11 13:38:08 -04:00
Joey Hess
dd9fd5eded add packages I'm told are now needed to build from brew 2012-11-09 11:28:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
58cfee5a6b Added a comment 2012-11-07 16:08:00 +00:00