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

10 files changed, 157 insertions, 17 deletions

diff --git a/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_6_66cfbb5ce75d322f68b4c41f11bb15ae._comment b/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_6_66cfbb5ce75d322f68b4c41f11bb15ae._comment
new file mode 100644
index 000000000..4f53e02d5
--- /dev/null
+++ b/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_6_66cfbb5ce75d322f68b4c41f11bb15ae._comment
@@ -0,0 +1,59 @@
+[[!comment format=mdwn
+ username="ayutheos"
+ ip="49.124.129.253"
+ subject="comment 6"
+ date="2014-04-23T08:56:58Z"
+ content="""
+I upgraded git to 1.9.0.msysgit.0, and managed to initialise git-annex:
+
+    user@NOTEBOOK /d/pictures
+    $ git init
+    Initialized empty Git repository in D:/pictures/.git/
+    
+    user@NOTEBOOK /d/pictures
+    $ git annex init \"laptop photos\"
+    init laptop photos
+      Detected a filesystem without fifo support.
+    
+      Disabling ssh connection caching.
+    
+      Detected a crippled filesystem.
+    
+      Enabling direct mode.
+    ok
+    (Recording state in git...)
+
+But there's a message that it detected a crippled filesystem? What does that mean?
+
+Running `git status` gives:
+
+    user@NOTEBOOK /d/pictures
+    $ git st
+    fatal: This operation must be run in a work tree
+
+And then I run `git init`
+
+    user@NOTEBOOK /d/pictures
+    $ git init
+    Reinitialized existing Git repository in D:/pictures/.git/
+    
+    user@NOTEBOOK /d/pictures
+    $ git st
+    On branch annex/direct/master
+    
+    Initial commit
+    
+    Untracked files:
+      (use \"git add <file>...\" to include in what will be committed)
+    
+            2011/
+            2012/
+            2013/
+            2014/
+            dump/
+            to burn/
+    
+    nothing added to commit but untracked files present (use \"git add\" to track)
+
+..and git works ok. Any suggestions what might be wrong?
+"""]]
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
index 4f771338b..1ae46a46f 100644
--- a/doc/design/roadmap.mdwn
+++ b/doc/design/roadmap.mdwn
@@ -15,4 +15,4 @@ Now in the
 * Month 9 Brazil!, [[!traillink assistant/sshpassword]]
 * Month 10 get [[assistant/Android]] out of beta
 * Month 11 [[!traillink assistant/chunks]], [[!traillink assistant/deltas]], [[!traillink assistant/gpgkeys]] (pick 2?)
-* Month 12 [[!traillink assistant/telehash]]**
+* Month 12 [[!traillink assistant/telehash]]
diff --git a/doc/devblog/day_156__release_day.mdwn b/doc/devblog/day_156__release_day.mdwn
index d11990769..7a312b234 100644
--- a/doc/devblog/day_156__release_day.mdwn
+++ b/doc/devblog/day_156__release_day.mdwn
@@ -1,5 +1,5 @@
 I hope this will be a really good release. Didn't get all the way to
-telehash this month, but the remotedaemon is pretty sweet. Updated roadmap
+[[design/assistant/telehash]] this month, but the remotedaemon is pretty sweet. Updated [[design/roadmap]]
 pushes telehash back again.
 
 The files in this release are now gpg signed, after recently moving the
