Merge branch 'master' into assistant

4 files changed, 34 insertions, 2 deletions

diff --git a/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn b/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn
new file mode 100644
index 000000000..dfd3ffb82
--- /dev/null
+++ b/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn
@@ -0,0 +1,8 @@
+commit f20a40f breaks on OSX as mntent.h doesn't exist, the closet thing available to what mntent.h provides is getmntinfo(), it looks yet another bunch of ifdef's might be needed to work around OSX. This problem maybe similarly true with FreeBSD, libfam  seems to have worked around the issue - <http://oss.sgi.com/projects/fam/download/contrib/freebsd-mntent.patch>
+
+hope the above report helps.
+
+> Thanks, that was a very useful pointer. I couldn't figure out how to
+> use Haskell's FFI to loop over the list of statfs structs returned by
+> getmntinfo, so I incorporated that C code into a little library, 
+> and it seems to work ok. [[done]] --[[Joey]]
diff --git a/doc/design/assistant/blog/day_40__dbus/comment_1_43ed2a79629868b018ec9f54a32bcacc._comment b/doc/design/assistant/blog/day_40__dbus/comment_1_43ed2a79629868b018ec9f54a32bcacc._comment
new file mode 100644
index 000000000..3670e7dd5
--- /dev/null
+++ b/doc/design/assistant/blog/day_40__dbus/comment_1_43ed2a79629868b018ec9f54a32bcacc._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="dbus vs polling"
+ date="2012-07-19T17:38:40Z"
+ content="""
+I am running KDE, dbus, and I like to mount drives by hand; all that without bothering to set up /etc/fstab... Often from CLI so I don't even see the notifications for new drives.
+
+Especially while on the road, I will use no KDE, but just a tty or three. Still, dbus will be running.
+
+Long story short, I would need polling for the assistant to work flawlessly in all use cases.
+"""]]
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index 12dc0aa3e..f8ad3c13f 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -10,9 +10,15 @@ all the other git clones, at both the git level and the key/value level.
   on remotes, and transfer. But first, need to ensure that when a remote
   receives content, and updates its location log, it syncs that update
   out.
+* When MountWatcher detects a newly mounted drive, rescan git remotes
+  in order to get ones on the drive, and do a git sync and file transfers
+  to sync any repositories on it.
 
 ## longer-term TODO
 
+* Test MountWatcher on KDE, and add whatever dbus events KDE emits when
+  drives are mounted.
+* Test MountWatcher on Gnome (should work ok) and LXDE (dunno).
 * git-annex needs a simple speed control knob, which can be plumbed
   through to, at least, rsync. A good job for an hour in an
   airport somewhere.
@@ -23,8 +29,6 @@ all the other git clones, at both the git level and the key/value level.
 * Add a hook, so when there's a change to sync, a program can be run
    and do its own signaling.
 * --debug will show often unnecessary work being done. Optimise.
-* It would be nice if, when a USB drive is connected, 
-   syncing starts automatically. Use dbus on Linux?
 * This assumes the network is connected. It's often not, so the
   [[cloud]] needs to be used to bridge between LANs.
 * Configurablity, including only enabling git syncing but not data transfer;
diff --git a/doc/forum/__34__next_time_Im_online_I_would_like_to_have_file_x_y_z__34__/comment_2_e60f2bbc1c058993472fd920edbc75fc._comment b/doc/forum/__34__next_time_Im_online_I_would_like_to_have_file_x_y_z__34__/comment_2_e60f2bbc1c058993472fd920edbc75fc._comment
new file mode 100644
index 000000000..b0a8066ee
--- /dev/null
+++ b/doc/forum/__34__next_time_Im_online_I_would_like_to_have_file_x_y_z__34__/comment_2_e60f2bbc1c058993472fd920edbc75fc._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbBRfl5F8gKRr1ko8Ai6FbEZStXXNF1S4"
+ nickname="Áron"
+ subject="comment 2"
+ date="2012-07-19T22:41:53Z"
+ content="""
+hmm not bad workaround but still not very comfortable, thanks though.
+"""]]