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

doc/bugs/rsync_remote_is_not_working.mdwn

@@ -0,0 +1,26 @@
+Host: Mac OS with git-annex 5.20140919-g0f7caf5
+
+Remote: Linux 
+
+* with git-annex 5.20140920-gb0c4300
+* using user&password login
+
+On Host:
+
+1. create a repo with git init && git annex init && git annex direct
+1. add a rsync repo in git-annex webapp, type "small archive", with shared encryption (same result using command line)
+1. copy some new files to the repo, expect the files to appear in the remote repo (check with du)
+1. Web app says "synced with remote-name", but remote repo is completely empty
+1. run git annex copy --to $remotename, now remote repo is filled with files
+1. but the sizes are really small, seems that the actual files are not being transferred
+1. convert the repo to indirect repo: git annex indirect
+1. re-run git annex copy, now the repo size on the remote seems about right
+1. now start git annex assistant, copy some new files, expect new files to be synced
+1. actual: the remote becomes completely empty, the existing files are removed!
+
+The other small issue
+
+* The add remote interface stops at "check remote" prompt for a long time without completing
+* Kill the webapp process, re-run webapp, add remote again, it worked very quickly
+* But future interaction with the remote still requires password, both commandline & webapp
+

doc/todo/wishlist:_git_annex_diff/comment_2_2e8324f47b66dce385263e258e94da16._comment

@@ -0,0 +1,32 @@
+[[!comment format=mdwn
+ username="Bram"
+ ip="81.20.68.186"
+ subject="Diff of unlocked file"
+ date="2014-10-14T10:11:04Z"
+ content="""
+I wrote a little shell script that implements part of this request. It shows the diff between an unlocked file and its locked version (i.e. the current edits that have not yet been annexed).
+This only works in non-direct mode, and obviously with 'diffable' content only.
+
+Usage is simple, the only parameter it requires is the unlocked filename.
+
+    #!/bin/bash
+    
+    DIFF=\"diff\"
+    FILE=\"$1\"
+    KEY=$(git annex lookupkey \"$FILE\")
+    
+    GITPATH=\"$(git rev-parse --show-toplevel)/.git\"
+    ANNEXPATH=$GITPATH/annex/objects/$(git annex examinekey --format='${hashdirmixed}${key}/${key}' \"$KEY\")
+    
+    if [ -L \"$FILE\" ]; then
+      echo \"$FILE is not unlocked.\" > /dev/stderr
+    else
+      if [ -r \"$ANNEXPATH\" ]; then
+        $DIFF \"$ANNEXPATH\" \"$FILE\"
+      else
+        echo \"Cannot find $ANNEXPATH\" > /dev/stderr
+        exit 1
+      fi
+      exit 1
+    fi
+"""]]