Commit graph

6422 commits

Author SHA1 Message Date
Joey Hess
f89d6dd33e The standalone tarball's runshell now takes care of installing a ~/.ssh/git-annex-shell wrapper the first time it's run. 2012-10-29 14:40:28 -04:00
Joey Hess
0ffce4a942 tweak 2012-10-29 14:30:10 -04:00
Joey Hess
67ce7929a5 Assistant monad, stage 3
All toplevel named threads are converted to the Assistant monad.

Some utility functions still need to be converted.
2012-10-29 14:07:12 -04:00
Joey Hess
1df7417403 adns is no longer needed, it uses the Haskell DNS library instead 2012-10-29 13:15:30 -04:00
Joey Hess
7d7dea2e0e dup bug 2012-10-29 13:14:24 -04:00
Joey Hess
4f763e52be build fix 2012-10-29 13:12:39 -04:00
Joey Hess
9a672207c7 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-29 13:10:47 -04:00
Joey Hess
3eecb5b7bb converted 2 more threads.. only 2 more to go 2012-10-29 13:09:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
ce97082d07 Added a comment 2012-10-29 17:04:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
93b94da995 2012-10-29 16:54:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
5eb39db52c 2012-10-29 16:54:06 +00:00
Joey Hess
0ba4df3c1a tweak 2012-10-29 11:58:29 -04:00
Joey Hess
76768ad977 converted 6 more threads 2012-10-29 11:40:22 -04:00
http://www.dbruhn.de/
65afa89a10 2012-10-29 14:42:58 +00:00
http://www.dbruhn.de/
7eb833b699 2012-10-29 14:40:35 +00:00
http://www.dbruhn.de/
9af3838134 2012-10-29 14:39:18 +00:00
Joey Hess
bad88e404a convert Watcher thread to Assistant monad
This is a nice win; much less code runs in Annex, so other threads have
more chances to run concurrently.

I do notice that renaming a file has gone from 1 to 2 commits. I think this
is due to the above improvement letting the committer run more frequently,
so it commits the rm first.
2012-10-29 09:55:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA
f5f5245ef0 2012-10-29 12:43:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA
4db20a9cdb 2012-10-29 12:40:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
f6e0c0c9d6 2012-10-29 12:36:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0a35ebbcb2 2012-10-29 08:25:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
6ce7f9fd7d 2012-10-29 08:17:03 +00:00
Joey Hess
4dbdc2b666 Assistant monad, stage 2.5
Converted several threads to run in the monad.

Added a lot of useful combinators for working with the monad.

Now the monad includes the name of the thread.

Some debugging messages are disabled pending converting other threads.
2012-10-29 02:21:04 -04:00
Joey Hess
4e765327ca Assistant monad, stage 1
This adds the Assistant monad, and an AssistantData structure.
So far, none of the assistant's threads run in the monad yet.
2012-10-29 00:15:43 -04:00
Joey Hess
ec0bac9d73 more indentation. must stop. 2012-10-28 22:09:09 -04:00
Joey Hess
def5b4cc64 update 2012-10-28 21:38:41 -04:00
Joey Hess
e3fc4da64d update 2012-10-28 21:36:09 -04:00
Joey Hess
c523820d58 update 2012-10-28 21:35:38 -04:00
Joey Hess
caa83ef263 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-28 21:28:09 -04:00
Joey Hess
6eca362c5d indentation foo, and a new coding style page. no code changes 2012-10-28 21:27:15 -04:00
Joey Hess
dd63cbb7bc allow WITH_HOST setting too 2012-10-28 21:21:01 -04:00
http://joeyh.name/
288c4fb216 Added a comment 2012-10-29 00:03:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
861a7932c5 Added a comment 2012-10-29 00:00:34 +00:00
David Bremner
0ba27bac7e fix example commands in comment 2012-10-28 20:33:00 -03:00
http://joeyh.name/
508aeaeece Added a comment 2012-10-28 23:29:46 +00:00
Joey Hess
ecea2b19cf added 3 warnings that numcopies=0 is asking to lose data 2012-10-28 19:26:18 -04:00
Joey Hess
4291f5c504 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-28 19:19:10 -04:00
Joey Hess
9173c66e40 support using haskell-dns for SRV lookups
This library should be easier to install than ADNS, so I've made it
be used by default.
2012-10-28 19:14:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
034d8dd889 Added a comment 2012-10-28 21:46:08 +00:00
Joey Hess
64e1d7b579 send git-annex tag in initial presence
Will be used for finding other git-annex clients for pairing
2012-10-28 17:07:29 -04:00
Joey Hess
e7df22916d typoskis 2012-10-28 16:56:43 -04:00
Joey Hess
b985f3bd3e Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-28 16:54:21 -04:00
Joey Hess
ebb63e8038 blog for the day 2012-10-28 16:53:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
5d5c388b68 Added a comment 2012-10-28 20:11:44 +00:00
Joey Hess
4ac2fd0a22 ensure that git-annex branch is pushed after a successful transfer
I now have this topology working:

   assistant ---> {bare repo, special remote} <--- assistant

And, I think, also this one:

        +----------- bare repo --------+
        v                              v
  assistant ---> special remote <--- assistant

While before with assistant <---> assistant connections, both sides got
location info updated after a transfer, in this topology, the bare repo
*might* get its location info updated, but the other assistant has no way to
know that it did. And a special remote doesn't record location info,
so transfers to it won't propigate out location log changes at all.

So, for these to work, after a transfer succeeds, the git-annex branch
needs to be pushed. This is done by recording a synthetic commit has
occurred, which lets the pusher handle pushing out the change (which will
include actually committing any still journalled changes to the git-annex
branch).

Of course, this means rather a lot more syncing action than happened
before. At least the pusher bundles together very close together pushes,
somewhat. Currently it just waits 2 seconds between each push.
2012-10-28 16:05:34 -04:00
Joey Hess
5406416234 add git-annex branch commit when assistant is syncing
Seems nothing else ensures the branch is committed anymore.
2012-10-28 15:33:21 -04:00
Joey Hess
9767562f65 rsync special remote: Include annex-rsync-options when running rsync to test a key's presence.
Also, use the new withQuietOutput function to avoid running the shell to
/dev/null stderr in two other places.
2012-10-28 13:51:14 -04:00
http://joeyh.name/
67454ab7f3 Added a comment 2012-10-28 17:13:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
965d80170d 2012-10-28 14:12:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
a18e1755c1 2012-10-28 13:51:55 +00:00