Commit graph

9026 commits

Author SHA1 Message Date
Joey Hess
2f84f3926a blog for the day 2013-03-07 19:00:09 -04:00
Joey Hess
d45c73089a update 2013-03-07 14:38:06 -04:00
Joey Hess
3cdeb104b7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-07 14:09:17 -04:00
Joey Hess
99989bcc8e logic error 2013-03-07 14:08:50 -04:00
annexuser
9f348663ce 2013-03-07 17:30:33 +00:00
Joey Hess
6e7a43ab61 avoid listing glacier when prompting to set up a transfer repository after xmpp 2013-03-07 13:01:18 -04:00
Joey Hess
265e440d22 avoid queuing transfers that are already queued
I saw this happen in real life, when syncing to a newly added usb drive.
I think it got scanned twice, and files were doubled in the queue.

This could be optimised a little bit more, to only read from the mvar
once, rather than twice.
2013-03-07 12:35:42 -04:00
Philipp Kern
8141b081b7 bugs/encryption_key_is_surprising/comment_7: add a closing brace 2013-03-07 16:24:06 +01:00
http://phil.0x539.de/
d2616b26da Added a comment 2013-03-07 15:21:55 +00:00
Joey Hess
82f639c70f fix type introduced in 0c13d306
Doubled command name broke show-ref, which broke git annex sync.
Re-read all of 0c13d306 to check for other problems.
2013-03-07 11:09:30 -04:00
Joey Hess
effafbc506 note 2013-03-07 11:09:21 -04:00
Joey Hess
7e3004eab0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-07 10:43:35 -04:00
193.96.240.2
1b8a3f6373 poll vote (It's too hard to install (please say why in comments)) 2013-03-07 12:46:34 +00:00
193.96.240.2
7d3a870332 poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!) 2013-03-07 12:46:05 +00:00
Joey Hess
243e99717d empty buddy list when client is connecting
This is not perfect, because on loss of connection, we do not currently
immediately detect it and stop the client. It has to time out, and then
the buddy list will clear.

The NetWatcher should detect disconnects too..
2013-03-07 03:50:21 -04:00
Joey Hess
90e4708890 remove xa
I have a theory that some google xmpp servers don't send prsense for xa
clients, while others do. Seeing some weird lack of presence messages
sometimes there.
2013-03-07 03:35:47 -04:00
Joey Hess
ade57af9e5 add alerts while performing xmpp git push/pull 2013-03-07 02:38:57 -04:00
139.80.40.12
0d7143325c poll vote (Not yet in Debian sid amd64) 2013-03-07 04:53:48 +00:00
Joey Hess
57b601e384 assistant: Fix syncing after XMPP pairing.
A missing uuid broke this, and also caused a UI glitch in the webapp's
remote list.
2013-03-06 22:18:44 -04:00
Joey Hess
f8c2dc82d8 show when not connected to xmpp server 2013-03-06 22:02:47 -04:00
Joey Hess
15ef899b12 fixed 2013-03-06 21:49:17 -04:00
Joey Hess
c16adc25c4 assistant: XMPP git pull and push requests are cached and sent when presence of a new client is detected.
Noticed that, At startup or network reconnect, git push messages were sent,
often before presence info has been gathered, so were not sent to any
buddies.

To fix this, keep track of which buddies have seen such messages,
and when new presence is received from a buddy that has not yet seen it,
resend.

This is done only for push initiation messages, so very little data needs
to be stored.
2013-03-06 21:38:01 -04:00
Joey Hess
d76e281de0 todo 2013-03-06 18:40:07 -04:00
Joey Hess
060119fdc4 better xmpp debugging 2013-03-06 18:28:34 -04:00
Joey Hess
aaec2cbf03 avoid false alert about syncing with xmpp remote 2013-03-06 17:54:45 -04:00
Joey Hess
1340b9f493 avoid too early scanning for xmppremotes 2013-03-06 17:43:55 -04:00
Joey Hess
52eb62be26 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-06 16:36:31 -04:00
http://joeyh.name/
f61f33608f Added a comment 2013-03-06 20:35:45 +00:00
Joey Hess
3c8498ec5f blog for the day 2013-03-06 16:32:47 -04:00
Joey Hess
cbb6e1fae4 tag xmpp pushes with jid
This fixes the issue mentioned in the last commit.

