Merge branch 'master' into xmpp
This commit is contained in:
commit
32254488da
4 changed files with 32 additions and 2 deletions
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="4.154.0.23"
|
||||
subject="comment 2"
|
||||
date="2012-10-24T15:50:40Z"
|
||||
content="""
|
||||
`rsynctmp` is only used when sending files to a rsync special remote. You can certianly delete it if you got a stale one, but the next time a file is sent to a rsync special remote it should delete it anyway.
|
||||
"""]]
|
22
doc/design/assistant/blog/day_113__notifier_work.mdwn
Normal file
22
doc/design/assistant/blog/day_113__notifier_work.mdwn
Normal file
|
@ -0,0 +1,22 @@
|
|||
Built out the XMPP push notifier; around 200 lines of code.
|
||||
Haven't tested it yet, but it just might work. It's in the `xmpp` branch
|
||||
for now.
|
||||
|
||||
I decided to send the UUID of the repo that was pushed to, otherwise
|
||||
peers would have to speculatively pull from every repo. A wrinkle in this
|
||||
is that not all git repos have a git-annex UUID. So it might notify that
|
||||
a push was sent to an unidentified repo, and then peers need to pull from
|
||||
every such repo. In the common case, there will only be one or a few such
|
||||
repos, at someplace like at github that doesn't support git-annex. I could
|
||||
send the URL, but there's no guarantee different clients have the same
|
||||
URLs for a git remote, and also sending the URL leaks rather more data than
|
||||
does a random UUID.
|
||||
|
||||
Had a bit of a scare where it looked like I couldn't use the haskell
|
||||
`network-protocol-xmpp` package together with the `mtl` package that
|
||||
git-annex already depends on. With help from #haskell I found the way
|
||||
to get them co-existing, by using the PackageImports extension. Whew!
|
||||
|
||||
Need to add configuration of the XMPP server to use in the webapp, and
|
||||
perhaps also a way to create `.git/annex/creds/notify-xmpp` from the
|
||||
command line.
|
|
@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
|
|||
Help me prioritize my work: What special remote would you most like
|
||||
to use with the git-annex assistant?
|
||||
|
||||
[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 19 "Google Drive"]]
|
||||
[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 20 "Google Drive"]]
|
||||
|
||||
This poll is ordered with the options I consider easiest to build
|
||||
listed first. Mostly because git-annex already supports them and they
|
||||
|
|
|
@ -5,7 +5,7 @@ up `git status` and stuff by not statting the whole tree looking for changed
|
|||
files.
|
||||
|
||||
This feature works quite well with git-annex. Especially because git
|
||||
annex's files are immutable, so arn't going to change out from under it,
|
||||
annex's files are immutable, so aren't going to change out from under it,
|
||||
this is a nice fit. If you have a very large tree and `git status` is
|
||||
annoyingly slow, you can turn it on:
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue