Commit graph

20143 commits

Author SHA1 Message Date
martin
b0b2e52bbf Added a comment: specification 2014-06-11 05:43:02 +00:00
Joey Hess
8ff9938d97 Fix build with wai 0.3.0.
This version of wai changed the type of Middleware, so I cannot seem
to liftIO inside it. So, got rid of a lot of not really needed
complexity to use System.Log.Logger's logging stuff, and just use
the standard wai stdout logger when debug logging is enabled.

Format may change some, and it logs http to stdout instead of stderr
now. Doesn't matter for the webapp since both go to the same log anyway.
2014-06-11 01:29:00 -04:00
Joey Hess
2d142b4368 Merge orca:tmp/f/build 2014-06-10 22:36:12 -04:00
Joey Hess
2b8dbfe7ab refreshed haskell patches 2014-06-11 03:35:19 +01:00
Joey Hess
201bb931a3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-10 19:23:00 -04:00
Joey Hess
4d692a9097
devblog 2014-06-10 19:22:11 -04:00
Joey Hess
a44fd2c019 export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
2014-06-10 19:20:14 -04:00
Joey Hess
6eb5e6c135 Windows: Fix opening webapp when repository is in a directory with spaces in the path. 2014-06-10 18:37:33 -04:00
Joey Hess
d4e71929ba figured out this patch 2014-06-10 16:33:47 -04:00
Joey Hess
8f6a8b69a2 update 2014-06-10 16:16:57 -04:00
http://joeyh.name/
3614706fd6 Added a comment 2014-06-10 19:31:38 +00:00
http://joeyh.name/
f7baa697e7 Added a comment 2014-06-10 19:27:55 +00:00
http://joeyh.name/
32037f0cc0 Added a comment 2014-06-10 19:11:57 +00:00
feulif
6d0e58cb1e Added a comment 2014-06-10 18:43:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
f4eecd8b4a Added a comment 2014-06-10 18:24:22 +00:00
http://joeyh.name/
26121a4f94 Added a comment: nssm notes 2014-06-10 18:16:00 +00:00
Joey Hess
d86b8368db skein patch seems to be needed for arm as well as android
I don't understand why this patch is needed.
2014-06-10 14:13:50 -04:00
Joey Hess
0fcc805bc9 vector patch also needed for arm 2014-06-10 12:42:09 -04:00
http://joeyh.name/
57e03b8fce Added a comment: magic 2014-06-10 16:13:35 +00:00
martin
9ece87c421 Added a comment: git-annex add (called by sync) should do the job and bring the files back home (IMHO) 2014-06-10 15:58:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
5ec8bcfaa7 Added a comment 2014-06-10 02:18:43 +00:00
Joey Hess
f08fcb5030 simplify 2014-06-09 20:32:11 -04:00
Joey Hess
03f186609f devblog 2014-06-09 20:16:01 -04:00
Joey Hess
ab72456bb3 avoid fast-forwarding when a merge conflict was auto-resolved 2014-06-09 20:10:12 -04:00
Joey Hess
2dfbbc6b43 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 19:47:31 -04:00
Joey Hess
d6711800ad avoid bad commits after interrupted direct mode sync (or merge)
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.

Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.

This commit was sponsored by Tony Cantor.
2014-06-09 19:40:28 -04:00
https://id.koumbit.net/anarcat
2c6929dd27 try to build an hybrid news feed 2014-06-09 23:24:20 +00:00
Joey Hess
193e702d73 harder 2014-06-09 17:43:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
b36bad94a1 Added a comment 2014-06-09 21:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
fe4eb0517d Added a comment 2014-06-09 20:34:55 +00:00
http://joeyh.name/
5f7d5c7d67 Added a comment 2014-06-09 19:44:49 +00:00
Joey Hess
920794ab6b bug 2014-06-09 15:43:52 -04:00
Joey Hess
70a00802a6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 15:32:24 -04:00
http://joeyh.name/
49cc5e1594 Added a comment 2014-06-09 19:29:09 +00:00
Joey Hess
7671d228af Avoid leaving behind .tmp files when failing in some cases, including importing files to a disk that is full. 2014-06-09 15:24:05 -04:00
Joey Hess
24915adab7 tagging 2014-06-09 15:09:03 -04:00
http://joeyh.name/
f50e8acb99 Added a comment 2014-06-09 18:57:25 +00:00
http://joeyh.name/
7dd162ba1f Added a comment 2014-06-09 18:46:01 +00:00
Joey Hess
787d9e27ba Ignore setsid failures. 2014-06-09 14:44:18 -04:00
Joey Hess
b6274745b4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 14:43:49 -04:00
Joey Hess
a59ac68c22 qualify comment 2014-06-09 13:48:44 -04:00
Joey Hess
1d4ba328e5 close; forwarded 2014-06-09 13:40:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
00b02383e2 Added a comment: build failure 2014-06-09 15:13:18 +00:00
Tamschi
fee77cc910 Added a comment: It's still impossible to use the git-annex repository on Windows. 2014-06-09 14:44:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
4b270fda85 Describe bug. 2014-06-08 12:54:27 +00:00
feulif
a1690ec3d6 Added a comment: Thank you 2014-06-08 08:36:40 +00:00
martin
f476e96e43 Added a comment: use case and answer to joey's question "...then when..." 2014-06-08 04:59:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
e4df4f6114 Added a comment: possible to have a view based on file location info? 2014-06-08 03:55:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
28cdd251a5 Added a comment: Android 2014-06-08 02:44:45 +00:00
Richard Hartmann
8c1a1ab416 Typo 2014-06-07 14:57:35 +02:00