Commit graph

31594 commits

Author SHA1 Message Date
Joey Hess
27712530f3
devblog 2018-03-27 16:31:02 -04:00
Joey Hess
ae75eb06bc
exporttree support for adb special remote
This commit was sponsored by Michael Magin.
2018-03-27 16:28:41 -04:00
Joey Hess
2927618d35
Added adb special remote which allows exporting files to Android devices.
git annex testremote passes.

exportree not implemented yet, although the documentation talks about it,
since it will be the main way this remote will be used.

The adb push/pull progress is displayed for now; it would be better
to consume it and use it to update the git-annex progress bar.

This commit was sponsored by andrea rota.
2018-03-27 14:54:41 -04:00
MatusGoljer
108068a8a2 2018-03-25 14:48:57 +00:00
Joey Hess
a6f8d9ab28
bug 2018-03-25 08:02:03 -04:00
Joey Hess
b3dc4ccff5
add retry configuration (not used yet) 2018-03-24 10:37:25 -04:00
Joey Hess
380dba1a2c
response 2018-03-24 10:18:45 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
2b5b5eb8d9 Added a comment 2018-03-23 19:01:02 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
9e4ca45545 Added a comment 2018-03-23 18:41:21 +00:00
yarikoptic
1f1ea95dcb Added a comment 2018-03-23 15:58:15 +00:00
poelzi
943e223e67 2018-03-23 13:37:32 +00:00
Joey Hess
fbf59554af
close 2018-03-22 13:23:08 -04:00
Joey Hess
5574e25c54
OSX app: Work around libz/libPng/ImageIO.framework version skew
By not bundling libz, assuming OSX includes a suitable libz.1.dylib.

This commit was supported by the NSF-funded DataLad project.
2018-03-22 11:53:10 -04:00
Joey Hess
e32d2624ce
response 2018-03-21 15:58:27 -04:00
Joey Hess
f709a7ab00
add pointer to newer special remote 2018-03-21 15:53:34 -04:00
Joey Hess
5055db14b9
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-21 15:00:04 -04:00
misc@e661ec6eb62aa0134e4ac4ca16f98640acf5c627
c061a33477 2018-03-21 18:40:27 +00:00
Joey Hess
abffea5fcb
update 2018-03-21 09:19:06 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
74f47dc437 Added a comment 2018-03-21 12:17:45 +00:00
Joey Hess
1cf705d416
idea 2018-03-21 03:19:47 -04:00
Joey Hess
0ae2662f71
ideas 2018-03-21 02:25:53 -04:00
Joey Hess
87e1cace70
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-19 23:27:14 -04:00
Joey Hess
bebf541aa7
Fix calculation of estimated completion for progress meter.
Was estimating transfer of whole file, not remaining part of it.
2018-03-19 23:26:41 -04:00
yarikoptic
66cb09b47e initial whining about 2 ssh prompts 2018-03-19 20:50:40 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
ae462950a9 Added a comment: related bugs 2018-03-17 19:06:46 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
4ffd99c02c 2018-03-17 19:05:38 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
b196df9fce 2018-03-17 18:26:27 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
de1b840f36 2018-03-17 18:00:08 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
e7ed027ad2 2018-03-17 17:36:38 +00:00
Joey Hess
bc1d56bdfd
cabal sdist refuses to build with -O1
Sigh, disabled the full fix. What we have now will work once the ghc bug
is fixed, but not currently.
2018-03-16 12:56:28 -04:00
Joey Hess
4af5507889
add news item for git-annex 6.20180316 2018-03-16 12:40:37 -04:00
Joey Hess
14100f4f74
releasing package git-annex version 6.20180316 2018-03-16 12:40:27 -04:00
Joey Hess
2c05bc9dfd
fix build with old base
Old base (used on android still) lacks tryReadMVar
2018-03-16 12:06:45 -04:00
Joey Hess
fd76a558ba
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-16 11:57:42 -04:00
Joey Hess
ec4323673e
response 2018-03-16 11:56:34 -04:00
gnusosa@2538fbd05a723a8f83b066e159f5d5f83b9f400d
308f3ecf66 2018-03-16 03:50:47 +00:00
Joey Hess
58b06a8f51
devblog 2018-03-15 16:17:01 -04:00
Joey Hess
d2af6baaeb
fixed processTranscript hang problem
The pipe's FDs got inherited by ssh and it did something that kept them
open even once it exited. Probably involving passing them on to the ssh
mux daemon.

Set close on exec, and all is well.

Kept Annex.Ssh not using processTranscript even though it no longer
hangs when it does use it, just because processTranscript is overkill
there.

This commit was supported by the NSF-funded DataLad project.
2018-03-15 16:14:22 -04:00
Joey Hess
d6700721c0
simplify with async
This is much clearer to follow.

I've tested this, and it still has the problem described in
doc/bugs/occasional_hang_with_p2pstdio.mdwn

Which I think indicates that problem is not with my code, but something
else. ghc runtime? Something crazy ssh does in this situation? Unsure..
2018-03-15 15:34:25 -04:00
Joey Hess
ac6f58d642
fix ssh warmup hang
Fix race condition in ssh warmup that caused git-annex to get stuck and
never process some while when run with high levels of concurrency.

So far, I've isolated the problem to processTranscript, which hangs
reading output from ssh in this situation. I don't yet understand why
processTranscript behaves that way.

Since here we don't care about the ssh output, and only want to /dev/null
it, changed to not use processTranscript, avoiding its problem.

This commit was supported by the NSF-funded DataLad project.
2018-03-15 15:04:15 -04:00
Joey Hess
7d83502329
add comments explaining puzzling code 2018-03-15 14:47:54 -04:00
Joey Hess
ed81762c86
avoid compiler warning
add type sig so it's clear createtfile returns unit
2018-03-15 13:21:32 -04:00
Joey Hess
e242fde6d2
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-15 11:17:09 -04:00
Joey Hess
521d4ede1e
fix build with cryptonite-0.20
Some blake hash varieties were not yet available in that version.
Rather than tracking exact details of what cryptonite supported when,
disable blake unless using a current cryptonite.
2018-03-15 11:16:00 -04:00
yarikoptic
941593fbf1 Added a comment 2018-03-15 12:47:01 +00:00
Joey Hess
bee328a7fe
followup 2018-03-14 19:16:20 -04:00
Joey Hess
3c85abe449
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-14 19:14:25 -04:00
Joey Hess
c55d8f826d
bug 2018-03-14 19:14:05 -04:00
yarikoptic
0b3080a946 Added a comment 2018-03-14 23:09:20 +00:00
Joey Hess
10d3b7fc62
Fix reversion introduced in 6.20171214 that caused concurrent transfers to incorrectly fail with "transfer already in progress".
Avoid creating transfer info file before transfer lock is created and
locked.

The wrong order for one thing caused transfer info to be overwritten
when a transfer was already in progress.

But worse, it caused checkTransfer to see the transfer info,
and so lock the transfer lock in order to verify the transfer was not in
progress. Which in a concurrent situation, prevented the transferrer
from locking the transfer lock, so it failed with "transfer already in
progress".

Note that the transferinfo command does not lock the transfer lock
before creating the transfer info. But, that's only run after
recvkey is running, and recvkey does lock the transfer lock, so that
seems more or less ok. (Other than being a super complicated legacy mess
that the P2P code has mostly obsoleted now.)

This commit was supported by the NSF-funded DataLad project.
2018-03-14 18:55:34 -04:00