Merge branch 'master' of ssh://git-annex.branchable.com

7 files changed, 210 insertions, 135 deletions

diff --git a/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn b/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn
new file mode 100644
index 000000000..a69ea1e39
--- /dev/null
+++ b/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn
@@ -0,0 +1,29 @@
+### Please describe the problem.
+
+Every time git-annex launches (after a reboot). It prompts me to finish upgrade, even though the binary is not updated. (All my repos are set to not auto update and this happens on all my repos).
+
+
+### What steps will reproduce the problem?
+
+Relaunching git-annex.
+
+
+### What version of git-annex are you using? On what operating system?
+
+OS X 10.9
+
+git-annex version: 5.20140419-g477c0c0
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL                                                                                    
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index a87a674ba..8fbe2a7d9 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -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 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 72 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 10 "OpenStack SWIFT" 33 "Google Drive"]]
+[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 72 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 11 "OpenStack SWIFT" 33 "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
diff --git a/doc/forum/Basic_set_up_with_one_remote.mdwn b/doc/forum/Basic_set_up_with_one_remote.mdwn
new file mode 100644
index 000000000..669c281d3
--- /dev/null
+++ b/doc/forum/Basic_set_up_with_one_remote.mdwn
@@ -0,0 +1,14 @@
+Hi, I'm new to git annex and so far it's looking really useful. I'm convinced what I'm trying to achieve is possible, but I can't seem to hit upon the right combination. Here's what I'd like to set up.
+
+One server with git annex / rsync / ssh access, but configured such that it contains a history of all the files as a full backup.
+Two clients WITHOUT ssh access (these are portable machines and I'd rather not open any ports I don't absolutely have to).
+
+I've used the assistant to set up syncing between all three, using a jabber account to send signals and the server to pass on the files between the machines. This all works beautifully. But what I can't seem to get right is the server / backup aspect. If I set up the server using the assistant as a remote, and set it to "full backup" from the drop down list, it doesn't seem to have any files in the repository except in the .git/annex/objects folder. Which are all cryptic file names and not really accessible. If I run commands such as 
+
+> git annex find
+
+(which should list all files as far as I can tell) in the server repository, it doesn't list any files at all. As the clients are all set up as direct repositories I can't access any history of the files there, so this doesn't seem to be quite what I'm after. The sync is working, but I really want the backup / history aspect as well.
+
+Does anyone know if what I want is possible? If so hopefully I'm close and someone can point out where I've gone wrong. I'm not afraid of the command line, but the assistant is a very convenient way to get started. 
+
+Thanks for your help.
diff --git a/doc/forum/Basic_set_up_with_one_remote/comment_1_3ad06a0dbebf62e6440f549e77af59b6._comment b/doc/forum/Basic_set_up_with_one_remote/comment_1_3ad06a0dbebf62e6440f549e77af59b6._comment
new file mode 100644
index 000000000..c26261107
--- /dev/null
+++ b/doc/forum/Basic_set_up_with_one_remote/comment_1_3ad06a0dbebf62e6440f549e77af59b6._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk3HGoDpnOPob5jOjvIootmkve1-nCpRiI"
+ nickname="Kalle"
+ subject="ssh remote defaults to bare repo"
+ date="2014-05-06T06:10:06Z"
+ content="""
+Hi,
+
+When setting up a ssh remote the default is to create a repo without a human readable file structure. To achieve what you are looking for you have to initialize a git annex repo on the server and then add the remote to the clients. afaik this has to be done using the command line interface. 
+
+If i remember correctly you add remotes with `git remote add ssh://example.com/path/to/annex`
+
+Cant find the docs atm (I'm commuting and at my final dest)
+
+"""]]
diff --git a/doc/forum/Basic_set_up_with_one_remote/comment_2_59e18e759c907b8adabf8c34eef08065._comment b/doc/forum/Basic_set_up_with_one_remote/comment_2_59e18e759c907b8adabf8c34eef08065._comment
new file mode 100644
index 000000000..40ed2c8b5
--- /dev/null
+++ b/doc/forum/Basic_set_up_with_one_remote/comment_2_59e18e759c907b8adabf8c34eef08065._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl2I59wfwq505F9W0a6f7sFDcC9neWcc24"
+ nickname="Andrew"
+ subject="comment 2"
+ date="2014-05-06T12:45:05Z"
+ content="""
+OK that sounds reasonable. I'll give it a go.
+
+I don't mind so much that the remote is not human readable as I wont be browsing directly on the remote, but what I did find disconcerting is that I didn't seem to be able to access any files. For example if I lose both the client machines, how do I get access to the files on the remote?
+"""]]
diff --git a/doc/forum/Basic_set_up_with_one_remote/comment_3_5221a713ee3f65fa2740c9fa6cb1db0f._comment b/doc/forum/Basic_set_up_with_one_remote/comment_3_5221a713ee3f65fa2740c9fa6cb1db0f._comment
new file mode 100644
index 000000000..43dbb5d63
--- /dev/null
+++ b/doc/forum/Basic_set_up_with_one_remote/comment_3_5221a713ee3f65fa2740c9fa6cb1db0f._comment
@@ -0,0 +1,27 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl2I59wfwq505F9W0a6f7sFDcC9neWcc24"
+ nickname="Andrew"
+ subject="Still missing something"
+ date="2014-05-06T17:35:20Z"
+ content="""
+On the server I ran
+
+git init
+git annex init
+
+On client I ran
+
+git init
+git annex init
+git annex direct
+
+then dropped some files in and ran
+
+git sync
+
+This didn't upload any files. I now have a broken link on the server without the actual file.
+
+When I tried to set up the server in the same way, then used the web assistant to create the repository on the client and then combine it with the manually created repository on the server, it actually worked for the first file. I could see a working link to the file it had just uploaded. But any subsequent files didn't reflect in the file structure. Additional files would show up in the .git/annex/objects folder, but again I have no way to explore these. git annex find showed nothing, git annex status showed only the first file and git log didn't show much. I tried re-adding this remote to a new annex repository, but it didn't give me access to the files or the history of the files. I'm confused!
+
+Is it me or is this not working as expected?
+"""]]
diff --git a/doc/forum/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn b/doc/forum/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn
index 0aa4d03ca..675292317 100644
--- a/doc/forum/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn
+++ b/doc/forum/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn
@@ -1,157 +1,137 @@
-The Date resolution for FAT is only 2 seconds for the "last modified time."
+The Date resolution of the FAT filesystem is only 2 seconds for the "last modified time."
 This leads to the strange behaviour, that after umount and remount of an usb drive (direct mode) git-annex thinks that suddenly approx. 50% of
