Commit graph

29308 commits

Author SHA1 Message Date
Joey Hess
50e2d97847
shorten note 2016-12-18 17:31:02 -04:00
Joey Hess
a1d6f4f9a2
improve note display 2016-12-18 17:23:20 -04:00
Joey Hess
0b4213d371
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-18 17:18:05 -04:00
Joey Hess
249ddb5953
typo 2016-12-18 17:16:53 -04:00
Joey Hess
7f2e7fa271
check if wormhole is installed 2016-12-18 17:11:13 -04:00
Joey Hess
ccde0932a5
p2p --pair with magic wormhole (untested)
It builds. I have not tried to run it yet. :)

This commit was sponsored by Jake Vosloo on Patreon.
2016-12-18 16:51:41 -04:00
xloem
6402318e85 Added a comment: Coda 2016-12-18 14:56:18 +00:00
Joey Hess
b2b6296f9d
make sure False is returned on error 2016-12-17 18:31:19 -04:00
Joey Hess
def2019602
improve types 2016-12-17 18:29:59 -04:00
Joey Hess
7cddfca799
document a minor problem 2016-12-17 17:36:55 -04:00
Joey Hess
399d0f1929
use PYTHONUNBUFFERED to force python to use sane stdout buffering
Works around https://github.com/warner/magic-wormhole/issues/108

See http://stackoverflow.com/questions/107705/disable-output-buffering
for the gory details. Why a scripting language would chose a default
stdout buffering that differs between terminal and piped output, and
tends to introduce this kind of bug, I don't know.
2016-12-17 17:28:08 -04:00
Joey Hess
fe6f36d9f3
magic wormhole module
This interacts with it using stdio, which is surprisingly hard.

sendFile does not currently work, due to
https://github.com/warner/magic-wormhole/issues/108

Parsing the output to find the magic code is done as robustly as
possible, and should continue to work unless wormhole radically changes
the format of its codes. Presumably it will never output something that
looks like a wormhole code before the actual wormhole code; that would
also break this. It would be better if there was a way to make
wormhole not mix the code with other output, as requested in
https://github.com/warner/magic-wormhole/issues/104

Only exchange of files/directories is supported. To exchange messages,
https://github.com/warner/magic-wormhole/issues/99 would need to be resolved.
I don't need message exchange however.
2016-12-17 16:58:05 -04:00
Joey Hess
38f9337e16
Revert "p2p --link now defaults to setting up a bi-directional link"
This reverts commit 3037feb1bf.

On second thought, this was an overcomplication of what should be the
lowest-level primitive. Let's build bi-directional links at the pairing
level with eg magic wormhole.
2016-12-16 18:26:07 -04:00
Joey Hess
5779e31cc7
devblog 2016-12-16 17:41:08 -04:00
Joey Hess
bd811d3853
p2p: Added --one-way option.
This commit was sponsored by Fernando Jimenez on Patreon.
2016-12-16 16:43:37 -04:00
Joey Hess
3037feb1bf
p2p --link now defaults to setting up a bi-directional link
Both the local and remote git repositories get remotes added
pointing at one-another.

Makes pairing twice as easy!

Security: The new LINK command in the protocol can be sent repeatedly,
but only by a peer who has authenticated with us. So, it's entirely safe to
add a link back to that peer, or to some other peer it knows about.
Anything we receive over such a link, the peer could send us over the
current connection.

There is some risk of being flooded with LINKs, and adding too many
remotes. To guard against that, there's a hard cap on the number of remotes
that can be set up this way. This will only be a problem if setting up
large p2p networks that have exceptional interconnectedness.

A new, dedicated authtoken is created when sending LINK.

This also allows, in theory, using a p2p network like tor, to learn about
links on other networks, like telehash.

