Commit graph

28487 commits

Author SHA1 Message Date
Joey Hess
3e22d60549
copy, move, mirror: Support --json and --json-progress. 2016-09-09 16:24:26 -04:00
Joey Hess
c277a21ece
done 2016-09-09 16:17:28 -04:00
Joey Hess
d4fbc3b460
make --json-progress work for url downloads 2016-09-09 16:15:39 -04:00
Joey Hess
312ef4dfae
make --json-progress update meter when getting from git remote with rsync 2016-09-09 16:05:45 -04:00
Joey Hess
a108235565
better locking for json with -J
Avoid threads emitting json at the same time and scrambling, which was
still possible even with the buffering, just less likely.

Converted json IO actions to JSONChunk data too.
2016-09-09 15:51:34 -04:00
Joey Hess
05d4438383
addurl, get: Added --json-progress option, which adds progress objects to the json output.
This doesn't work right when used with -J yet, and there is some really
ugly hand-crafting of part of the json output.
2016-09-09 15:06:54 -04:00
Joey Hess
f421a7f001
Remove key:null from git-annex add --json output. 2016-09-09 14:26:34 -04:00
Joey Hess
4a09b4bbbd
make maybeShowJSON also add to the buffer 2016-09-09 14:21:06 -04:00
Joey Hess
089c592977
buffer json output until done when in concurrent mode 2016-09-09 13:21:38 -04:00
Joey Hess
8ef494a833
disentangle concurrency and message type
This makes -Jn work with --json and --quiet, where before
setting -Jn disabled those options.

Concurrent json output is currently a mess though since threads output
chunks over top of one-another.
2016-09-09 12:57:42 -04:00
Joey Hess
8e9267a1ed
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 13:20:22 -04:00
Joey Hess
d4c9711844
still update othermeter when not displaying progress at console
See no reason not to do this; the othermeter will be updating a transfer
info file or the like.
2016-09-08 13:18:07 -04:00
Joey Hess
e0fae28c72
Rate limit console progress display updates to 10 per second. Was updating as frequently as changes were reported, up to hundreds of times per second, which used unncessary bandwidth when running git-annex over ssh etc. 2016-09-08 13:17:43 -04:00
Joey Hess
2cb94bf026
comment 2016-09-08 12:32:10 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
b9d8c97942 Added a comment: also CPU (on git and git-annex processes) doesn't go to 100% 2016-09-08 16:32:08 +00:00
Joey Hess
079c5a03c6
comment 2016-09-08 12:24:20 -04:00
Joey Hess
442558aecf
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 12:19:33 -04:00
Joey Hess
dff511a2fe
update 2016-09-08 12:18:58 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
fc795e84a4 Added a comment 2016-09-08 16:12:08 +00:00
Joey Hess
673065ea05
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 12:06:11 -04:00
Joey Hess
41191ce9ad
designs 2016-09-08 12:04:09 -04:00
https://me.yahoo.com/a/yx5Y6EI1t.759Jsu63ZWqYclCmpOmxxd.ramtw--#7114a
9b48eeba87 2016-09-08 13:09:22 +00:00
pigmonkey
8f0ba291e7 Added a comment 2016-09-07 20:38:36 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
8dbe7a6a26 Added a comment: This seems relevant to the comment directly previous this one. 2016-09-07 20:27:49 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
b9041def67 Added a comment: Build failure 2016-09-07 18:25:20 +00:00
Joey Hess
de7b2ffa72
avoid deprecation warning from parseUrl 2016-09-07 12:02:38 -04:00
Joey Hess
a7a301fd7d
add news item for git-annex 6.20160907 2016-09-07 11:33:55 -04:00
Joey Hess
ad0a7f6cb3
prep release 2016-09-07 11:12:33 -04:00
Joey Hess
e33f9f22a6
followup 2016-09-07 11:11:54 -04:00
Joey Hess
ae658ddcdc
close; notabug 2016-09-07 11:07:42 -04:00
Joey Hess
d18bc92251
remove cruft 2016-09-07 11:07:25 -04:00
pigmonkey
ed0a7b0ad9 Added a comment 2016-09-06 23:10:47 +00:00
onionjake
9aacde3f65 Added a comment 2016-09-06 19:45:06 +00:00
onionjake
a885d23bad you can create bugs with empty titles 2016-09-06 19:44:11 +00:00
Joey Hess
34e137e6b3
devblog 2016-09-06 15:19:53 -04:00
Joey Hess
aee5db0d47
squelch build warning on windows 2016-09-06 14:59:32 -04:00
Joey Hess
dceb0cc627
typo 2016-09-06 14:51:15 -04:00
Joey Hess
b9e2061b2a
stop removing old builds again 2016-09-06 14:38:47 -04:00
Joey Hess
03b031554f
avoid build warnings when building w/o concurrent-output 2016-09-06 14:36:15 -04:00
Joey Hess
867fd50637
fix build with pre-AMP ghc 2016-09-06 14:23:53 -04:00
Joey Hess
833a80ae89
pin mwc-random to last known working version on windows 2016-09-06 14:18:04 -04:00
Joey Hess
ddf4e0a4ed
revert 3fac05bf5e
This broke the windows build, the android build, the debian stable build, ...
2016-09-06 14:14:06 -04:00
Joey Hess
fd02af6136
constrain cryptonite version to avoid windows build fail
https://github.com/haskell-crypto/cryptonite/issues/99
2016-09-06 13:50:55 -04:00
Joey Hess
022382160a
try using cabal constraint 2016-09-06 13:25:02 -04:00
Joey Hess
d242e21968
perisstent-sqlite-2.2.1 fails to build on windows 2016-09-06 13:13:07 -04:00
Joey Hess
b786400671
remove old cabal install libraries to try to fix windows autobuilder 2016-09-06 12:58:51 -04:00
Joey Hess
612043c55a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-06 12:47:02 -04:00
Joey Hess
31289da691
get -J: Download different files from different remotes when the remotes have the same costs.
Only done in -J mode because only if there's concurrency can downloading
from two remotes be faster. Without concurrency, it's likely the case that
sequential downloads from the same remote are faster than switching back
and forth between two remotes.

There is some hairy MVar code here, but basically it just keeps
the activeremotes MVar full except when deciding which remote to assign
to a thread.

Also affects gets by sync --content -J

This commit was sponsored by Jochen Bartl.
2016-09-06 12:45:21 -04:00
Joey Hess
eb469bd139
use keyLocations not loggedLocations
Skip dead remotes.
2016-09-06 11:57:45 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c50dce1cc9 Added a comment: current status? 2016-09-06 14:11:25 +00:00