-the files are modified.  (after remount the times appears to be rounded to even values)
+the files are modified.  (after remount the "seconds" appears to be rounded to even values - the inode cache before unmount had 1 second resolution) So git-annex is not real "guilty" but it would be fine to create a "workaround" for this problem...
 
-Possible the best solution for this is to set even values for the seconds in the filesystem and in annex internal tables direct after the "git annex get". 
-Other solution would be to treat differences up to 1s in modification time as unmodified or create an new parameter like rsync's "modify-window" for this. To do an "git annex sync" or git annex add is in my opinion not a good option, because one could add so Bad file content by accident...
+Possible the best solution for this is to set even values for the seconds in the filesystem and in annex internal tables direct after the `git annex get`. 
+Other solution would be to treat differences up to 1s in modification time as unmodified or create an new parameter like rsync's "modify-window" for this. To do an `git annex sync` or `git annex add` is in my opinion not a good option, because one could add so Bad file content by accident...
 
 Here's an konsole session to show this behaviour:
 
-martin@dell:$ mount /mnt/transfer/
+    $ mount /mnt/transfer/
+    $ git clone source/ /mnt/transfer/transfer-repo
 
-martin@dell:$ git clone source/ /mnt/transfer/transfer-repo
+    Klone nach '/mnt/transfer/transfer-repo'...
+    Fertig.
 
-Klone nach '/mnt/transfer/transfer-repo'...
-Fertig.
+    $ cd /mnt/transfer/transfer-repo/
+    $ git annex init "test"
 
-martin@dell:$ cd /mnt/transfer/transfer-repo/
+    init test 
+      Detected a filesystem without fifo support.
 
-martin@dell:$ git annex init "test"
+      Disabling ssh connection caching.
 
-init test 
-  Detected a filesystem without fifo support.
+      Detected a crippled filesystem.
 