This commit was sponsored by Bruno BEAUFILS on Patreon.
2016-12-16 16:38:06 -04:00
Joey Hess
e67a310da1
p2p: --link no longer takes a remote name, instead the --name option can be used. 2016-12-16 15:37:50 -04:00
Joey Hess
76d525c4d5
update links to wormhole issues 2016-12-16 15:03:20 -04:00
binx
2c038e2a4b Added a comment 2016-12-16 13:57:41 +00:00
moc514@eb7af2cd9147722b29f32b6606feb2b8563dfac8
36f22f7073 Added a comment: Nexus 6p 2016-12-16 02:08:21 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
0e24aee70a Link adjustments 2016-12-15 21:18:00 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
bace6c83ee Add missing link 2016-12-15 21:12:45 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
68501b9c3e Add some markup and links 2016-12-15 21:09:52 +00:00
alpernebbi
d395be5b38 metadata --batch UTF-8 bug 2016-12-14 09:30:10 +00:00
marekj
1d7aabdda0 Added a comment: I took the liberty to do it 2016-12-14 07:49:26 +00:00
marekj
4d4229be75 Create wiki page for the different levels of control you can have with git annex 2016-12-14 06:54:24 +00:00
Joey Hess
55a34b4930
devblog 2016-12-13 15:47:51 -04:00
Joey Hess
469bfa7ff3
Make all --batch input, as well as fromkey and registerurl stdin be processed without requiring it to be in the current encoding. 2016-12-13 15:35:04 -04:00
Joey Hess
a12eac060c
updates 2016-12-13 14:35:58 -04:00
Joey Hess
279ac11ce1
response 2016-12-13 12:58:22 -04:00
Joey Hess
e0ab4fe748
response 2016-12-13 12:54:28 -04:00
Joey Hess
6584d875d6
response 2016-12-13 12:53:12 -04:00
Joey Hess
1d82cf39ca
response 2016-12-13 12:48:11 -04:00
Joey Hess
3bf31075ed
comment 2016-12-13 12:43:20 -04:00
Joey Hess
61944ad12c
close 2016-12-13 12:19:44 -04:00
Joey Hess
3b3d6b63e6
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-13 12:16:18 -04:00
Joey Hess
48d9624a2d
Revert ServerAliveInterval
Revert ServerAliveInterval change in 6.20161111, which caused problems
with too many old versions of ssh and unusual ssh configurations.

It should have not been needed anyway since ssh is supposted to
have TCPKeepAlive enabled by default.
2016-12-13 12:12:38 -04:00
Joey Hess
1d516069d8
close 2016-12-13 12:00:37 -04:00
Joey Hess
11fd49870c
comment 2016-12-13 11:58:56 -04:00
Joey Hess
d87abe61f6
comment 2016-12-13 11:57:32 -04:00
Joey Hess
59fead6da3
Pass annex.web-options to wget and curl after other options, so that eg --no-show-progress can be set by the user to disable the default --show-progress. 2016-12-13 11:56:23 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
b55d5a216d Added a comment 2016-12-13 15:52:35 +00:00
Joey Hess
b0735d098d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-12-13 11:13:58 -04:00
Joey Hess
d9490685fd
metadata --batch: Fix bug when conflicting metadata changes were made in the same batch run.
1 microsecond delay is ugly.. but, maintaining an queue of a list of timestamps
and taking a new one from the queue each time around, or maintaining a timestamp
counter, would probably be slower.
2016-12-13 11:07:49 -04:00
Joey Hess
f01b4cbf7c
analysis 2016-12-13 10:57:11 -04:00
Joey Hess
e08761288d
analysis 2016-12-13 10:49:39 -04:00
Joey Hess
d35d87d8d8
analysis 2016-12-13 10:46:24 -04:00
https://singpolyma.net/
6ff7b0e81b 2016-12-13 02:38:44 +00:00
annexuser
bc3e1b8946 Added a comment 2016-12-13 02:00:08 +00:00
Joey Hess
6f502c859b
todo 2016-12-12 17:21:32 -04:00