Commit graph

8992 commits

Author SHA1 Message Date
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
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
Joey Hess
aa2bc92b73 clarify todo item 2013-03-04 15:56:09 -04:00
Joey Hess
3ceaf4e972 wording 2013-03-04 15:53:37 -04:00
Joey Hess
281005fd92 restored lost line 2013-03-04 15:53:22 -04:00
Joey Hess
711d096fd7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-04 15:11:54 -04:00
Joey Hess
c908672f3d fix another potential race with the watcher and direct mode
Watcher wants to rewrite symlink to fix it. But in direct mode, the symlink
could be replaced at any time with file content that has finished being
transferred by some other process. So, just don't touch it.

FWIW, I audited the rest of the assistant for places where it removes
files, and the rest is ok. I have not audited the rest of git-annex.
2013-03-04 15:09:32 -04:00
Joey Hess
1d388d5579 fixed the race breaking moving files from archive in direct mode
assistant: Fix bug in direct mode that could occur when a symlink is moved
out of an archive directory, and resulted in the file not being set to
direct mode when it was transferred.

The bug was that the direct mode mapping was not up-to-date when the
transferrer finished. So, finding no direct mode place to store the object,
it was put into .git/annex in indirect mode.

To fix this, just make the watcher update the direct mode mapping to
include the new file before it starts the transfer. (Seems we don't need to
update it to remove the old file if the link was moved, because the direct
mode code will notice it's not present and the mapping gets updated for its
removal later.)

The reason this was a race, and was probably not seen often is because
the committer came along and updated the direct mode mapping as part of
adding the moved symlink. But when the file was sufficiently small or
the remote sufficiently fast, this could happen after the transfer
finished.
2013-03-04 14:25:22 -04:00
http://joeyh.name/
2b723ce9da removed 2013-03-04 17:43:03 +00:00
http://joeyh.name/
492d46b38a Added a comment 2013-03-04 17:29:28 +00:00
http://joeyh.name/
f458f62e4b Added a comment 2013-03-04 17:29:16 +00:00
http://ao2.it/
3009ab5463 Added a comment: Using the Emulator? 2013-03-04 13:58:18 +00:00
http://phil.0x539.de/
d343992fce Added a comment 2013-03-04 07:36:56 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
1df34ef9a0 2013-03-04 04:44:18 +00:00
Joey Hess
051622c6da send hothasktags stderr to null 2013-03-03 23:33:22 -04:00
Joey Hess
a238e58365 cleanup 2013-03-03 23:27:17 -04:00
Joey Hess
6cc0d93bd6 fix year 2013-03-03 23:20:47 -04:00
http://joeyh.name/
45a3f198f8 Added a comment 2013-03-04 00:57:39 +00:00
Joey Hess
7133e4fae4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 20:55:56 -04:00
Joey Hess
89f973a6bd cloe 2013-03-03 20:50:03 -04:00
Joey Hess
b20c3a6252 document the encryption cipher 2013-03-03 20:47:36 -04:00
Joey Hess
5895b2ac75 check that gpg generated as much data as we asked for 2013-03-03 20:39:01 -04:00
http://edheil.wordpress.com/
5913f1b746 Added a comment 2013-03-04 00:20:30 +00:00
Joey Hess
cb6aa9bf1e Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 20:06:20 -04:00
http://joeyh.name/
a41504a43b Added a comment 2013-03-04 00:04:53 +00:00
Joey Hess
a1b6d2e057 show an error message if garbage is provided to dropunused 2013-03-03 20:04:24 -04:00
http://joeyh.name/
154594e750 Added a comment 2013-03-03 23:56:17 +00:00
Joey Hess
13cfe5c582 improve comments and variable names WRT base64 encoded encryption keys 2013-03-03 19:44:48 -04:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
27cc52b0a0 Added a comment 2013-03-03 22:43:41 +00:00
https://launchpad.net/~arand
304a577eae Added a comment 2013-03-03 22:34:27 +00:00
http://phil.0x539.de/
cedb8abcf0 added my name 2013-03-03 22:33:01 +00:00
http://phil.0x539.de/
b65202deda encryption uses a base64 key split into two halfs instead of an unwrapped one 2013-03-03 22:25:02 +00:00
Joey Hess
0b236edba9 fix titles 2013-03-03 17:35:22 -04:00
Joey Hess
22f6673575 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-03 17:33:11 -04:00
http://joeyh.name/
a1efdd2ce9 Added a comment 2013-03-03 21:32:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
f7c64afc94 Added a comment 2013-03-03 21:24:19 +00:00