aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* remove overview of threads an mvarsGravatar Joey Hess2013-05-22
| | | | | has become too long to be useful, and I find I don't need it anymore to keep things straight
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-22
|\
* | todoGravatar Joey Hess2013-05-22
| |
| * Added a comment: fixedGravatar https://www.google.com/accounts/o8/id?id=AItOawnmvJtM53ZX9h8OGQoU2t2OfGwrF7rxFX02013-05-22
| |
| * Added a commentGravatar http://joeyh.name/2013-05-22
| |
| * Added a comment: Remote costsGravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-22
| |
| * Added a comment: How to establish local preference for (special) remotesGravatar http://yarikoptic.myopenid.com/2013-05-22
| |
| * Added a comment: Link issueGravatar https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA2013-05-22
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawknOATcOkmzX4jKuET5Z2RsaFUNnLKnQsU2013-05-22
| |
| * Added a comment: Hooks tooGravatar https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA2013-05-22
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmWg4VvDTer9f49Y3z-R0AH16P4d1ygotA2013-05-22
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-22
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-22
| |
| * TyposGravatar Richard Hartmann2013-05-22
| |
* | avoid building up a lot of threads all waiting for their chance to run a pushGravatar Joey Hess2013-05-22
| | | | | | | | | | Only 2 threads are needed, one running, and one waiting to push something new. Any more is redundant and wasteful.
| * (no commit message)Gravatar http://joeyh.name/2013-05-22
| |
* | perhaps this fixes the stall tbdGravatar Joey Hess2013-05-21
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-22
|/
* include HEAD in CanPush shasGravatar Joey Hess2013-05-21
|
* blog for the dayGravatar Joey Hess2013-05-21
|
* typoGravatar Joey Hess2013-05-21
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-21
|\
* | hook special remote: Added combined hook program support.Gravatar Joey Hess2013-05-21
| |
* | XMPP: Avoid redundant and unncessary pushes. Note that this breaks ↵Gravatar Joey Hess2013-05-21
| | | | | | | | compatibility with previous versions of git-annex, which will refuse to accept any XMPP pushes from this version.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlTdxM39-zofCTehLcLYJ8D-xH8pa5DNGA2013-05-21
| |
* | Merge branch 'master' into xmppGravatar Joey Hess2013-05-21
|\ \ | | | | | | | | | | | | | | | Conflicts: debian/changelog doc/design/assistant/more_cloud_providers.mdwn
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-21
| |/
| * updateGravatar Joey Hess2013-05-21
| |
| * fix link to windows autobuildGravatar Joey Hess2013-05-21
| |
| * add news item for git-annex 4.20130521Gravatar Joey Hess2013-05-21
| |
| * releasing version 4.201305214.20130521Gravatar Joey Hess2013-05-21
| |
| * fix quotesGravatar Joey Hess2013-05-21
| |
| * lift megaannex comment into tip, etcGravatar Joey Hess2013-05-21
| |
| * fix windows buildGravatar Joey Hess2013-05-21
| |
| * better nukefileGravatar Joey Hess2013-05-21
| | | | | | | | | | Fixed handling of case when file does not exist to work like it did before, and avoid an excess stat call.
| * Merge remote-tracking branch 'origin/master'Gravatar Joey Hess2013-05-21
| |\
* | \ Merge branch 'master' of ssh://git-annex.branchable.com into xmppGravatar Joey Hess2013-05-21
|\ \ \ | | |/ | |/|
* | | Merge branch 'master' into xmppGravatar Joey Hess2013-05-21
|\ \ \ | | |/ | |/|
| * | better nukeFileGravatar Joey Hess2013-05-21
| | | | | | | | | | | | This fixes a bug where a direct mode sync fails to delete broken symlinks.
* | | per-client inboxes for push messagesGravatar Joey Hess2013-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid losing any messages received from 1 client when a push involving another client is running. Additionally, the handling of push initiation is improved, it's no longer allowed to run multiples of the same type of push to the same client. Still stalls sometimes :(
* | | flirGravatar Joey Hess2013-05-21
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-21
| | |
| | * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| | |
| | * Added a comment: Usage of mega hookGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| | |
| | * Added a comment: Look what i madeGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY2013-05-21
| | |
* | | XMPP: Be better at responding to CanPush messages when busy with something else.Gravatar Joey Hess2013-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Observed: With 2 xmpp clients, one would sometimes stop responding to CanPush messages. Often it was in the middle of a receive-pack of its own (or was waiting for a failed one to time out). Now these are always immediately responded to, which is fine; the point of CanPush is to find out if there's another client out there that's interested in our push. Also, in queueNetPushMessage, queue push initiation messages when we're already running the side of the push they would initiate. Before, these messages were sent into the netMessagesPush channel, which was wrong. The xmpp send-pack and receive-pack code discarded such messages. This still doesn't make XMPP push 100% robust. In testing, I am seeing it sometimes try to run two send-packs, or two receive-packs at once to the same client (probably because the client sent two requests). Also, I'm seeing rather a lot of cases where it stalls out until it runs into the 120 second timeout and cancels a push. And finally, there seems to be a bug in runPush. I have logs that show it running its setup action, but never its cleanup action. How is this possible given its use of E.bracket? Either some exception is finding its way through, or the action somehow stalls forever. When this happens, one of the 2 clients stops syncing.
| | * Added a comment: Same error with AndroidGravatar https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs2013-05-21
| |/
* / XMPP: Ignore duplicate messages received when pushing.Gravatar Joey Hess2013-05-20
|/
* flickrGravatar Joey Hess2013-05-20
|