Commit graph

6381 commits

Author SHA1 Message Date
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
178.26.87.189
eb466fdca3 poll vote (My phone (or MP3 player)) 2012-10-28 12:12:43 +00:00
http://a-or-b.myopenid.com/
694b9d57e1 Added a comment 2012-10-28 06:46:40 +00:00
http://a-or-b.myopenid.com/
e215ae3e97 removed 2012-10-28 06:45:54 +00:00
http://a-or-b.myopenid.com/
ee8c2fb914 Added a comment 2012-10-28 06:45:37 +00:00
http://a-or-b.myopenid.com/
a1fa84416e 2012-10-28 06:43:11 +00:00
Joey Hess
4db379bca3 recommend bind9-host 2012-10-27 20:54:53 -04:00
Joey Hess
19ff559590 add host command to standalone builds 2012-10-27 20:52:39 -04:00
Joey Hess
9144710a34 blog for the day 2012-10-27 19:59:17 -04:00
Joey Hess
531f1d1446 add XMPP nudge alert, displayed after making a cloud repository 2012-10-27 12:25:29 -04:00
Joey Hess
ab15e567f9 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-27 11:32:37 -04:00
Joey Hess
b72d04988f add an icon for The Cloud
I am befuddled that Twitter Bootstrap has no built-in Icon for The Cloud,
and also that Chromium's depiction of CLOUD (U+2601) has an uncanny
resemblance to PILE OF POO (U+1F4A9) when rendered small, and looks like a
looming Frankenstorm when rendered large, and not a sweet, sunny, nothing
can go wrong The Cloud.
<http://www.fileformat.info/info/unicode/char/2601/browsertest.htm>

So, I must resort to irony in my choice of icons.
2012-10-27 11:24:35 -04:00
http://joeyh.name/
22c6e392d5 Added a comment 2012-10-27 06:08:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaM3-vbAh5B8tY_IL3yh31ik6cAVsgoPw
61bc8ba78c Added a comment: Haskell XMPP 2012-10-27 05:54:53 +00:00
Joey Hess
6633a5158d update 2012-10-27 00:57:53 -04:00
Joey Hess
fc06ccf355 Merge branch 'xmpp' 2012-10-27 00:55:13 -04:00
Joey Hess
67f4fe496f XEP-0126 is not compatable with my use of presence, remove it from TODO 2012-10-27 00:54:10 -04:00
Joey Hess
cb765608ca update 2012-10-27 00:50:45 -04:00
Joey Hess
c71836269b (re)start XMPP when it's configured in the webapp 2012-10-27 00:50:14 -04:00
Joey Hess
2dc40ecbd1 reconnect XMPP when NetWatcher notices a change 2012-10-27 00:42:14 -04:00
128.151.150.17
50ad657cf2 poll vote (My phone (or MP3 player)) 2012-10-27 04:34:19 +00:00
Joey Hess
9fc8257392 xmpp reconnection
If it managed to run for 5 minutes, reconnect immediately. Otherwise,
wait 5 minutes before reconnecting.
2012-10-27 00:06:17 -04:00
Joey Hess
64992b4251 typo 2012-10-26 23:43:39 -04:00
Joey Hess
0c0ef99341 gnutls segfault fixed
Adjust build deps to ensure that only a fixed version of the library will
be used.

Also, removed the bound thread stuff, which I now think was (probably)
a red herring.
2012-10-26 23:07:30 -04:00
Joey Hess
c57edb4381 fix syntax 2012-10-26 20:47:44 -04:00
Joey Hess
64611d3545 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-26 19:44:04 -04:00
Joey Hess
d1e5f2d596 Merge branch 'master' into xmpp
Conflicts:
	Assistant/Threads/NetWatcher.hs
2012-10-26 19:42:24 -04:00
Joey Hess
8e4620a6c7 NetWatcher: When dbus connection is lost, try to reconnect.
MountWatcher can't do this, because it uses the session dbus,
and won't have access to the new DBUS_SESSION_BUS_ADDRESS if a new session
is started.

Bumped dbus library version, FD leak in it is fixed.
2012-10-26 19:38:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU
88bedee2ec Added a comment: chunking 2012-10-26 22:05:16 +00:00
Joey Hess
6803667f00 store xmpp creds from form 2012-10-26 17:13:30 -04:00
Joey Hess
1d04dff4f0 split out xmpp utilities 2012-10-26 14:44:36 -04:00
Joey Hess
82b7e835e4 run xmpp test in bound thread 2012-10-26 14:39:22 -04:00
http://joeyh.name/
87c250da5b Added a comment: Neat idea 2012-10-26 18:35:21 +00:00
Joey Hess
c184efd7b1 link 2012-10-26 14:30:05 -04:00
Joey Hess
dd1eafdb59 sign 2012-10-26 14:29:28 -04:00
Joey Hess
f4d927e400 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-26 14:27:44 -04:00
Joey Hess
26b96ff20c blog for the day 2012-10-26 14:27:21 -04:00
Joey Hess
07494cbb4b XMPP configuration form
Currently relies on SRV being set, or the JID's hostname being the server
hostname and the port being default. Future work: Allow manual
configuration of user name, hostname, and port.
2012-10-26 14:17:09 -04:00
Joey Hess
a11fb94c65 SRV record construction 2012-10-26 13:03:08 -04:00
Joey Hess
5544ca2fb8 build fix with pairing disabled 2012-10-26 12:56:19 -04:00
Joey Hess
8916ff1a6c hook up SRV lookups for XMPP 2012-10-26 12:55:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU
2e1c642580 2012-10-26 14:25:23 +00:00