Turns out just collecting UUID of clients behind a XMPP remote is
insufficient (although I should probably still do it for other reasons),
because a single remote repo might be connected via both XMPP and local
pairing. So a way is needed to know when a push was received from any
client using a given XMPP remote over XMPP, as opposed to via ssh.
2013-03-06 16:29:19 -04:00
Joey Hess
c23ea9e311 assistant: Get back in sync with XMPP remotes after network reconnection, and on startup.
Make manualPull send push requests over XMPP.

When reconnecting with remotes, those that are XMPP remotes cannot
immediately be pulled from and scanned, so instead maintain a set of
(probably) desynced remotes, and put XMPP remotes on it. (This set could be
used in other ways later, if we can detect we're out of sync with other
types of remotes.)

The merger handles detecting when a XMPP push is received from a desynced
remote, and triggers a scan then, if they have in fact diverged.

This has one known bug: A single XMPP remote can have multiple clients
behind it. When this happens, only the UUID of one client is recorded
as the UUID of the XMPP remote. Pushes from the other XMPP clients will not
trigger a scan. If the client whose UUID is expected responds to the push
request, it'll work, but when that client is offline, we're SOL.
2013-03-06 15:09:31 -04:00
http://kaizer.se/
8d1540a98c Added a comment 2013-03-06 05:30:16 +00:00
http://kaizer.se/
21de69d298 Added a comment: GPG Cipher Algo 2013-03-06 04:53:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm6MkmwCd_-IACT0uzgy78u0qH1rPLNO_Q
aa77d13b72 initial commit :-) 2013-03-06 03:05:58 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
548005becc Added a comment 2013-03-05 22:43:12 +00:00
Joey Hess
dbcf26e7bc Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-05 16:34:43 -04:00
http://joeyh.name/
21c9c079d3 Added a comment 2013-03-05 20:34:25 +00:00
Joey Hess
f8f4de45d5 fix pair complete alert combining
The pairing complete alert had been conbining with some other alert, fixed
this and now it's displayed once xmpp pairing is complete on both sides.
2013-03-05 16:23:56 -04:00
Joey Hess
c03fdf5a15 fix password length check to match message 2013-03-05 16:21:13 -04:00
Joey Hess
921f29c004 two types of byName
Clean up from 9769235d6b.
In some cases, looking up a remote by name even though it has no UUID is
desirable. This includes git annex sync, which can operate on remotes
without an annex, and XMPP pairing, which runs addRemote (with calls
byName) before the UUID of the XMPP remote has been configured in git.
2013-03-05 15:43:56 -04:00
Joey Hess
9e75dce764 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-05 14:23:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp2NWKkfY8fXy-hq9vhj6Yl6gozxxZECo
df5ea48ee1 2013-03-05 17:09:12 +00:00
Joey Hess
5f14ad8e36 LD_LIBRARY_PATH todo 2013-03-05 12:02:44 -04:00
http://phil.0x539.de/
58977c73c7 Added a comment 2013-03-05 07:17:08 +00:00
Joey Hess
974d075108 Run ssh with -T to avoid tty allocation and any login scripts that may do undesired things with it. 2013-03-04 23:36:07 -04:00
Joey Hess
ff6ce2bc15 print a warning message when garbage is received from configlist 2013-03-04 23:27:18 -04:00
Joey Hess
9769235d6b Bugfix: If the UUID of a remote is not known, prevent --from, --to, and other ways of specifying remotes by name from selecting it, since it is not possible to sanely use it.
For example, copy --to such a remote would send the file, but as NoUUID was
its uuid, no location log update was done. And drop --from such a remote
would not do anything, because NoUUID is not listed in the location log..
2013-03-04 21:32:57 -04:00
Joey Hess
59994d3e8f blog for the day 2013-03-04 16:40:37 -04:00
Joey Hess
907b0c0d78 better liftAnnex, avoid using runAnnex undefined 2013-03-04 16:36:38 -04:00
Joey Hess
5274713305 webapp: Proceed automatically on from "Configure jabber account" to pairing. 2013-03-04 16:03:24 -04:00