Commit graph

25806 commits

Author SHA1 Message Date
Joey Hess
32fedcf56a
Merge branch 'master' of ssh://git-annex.branchable.com 2015-11-05 18:57:35 -04:00
Joey Hess
758efa9230
devbog 2015-11-05 18:49:16 -04:00
Joey Hess
362ab39aad
import -J fails at the end, disable util it can be fixed 2015-11-05 18:48:46 -04:00
Joey Hess
7dc90f2225
import: Avoid very ugly error messages when the directory files are imported to is not a directort, but perhaps an annexed file. 2015-11-05 18:46:05 -04:00
Joey Hess
5db7d435e7
-J for add/addurl/import 2015-11-05 18:24:15 -04:00
Joey Hess
31472161e4
merge git command queue when joining with concurrent thread 2015-11-05 18:21:48 -04:00
Joey Hess
ab6b1edfee
join back threads before ending concurrent output so display works
I didn't really want to put allowConcurrentOutput in CmdLine.Action,
but there were dep loops and that was the best place available.
2015-11-05 17:23:26 -04:00
Joey Hess
2ca52b4a9d
needs concurrent-output 1.6 for bugfixes and windows port 2015-11-05 16:13:10 -04:00
berend.van.berkum@0cc715f45d5a86c134f9192722f7adef9dc63488
34abd76bf7 2015-11-05 18:58:25 +00:00
OlivierBerger
6097d6b06d 2015-11-05 09:30:23 +00:00
gmazzurco89@89ed4f74a057a9c71b2a00000fdb201a88f81bcd
286bce874e Added a comment 2015-11-05 07:28:02 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
4780318ea9 2015-11-04 23:29:15 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
50ba4f2a95 2015-11-04 23:28:46 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
f73c762bc3 2015-11-04 23:25:21 +00:00
Joey Hess
db745a8616
Merge branch 'master' of ssh://git-annex.branchable.com 2015-11-04 18:37:42 -04:00
Joey Hess
f2f75ccca7
devblog 2015-11-04 18:36:46 -04:00
Joey Hess
c4d45ef83d
drop -Jn 2015-11-04 17:13:20 -04:00
Joey Hess
c6fc0945f3
update 2015-11-04 17:03:32 -04:00
Joey Hess
e620073936
don't display blank regions once done 2015-11-04 16:58:19 -04:00
Joey Hess
340208f86b
remove some debug prints 2015-11-04 16:30:55 -04:00
Joey Hess
3d0f41518d
parallel fsck (yes, these changes are all it takes now!) 2015-11-04 16:28:14 -04:00
Joey Hess
c0c595345c
arrange for regional output manager to run when -J is enabled
Commands that want to use it have to run their seek action inside
allowConcurrentOutput. Which seems reasonable; perhaps some future command
will want to support the -J flag but not use regions.

The region state moved from Annex to MessageState. This makes sense
organizationally, and note that some uses of onLocal use a different Annex
state, but pass the MessageState into it, which is what is needed.
2015-11-04 16:22:43 -04:00
alex@7ca398785b94de08e4386b708f32ff9f1af381c7
3f0a1ef495 Added a comment: backblaze support 2015-11-04 19:58:35 +00:00
Joey Hess
a4dd8503b8
add regions to concurrent output
still no progress displays when getting files etc, but a big improvement
2015-11-04 14:52:07 -04:00
Joey Hess
4fd03ccd7b
concurrent-output, first pass
Output without -Jn should be unchanged from before. With -Jn,
concurrent-output is used for messages, but regions are not used yet, so
it's a mess.
2015-11-04 13:45:34 -04:00
a@b34f238966e58f7c2ea550cc4cab3005c0e33150
e9cdce696b 2015-11-04 01:54:06 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
d3789a5af2 Added a comment 2015-11-03 16:34:40 +00:00
Joey Hess
30e39592b4
response 2015-11-03 12:20:52 -04:00
Joey Hess
0bcfd09c92
Merge branch 'master' of ssh://git-annex.branchable.com 2015-11-03 12:12:53 -04:00
Joey Hess
61987c6983
point release for cabal file fixes
Seems that some changes to the cabal file a few months ago resulted in a
git-annex that broke stackage infrastructure.
2015-11-03 12:10:01 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
440193a71a 2015-11-03 15:20:24 +00:00
Joey Hess
17ebe39302
Merge branch 'master' of ssh://git-annex.branchable.com 2015-11-03 11:15:06 -04:00
Joey Hess
0dbe93477c
improve warning 2015-11-03 11:06:33 -04:00
Joey Hess
e5323f4414
got logic backwards.. 2015-11-03 10:51:21 -04:00
Joey Hess
628429f1b0
When cabal install is run with the desktop file location not writable, display a warning, but continue successfully.
Installing the desktop file etc is a niceity of git-annex's cabal install,
but not a requirement.

closes https://github.com/fpco/stackage/issues/726
2015-11-03 10:47:33 -04:00
Joey Hess
0717ad4440
Avoid installing desktop file and program file if cabal install git-annex is run as root, since that is not a systemwide install, but to /root, and so generating a systemwide desktop file is not right. 2015-11-03 10:38:08 -04:00
Joey Hess
924668f27c
devblog 2015-11-02 23:39:03 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
bf0b84a86d 2015-11-02 20:59:38 +00:00
Joey Hess
2d5209d6f9
add news item for git-annex 5.20151102 2015-11-02 13:05:57 -04:00
Joey Hess
29d250923b
prep release 2015-11-02 12:41:33 -04:00
Joey Hess
81006fe1c8
followup 2015-11-02 11:56:29 -04:00
Joey Hess
7d06b04788
meant to be in prev commit 2015-11-02 11:22:02 -04:00
Joey Hess
a7de3a67aa
Merge branch 'master' of ssh://git-annex.branchable.com 2015-11-02 11:19:48 -04:00
Joey Hess
e806e62fa3
document default --autostart --startdelay=5 and comment 2015-11-02 11:18:44 -04:00
Joey Hess
4153507864
Fix failure to build with aws-0.13.0 and finish nearline support.
* Fix failure to build with aws-0.13.0.
* When built with aws-0.13.0, the S3 special remote can be used to create
  google nearline buckets, by setting storageclass=NEARLINE.
2015-11-02 11:14:03 -04:00
edward
6d9d093c5d fix typo: quite -> quiet 2015-11-02 10:10:10 +00:00
skrug@99b63a3f040bc693f0f81a9080e1a4a47ee81312
3b4045f395 2015-11-01 16:56:31 +00:00
skrug@99b63a3f040bc693f0f81a9080e1a4a47ee81312
299735bee2 2015-11-01 16:50:39 +00:00
https://openid-provider.appspot.com/ndurner@1a2a109daa9ab9880e5c3265d0a7604b0c281614
279313c19d 2015-11-01 12:34:16 +00:00
Joey Hess
e9c7cc316e
Merge branch 'master' of ssh://git-annex.branchable.com 2015-10-30 21:47:09 -04:00