Joey Hess
4dcc175822
remove workaround for ghc 8.0; that is mostly sorted out upstream now
2016-09-14 23:48:51 -04:00
Adam000
7a439e9df2
2016-09-15 00:34:37 +00:00
Adam000
0b772742c5
2016-09-15 00:10:56 +00:00
Joey Hess
ec3558fb79
Improve gpg secret key list parser to deal with changes in gpg 2.1.15. Fixes key name display in webapp.
...
gpg 2.1.15 (or so) seems to have added some new fields to the --with-colons
--list-secret-keys output. These include "fpr" and "grp", and come before
the "uid" line. So, the parser was giving up before it saw the name. Fix by
continuing to look for the uid line until the next "sec" line.
This commit was sponsored by Ole-Morten,Duesund on Patreon.
2016-09-14 13:31:00 -04:00
Joey Hess
ddc1b46fc2
comment
2016-09-14 12:28:18 -04:00
Joey Hess
a417b1db6e
Merge branch 'master' of ssh://git-annex.branchable.com
2016-09-14 12:19:28 -04:00
Joey Hess
916f05e890
comment
2016-09-14 12:18:48 -04:00
git-starter
f630a893c2
Added a comment: clarification
2016-09-13 20:27:23 +00:00
git-starter
d5bc4bf9dc
2016-09-13 15:48:30 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
a1809b2827
Added a comment
2016-09-13 07:05:48 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
848d160077
Added a comment
2016-09-12 19:57:03 +00:00
Aaron
021ebc651d
Added a comment: Any thoughts Joey?
2016-09-10 15:15:44 +00:00
anarcat
a12f1afd8e
fix markup
2016-09-10 14:18:10 +00:00
anarcat
8f8800bba0
sign this so i follow its changes
2016-09-10 14:17:58 +00:00
anarcat
7a89a172b0
two more ideas
2016-09-10 14:13:42 +00:00
Gus
2f963eb049
Added a comment: Never mind
2016-09-10 09:15:57 +00:00
atrent
201a99f510
2016-09-10 07:23:07 +00:00
Joey Hess
d7ea6a5684
drop incremental json object display; clean up code
...
This gets rid of quite a lot of ugly hacks around json generation.
I doubt that any real-world json parsers can parse incomplete objects, so
while it's not as nice to need to wait for the complete object, especially
for commands like `git annex info` that take a while, it doesn't seem worth
the added complexity.
This also causes the order of fields within the json objects to be
reordered. Since any real json parser shouldn't care, the only possible
problem would be with ad-hoc parsers of the old json output.
2016-09-09 18:13:55 -04:00
Joey Hess
61faf240d5
Merge branch 'master' of ssh://git-annex.branchable.com
2016-09-09 16:40:11 -04:00
Joey Hess
e2a69c2cee
refactor
2016-09-09 16:39:21 -04:00
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
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1f1b7adecf
initial whining
2016-09-09 18:45:02 +00: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
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
9947c8384f
2016-09-09 18:00:41 +00: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
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
96ef6001ff
Added a comment
2016-09-09 12:47:31 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
16b2604a20
Added a comment
2016-09-09 06:51:45 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
f97c4fe93b
Added a comment: Similar issue on Debian machine
2016-09-08 20:04:45 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
492e417cc8
removed
2016-09-08 19:51:06 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
4a64b69a9b
Added a comment: Tried on another machine, same problem
2016-09-08 19:49:14 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
cf57a506cc
Added a comment: output of git annex version
2016-09-08 18:48:44 +00:00
Gus
821aae68d3
2016-09-08 18:40:08 +00:00
Gus
59f79b8cb7
2016-09-08 18:37:19 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
c183de67d0
2016-09-08 18:33:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
981987bebc
Added a comment
2016-09-08 18:08:49 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
4af313288e
Added a comment: concurrent-output-1.7.7
2016-09-08 17:41:28 +00: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