diff --git a/doc/forum/Checkout_only_some_files_with_the_assistant.mdwn b/doc/forum/Checkout_only_some_files_with_the_assistant.mdwn
new file mode 100644
index 000000000..7a2270d92
--- /dev/null
+++ b/doc/forum/Checkout_only_some_files_with_the_assistant.mdwn
@@ -0,0 +1,14 @@
+Hi,
+
+I really like git-annex for sharing contents with all my devices. But i have a problem with the assistant on my phone, i don't know how to git annex get some file but not all.
+For example i have this on a remote:
+
+repository:
+ - big file1
+ - big file2
+ - big file3
+
+I have this repository on my phone. I would like to be able to checkout out only "big file2" directly within the assistant.
+How can i achieve that?
+
+Thank you. 
diff --git a/doc/forum/sync_stages_deletions_on_remote/comment_3_9e07593228915936fadcf90373be9f4e._comment b/doc/forum/sync_stages_deletions_on_remote/comment_3_9e07593228915936fadcf90373be9f4e._comment
new file mode 100644
index 000000000..fb9020252
--- /dev/null
+++ b/doc/forum/sync_stages_deletions_on_remote/comment_3_9e07593228915936fadcf90373be9f4e._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://schnouki.net/"
+ nickname="Schnouki"
+ subject="comment 3"
+ date="2014-04-22T14:59:47Z"
+ content="""
+Not running the assistant (freshly rebooted NAS, checked with `ps ax | grep annex`), not running any other git command. Still happened, until a few minutes ago: I found the cause for this issue... and it's quite frustrating.
+
+Every now and then, I interrupt a running `git annex sync` with Ctrl+C. And sometimes this causes my NAS repository to end up with `bare = true` in its `.git/config`. When this happens, I just remove the offending line and call it a day. Now I just added a `bare = false` line to that file, and that solved the problem. It seems that somehow, if you don't explicitely tell git that your repo is not bare, it considers it as a bare repository -- and the final push from `git annex sync` actually updates the `master` branch without updating the work tree.
+
+This is probably not a bug in git-annex, but rather a weird behaviour in git -- and for sure something I didn't expect to happend. But anyway it works now :) Leaving this here in case it helps other people.
+
+Joey, thanks again for your time and your help.
+"""]]
diff --git a/doc/install/ArchLinux.mdwn b/doc/install/ArchLinux.mdwn
index 807387e0b..3dd7271c4 100644
--- a/doc/install/ArchLinux.mdwn
+++ b/doc/install/ArchLinux.mdwn
@@ -1,20 +1,19 @@
-There is a non-official source package for git-annex in
-[AUR](https://aur.archlinux.org/packages.php?ID=44272).
+There are three non non-official packages for git-annex in the Archlinux User Repository. Any of these may be installed manually per [AUR guidelines](https://wiki.archlinux.org/index.php/AUR_User_Guidelines#Installing_packages) or using a wrapper such as [`yaourt`](https://wiki.archlinux.org/index.php/yaourt) shown below.
 
-You can then build it yourself or use a wrapper for AUR
-such as yaourt:
+1. The simplest method is to use the [git-annex-bin](https://aur.archlinux.org/packages/git-annex-bin/) package based on the [prebuilt Linux tarballs](http://downloads.kitenet.net/git-annex/linux/current/). This package includes many of the binary shims from the pre-built package. Although common Linux system utilities have been stripped in favor of normal dependencies, the pre-configured Haskell libraries included out of the box make this an easy install. The disadvantage is the resulting installation is a bit on the heavy side at nearly 100M.
 
-<pre>
-$ yaourt -Sy git-annex
-</pre>
+       $ yaourt -Sy git-annex-bin
 
-----
+2. A more traditional source package is available at [git-annex](https://aur.archlinux.org/packages/git-annex/). This depends on a large number of Haskell packages available from a third party repository or through Cabal. This has been historically a bit problematic and the package frequently sits flagged out of date. The state of dependencies also varies, so some intervention may be required to get this option to work.
 
-I'm told the AUR has some dependency problems currently.
-If it doesn't work, you can just use cabal:
+       $ yaourt -Sy git-annex
 
-<pre>
-pacman -S git rsync curl wget gnupg openssh cabal-install
-cabal update
-cabal install git-annex --bindir=$HOME/bin
-</pre>
+3. A development package is available at [git-annex-git](https://aur.archlinux.org/packages/git-annex-git/) that functions similarly to the source package but builds directly from the HEAD of the git repository rather that the last official release.
+
+       $ yaourt -Sy git-annex-git
+
+Finally you may choose to forgo the Archlinux package system and install git-annex directly through cabal.
+
+    $ pacman -S git rsync curl wget gnupg openssh cabal-install
+    $ cabal update
+    $ cabal install git-annex --bindir=$HOME/bin
diff --git a/doc/special_remotes/comment_22_308afc586b86c66bbb3437d63864d9cb._comment b/doc/special_remotes/comment_22_308afc586b86c66bbb3437d63864d9cb._comment
new file mode 100644
index 000000000..c642f3975
--- /dev/null
+++ b/doc/special_remotes/comment_22_308afc586b86c66bbb3437d63864d9cb._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo"
+ nickname="donkeyicydragon"
+ subject="Enhancing special remotes as backup spaces"
+ date="2014-04-22T21:08:49Z"
+ content="""
+Hi Joey,
+
+I am thinking about using google drive as an encrypted backup for my important files. However, I fear that if all my git annex repositories are unrecoverable that the encrypted data on the special remote will not help me much. Assuming I have backed up my gpg key I still get a bunch of decrypted files but the folder structure is lost. Would it be possible to implement something like a safety feature that also uploads an (encrypted) tar of all symlinks (pointing to the respective encrypted files) of the (current/or master-branch) git working tree? 
+
+I am almost sure this is already implementable using hooks however I could not find information on which types of hooks are available. I am looking for one that is triggered once after all copy/move operations to a special remote are finished. Can you point me in the right direction?
+
+Marek
+
+
+"""]]
diff --git a/doc/sync/comment_11_7683879f6982c0eb0aa39b66ff5a5ea9._comment b/doc/sync/comment_11_7683879f6982c0eb0aa39b66ff5a5ea9._comment
new file mode 100644
index 000000000..430322975
--- /dev/null
+++ b/doc/sync/comment_11_7683879f6982c0eb0aa39b66ff5a5ea9._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
+ nickname="Matthias"
+ subject="sync slow with content switch"
+ date="2014-04-22T20:37:05Z"
+ content="""
+I noticed that in a test with 2 local repositories and around 2'000 files \"git annex sync\" is still very fast, but \"git annex sync --content\" takes multiple seconds. Is this avoidable?
+
+I have a central repo and client repos. I want to copy all content to the central repo after a commit. Right now, I use \"git annex group central backup\", \"git annex wanted central standard\", and a hook that triggers \"git annex sync --content\" after each commit. Maybe there is a more efficient way to do this? Thanks for sharing thoughts.
+"""]]
diff --git a/doc/tips/file_manager_integration.mdwn b/doc/tips/file_manager_integration.mdwn
index 3fea3e98c..d84b1c59d 100644
--- a/doc/tips/file_manager_integration.mdwn
+++ b/doc/tips/file_manager_integration.mdwn
@@ -82,6 +82,26 @@ This gives me the resulting config on disk, in `.config/Thunar/uca.xml`:
 
 The complete instructions on how to setup actions is [in the XFCE documentation](http://docs.xfce.org/xfce/thunar/custom-actions).
 
+## OS X (Finder)
+
+For OS X, it is possible to get context menus in Finder. Due to how OS X deals with sym links, one needs to operate on folders if using indirect mode. Direct mode operation has not been tested.
+
+1. Open Automator and create a new Service.
+2. Using the Drop down menus in the top create the sentence "Service receives selected folders in Finder.app" to have it work on folders. For direct mode operation it is probably reasonable to select "files or folders".
+3. Add a "Run shell script" element and fill in line with the following script:
+
+
+    #!/usr/bin/bash
+    source ~/.bash_profile
+    for f in "$@"
+    do
+        cd $(dirname $f); git-annex get $f
+    done
+
+The purpose of the first line is there to get git-annex on to the path. The reason for the for loop is in case multiple files or folders are marked when running the context menu command.
+
+Finally save the the workflow under the name for which it should be listed in the context menu.
+
 ## your file manager here
 
 Edit this page and add instructions!
diff --git a/doc/tips/file_manager_integration/comment_1_0f82520f415b4715946358658e1799a8._comment b/doc/tips/file_manager_integration/comment_1_0f82520f415b4715946358658e1799a8._comment
new file mode 100644
index 000000000..2dedcc884
--- /dev/null
+++ b/doc/tips/file_manager_integration/comment_1_0f82520f415b4715946358658e1799a8._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="Finder added"
+ date="2014-04-23T13:19:02Z"
+ content="""
+For some reason I do not manage to get the shell script to pretty print. I can also supply a screenshot of the Automator, but do not manage to upload it to the wiki.
+"""]]