-  Disabling ssh connection caching.
+      Enabling direct mode.
+    ok
+    (Recording state in git...)
 
-  Detected a crippled filesystem.
+    $ git annex group here transfer
 
-  Enabling direct mode.
-ok
-(Recording state in git...)
+    group here (merging origin/git-annex into git-annex...)
+    (Recording state in git...)
+    ok
+    (Recording state in git...)
 
-martin@dell:$ git annex group here transfer
+    $ git annex wanted here standard
 
-group here (merging origin/git-annex into git-annex...)
-(Recording state in git...)
-ok
-(Recording state in git...)
+    wanted here ok
+    (Recording state in git...)
 
-martin@dell:$ git annex wanted here standard
+    $ git annex get --auto
 
-wanted here ok
-(Recording state in git...)
+    get n01.mp3 (from origin...) 
+    SHA256E-s1159018--5674452792970dc03e9ba47d3a8af5ad7c8da6b3ca19e8e64b9a4cf462d4a92d.mp3
+         1159018 100%   82.62MB/s    0:00:00 (xfer#1, to-check=0/1)
 
-martin@dell:$ git annex get --auto
+    sent 1159308 bytes  received 31 bytes  2318678.00 bytes/sec
+    total size is 1159018  speedup is 1.00
+    ok
 
-get n01.mp3 (from origin...) 
-SHA256E-s1159018--5674452792970dc03e9ba47d3a8af5ad7c8da6b3ca19e8e64b9a4cf462d4a92d.mp3
-     1159018 100%   82.62MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1159308 bytes  received 31 bytes  2318678.00 bytes/sec
-total size is 1159018  speedup is 1.00
-ok
-
-get n02.mp3 (from origin...) 
-SHA256E-s1622113--03998dc10c4839d5ab9aeaceaa63f0363c9d728aaaca2a2707f025c7b9e920a3.mp3
+    get n02.mp3 (from origin...) 
+    SHA256E-s1622113--03998dc10c4839d5ab9aeaceaa63f0363c9d728aaaca2a2707f025c7b9e920a3.mp3
      1622113 100%   34.45MB/s    0:00:00 (xfer#1, to-check=0/1)
 
-sent 1622459 bytes  received 31 bytes  3244980.00 bytes/sec
-total size is 1622113  speedup is 1.00
-ok
-
-...
-...
-
-–--> All 29 files (n01.mp3 to n29.mp3) successfully got
-
-(Recording state in git...)
-martin@dell:$ git annex status
-
-martin@dell:$ stat * >../stat-before-umount
-
-martin@dell:$ cd /
-
-martin@dell:/$ umount /mnt/transfer 
-
-martin@dell:/$ mount /mnt/transfer 
-
-martin@dell:/$ cd /mnt/transfer/transfer-repo
-
-martin@dell:/mnt/transfer/transfer-repo$ stat * >../stat-after-remount
-
-martin@dell:/mnt/transfer/transfer-repo$ git annex status
-
-M n05.mp3
-
-M n10.mp3
-
-M n11.mp3
-
-M n13.mp3
-
-M n16.mp3
-
-M n17.mp3
-
-M n20.mp3
-
-M n22.mp3
-
-M n23.mp3
-
-M n24.mp3
-
-M n26.mp3
-
-M n27.mp3
-
-martin@dell:$ diff -u ../stat-before-umount ../stat-after-remount | grep -B8 "+Modifiziert" | grep -E "Datei:|Modifi"
-
-   Datei: „n05.mp3“
--Modifiziert: 2014-05-03 19:42:39.000000000 +0200
-+Modifiziert: 2014-05-03 19:42:38.000000000 +0200
-
-   Datei: „n10.mp3“
--Modifiziert: 2014-05-03 19:43:05.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:04.000000000 +0200
-
-   Datei: „n11.mp3“
--Modifiziert: 2014-05-03 19:43:07.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:06.000000000 +0200
-
-  Datei: „n13.mp3“
--Modifiziert: 2014-05-03 19:43:15.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:14.000000000 +0200
-
-   Datei: „n16.mp3“
--Modifiziert: 2014-05-03 19:43:21.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:20.000000000 +0200
-
-   Datei: „n17.mp3“
--Modifiziert: 2014-05-03 19:43:29.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:28.000000000 +0200
-
-   Datei: „n20.mp3“
--Modifiziert: 2014-05-03 19:43:53.000000000 +0200
-+Modifiziert: 2014-05-03 19:43:52.000000000 +0200
-
-   Datei: „n22.mp3“
--Modifiziert: 2014-05-03 19:44:13.000000000 +0200
-+Modifiziert: 2014-05-03 19:44:12.000000000 +0200
-
-   Datei: „n23.mp3“
--Modifiziert: 2014-05-03 19:44:23.000000000 +0200
-+Modifiziert: 2014-05-03 19:44:22.000000000 +0200
-
-   Datei: „n24.mp3“
--Modifiziert: 2014-05-03 19:44:31.000000000 +0200
-+Modifiziert: 2014-05-03 19:44:30.000000000 +0200
-
-   Datei: „n26.mp3“
--Modifiziert: 2014-05-03 19:44:35.000000000 +0200
-+Modifiziert: 2014-05-03 19:44:34.000000000 +0200
+    sent 1622459 bytes  received 31 bytes  3244980.00 bytes/sec
+    total size is 1622113  speedup is 1.00
+    ok
+
+    ...
+    ...
+
+    –--> All 29 files (n01.mp3 to n29.mp3) successfully got
+
+    (Recording state in git...)
+
+    $ git annex status
+    $ stat * >../stat-before-umount
+    $ cd /
+    $ umount /mnt/transfer 
+    $ mount /mnt/transfer 
+    $ cd /mnt/transfer/transfer-repo
+    $ stat * >../stat-after-remount
+    $ git annex status
+    M n05.mp3
+    M n10.mp3
+    M n11.mp3
+    M n13.mp3
+    M n16.mp3
+    M n17.mp3
+    M n20.mp3
+    M n22.mp3
+    M n23.mp3
+    M n24.mp3
+    M n26.mp3
+    M n27.mp3
+    $ diff -u ../stat-before-umount ../stat-after-remount | grep -B8 "+Modifiziert" | grep -E "Datei:|Modifi"
+
+       Datei: „n05.mp3“
+    -Modifiziert: 2014-05-03 19:42:39.000000000 +0200
+    +Modifiziert: 2014-05-03 19:42:38.000000000 +0200
+
+       Datei: „n10.mp3“
+    -Modifiziert: 2014-05-03 19:43:05.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:04.000000000 +0200
+
+       Datei: „n11.mp3“
+    -Modifiziert: 2014-05-03 19:43:07.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:06.000000000 +0200
+
+      Datei: „n13.mp3“
+    -Modifiziert: 2014-05-03 19:43:15.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:14.000000000 +0200
+
+       Datei: „n16.mp3“
+    -Modifiziert: 2014-05-03 19:43:21.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:20.000000000 +0200
+
+       Datei: „n17.mp3“
+    -Modifiziert: 2014-05-03 19:43:29.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:28.000000000 +0200
+
+       Datei: „n20.mp3“
+    -Modifiziert: 2014-05-03 19:43:53.000000000 +0200
+    +Modifiziert: 2014-05-03 19:43:52.000000000 +0200
+
+       Datei: „n22.mp3“
+    -Modifiziert: 2014-05-03 19:44:13.000000000 +0200
+    +Modifiziert: 2014-05-03 19:44:12.000000000 +0200
+
+       Datei: „n23.mp3“
+    -Modifiziert: 2014-05-03 19:44:23.000000000 +0200
+    +Modifiziert: 2014-05-03 19:44:22.000000000 +0200
+
+       Datei: „n24.mp3“
+    -Modifiziert: 2014-05-03 19:44:31.000000000 +0200
+    +Modifiziert: 2014-05-03 19:44:30.000000000 +0200
+
+       Datei: „n26.mp3“
+    -Modifiziert: 2014-05-03 19:44:35.000000000 +0200
+    +Modifiziert: 2014-05-03 19:44:34.000000000 +0200
+
+       Datei: „n27.mp3“
+    -Modifiziert: 2014-05-03 19:44:39.000000000 +0200
+    +Modifiziert: 2014-05-03 19:44:38.000000000 +0200
 
-   Datei: „n27.mp3“
--Modifiziert: 2014-05-03 19:44:39.000000000 +0200
-+Modifiziert: 2014-05-03 19:44:38.000000000 +0200