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

17 files changed, 262 insertions, 27 deletions

diff --git a/doc/bugs/assistant_doesn__39__t_sync_file_permissions/comment_4_ec7b491ad3c9a1f253d886682bff8b82._comment b/doc/bugs/assistant_doesn__39__t_sync_file_permissions/comment_4_ec7b491ad3c9a1f253d886682bff8b82._comment
new file mode 100644
index 000000000..4b287c9df
--- /dev/null
+++ b/doc/bugs/assistant_doesn__39__t_sync_file_permissions/comment_4_ec7b491ad3c9a1f253d886682bff8b82._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="TobiasTheViking"
+ subject="comment 4"
+ date="2014-01-12T19:16:07Z"
+ content="""
+Yeah, now i just hit this. kinda annoying.
+
+Couldn't this at least be solved for direct mode repositories?
+
+"""]]
diff --git a/doc/bugs/assistant_eats_all_CPU/comment_8_e87dbb572eaf234bbaf48ed6790ab1fe._comment b/doc/bugs/assistant_eats_all_CPU/comment_8_e87dbb572eaf234bbaf48ed6790ab1fe._comment
new file mode 100644
index 000000000..e3a580bdb
--- /dev/null
+++ b/doc/bugs/assistant_eats_all_CPU/comment_8_e87dbb572eaf234bbaf48ed6790ab1fe._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkmBRpgz-elUViGzECtWiO9cRLUpxIuMmg"
+ nickname="Oliver"
+ subject="comment 8"
+ date="2014-01-11T19:31:35Z"
+ content="""
+I have two Ubuntu 13.10 boxes, both running 5.20131221 from the fmarier PPA.  They both have a repository with my XBMC library, and these repositories are synced together (they run on the same network).  Interestingly, one machine exhibits this behaviour and one doesn't.  The only obvious relevant difference is that the kernel versions are slightly different: the one that behaves properly is running 
+
+3.11.0-15-generic #23-Ubuntu SMP Mon Dec 9 18:17:04 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
+
+The one where the assistant is running at full CPU is on 
+
+3.11.0-14-generic #21-Ubuntu SMP Tue Nov 12 17:04:55 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
+
+I'm not sure if this is significant or why the kernels are different versions (both machines are fully updated).
+
+I would like to try and help debug this problem if possible.  Please let me know if there is any diagnostic output I can provide that will help.
+
+"""]]
diff --git a/doc/bugs/wget_and_android_4.4.mdwn b/doc/bugs/wget_and_android_4.4.mdwn
new file mode 100644
index 000000000..eb67a6235
--- /dev/null
+++ b/doc/bugs/wget_and_android_4.4.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+audio file won't download when it's sole source is the internet
+
+### What steps will reproduce the problem?
+on my laptop git annex addurl --fast http://path/to/file.mp3 in folder phone/
+sync to homeserver
+sync to phone
+phone is set to prefer phone/* and present
+after the phone receives the sync from homeserver, it looks to start the download and fails.
+https://www.dropbox.com/s/ozcwub2mzo40z4y/2014-01-12%2012.36.01.png -> says wget doesn't recognize option --clobber
+
+https://www.dropbox.com/s/x1jhb6rcp17c7t8/2014-01-12%2013.13.56.png -> git annex get . -d output
+
+### What version of git-annex are you using? On what operating system?
+android is version 5.20131230-g4aa88d8 for android 4.3+
+
+### 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/external_special_remote_protocol/comment_10_7c71035a75ab7011ec72d1af06fd6053._comment b/doc/design/external_special_remote_protocol/comment_10_7c71035a75ab7011ec72d1af06fd6053._comment
deleted file mode 100644
index 7a1b7f32e..000000000
--- a/doc/design/external_special_remote_protocol/comment_10_7c71035a75ab7011ec72d1af06fd6053._comment
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
- nickname="TobiasTheViking"
- subject="comment 10"
- date="2014-01-10T13:16:31Z"
- content="""
-I have just pushed version 0.2.0 of the following hooks:
-
-
-googledriveannex
-
-skydriveannex
-
-imapannex
-
-megaannex
-
-flickrannex
-
-owncloudannex
-
-dropboxannex
-
-"""]]
diff --git a/doc/design/external_special_remote_protocol/comment_12_241e57092d9e5631ac0ec4dd962477a6._comment b/doc/design/external_special_remote_protocol/comment_12_241e57092d9e5631ac0ec4dd962477a6._comment
new file mode 100644
index 000000000..b5b3d1bfc
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_12_241e57092d9e5631ac0ec4dd962477a6._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="TobiasTheViking"
+ subject="Feature request"
+ date="2014-01-11T15:41:48Z"
+ content="""
+The ability to mark a remote as being a \"cloud\" remote. To silence the \"Unable to download files from your other devices. Add a cloud repository\" message in the webapp. 
+
+Maybe as simple as \"SETCONFIG cloud true\", if that is a viable implementation.
+
+
+"""]]
diff --git a/doc/devblog/day_95__reconnection_revisited/comment_2_40478739f95e0b56ce0103db6e405ef4._comment b/doc/devblog/day_95__reconnection_revisited/comment_2_40478739f95e0b56ce0103db6e405ef4._comment
new file mode 100644
index 000000000..331965e3e
--- /dev/null
+++ b/doc/devblog/day_95__reconnection_revisited/comment_2_40478739f95e0b56ce0103db6e405ef4._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI"
+ nickname="Amitai"
+ subject="obligatory "bah homebrew, yay pkgsrc" comment"
+ date="2014-01-12T03:01:17Z"
+ content="""
+Bah homebrew, yay pkgsrc.
+
+:-)
+"""]]
diff --git a/doc/forum/Any_way_to_add_a_folder_called___34__.git__34___to_git-annex__63__/comment_2_9698c4a8f0d8785ee89a6228e0e85ca9._comment b/doc/forum/Any_way_to_add_a_folder_called___34__.git__34___to_git-annex__63__/comment_2_9698c4a8f0d8785ee89a6228e0e85ca9._comment
new file mode 100644
index 000000000..0c933fe31
--- /dev/null
+++ b/doc/forum/Any_way_to_add_a_folder_called___34__.git__34___to_git-annex__63__/comment_2_9698c4a8f0d8785ee89a6228e0e85ca9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~timo-linux"
+ nickname="Tim O'Callaghan"
+ subject="How about automatically adding it as a submodule?"
+ date="2014-01-11T10:30:57Z"
+ content="""
+Adding as a submodule and automatically adding the annexe destination as a remote? that should work in most cases..
+"""]]
diff --git a/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn b/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn
index a287e5ddf..a9d9fb162 100644
--- a/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn
+++ b/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn
@@ -9,7 +9,7 @@ It would also be nice to have a per remote number of threads. Especially if addi
 
 For now i've made a shell script that i call:
 
-# for j in `seq -w 0 10`; do echo DOING $j; for i in `curl "http://127.0.0.1:$1/?auth=$2" | grep "continue" | gawk -F\"  ' { print $8 } '`; do curl "http://127.0.0.1:$1$i"; sleep 0; done; done
+    # for j in `seq -w 0 10`; do echo DOING $j; for i in `curl "http://127.0.0.1:$1/?auth=$2" | grep "continue" | gawk -F\"  ' { print $8 } '`; do curl "http://127.0.0.1:$1$i"; sleep 0; done; done
 
 But it is very rough, and basically just starts all transfers on the page. Which means i currently have 315 active transfers running. whoops.
 
diff --git a/doc/forum/Gitolite_problems/comment_1_3a41f9b6bddc060b1fa9e35b9ce8b55f._comment b/doc/forum/Gitolite_problems/comment_1_3a41f9b6bddc060b1fa9e35b9ce8b55f._comment
new file mode 100644
index 000000000..b29fdf2a3
--- /dev/null
+++ b/doc/forum/Gitolite_problems/comment_1_3a41f9b6bddc060b1fa9e35b9ce8b55f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="Renaud"
+ ip="126.10.66.235"
+ subject="comment 1"
+ date="2014-01-11T14:29:08Z"
+ content="""
+I had that problem when I tried to access a newly created remote repository.
+It seems git-annex doesn't recognize anymore if the remote repository has been initialized or not.
+The workaround I used is create a local repository, initialize it with git annex, `clone --bare` it, add the bare repository as a remote and `git annex sync` it to initialize the bare repository. Then, you can put the bare repository where gitolite usualy keep its repositories and use it normally.
+"""]]
diff --git a/doc/forum/Gitolite_problems/comment_2_ef156bf7a1e17496c5fc1f592d45f2ad._comment b/doc/forum/Gitolite_problems/comment_2_ef156bf7a1e17496c5fc1f592d45f2ad._comment
new file mode 100644
index 000000000..7c4e8662f
--- /dev/null
+++ b/doc/forum/Gitolite_problems/comment_2_ef156bf7a1e17496c5fc1f592d45f2ad._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmqaNwDQ367zpW6cIRviLz6zJZZFODgoEI"
+ nickname="Zack"
+ subject="Almost there!"
+ date="2014-01-12T19:13:29Z"
+ content="""
+Thanks for the help (I can now clone the repo.), but I now get this.
+get file FATAL: bad git-annex-shell command: git-annex-shell 'configlist' '/annex2.git' at /opt/gitolite2/bin/commands/git-annex-shell line 25, <DATA> line 1.
+"""]]
diff --git a/doc/forum/How_do_I_do_with_.gitrefs__47_____63__/comment_2_50d0c643537175b514d5eae604fb5bea._comment b/doc/forum/How_do_I_do_with_.gitrefs__47_____63__/comment_2_50d0c643537175b514d5eae604fb5bea._comment
new file mode 100644
index 000000000..a812e99b0
--- /dev/null
+++ b/doc/forum/How_do_I_do_with_.gitrefs__47_____63__/comment_2_50d0c643537175b514d5eae604fb5bea._comment
@@ -0,0 +1,51 @@
+[[!comment format=mdwn
+ username="EskildHustvedt"
+ ip="80.203.53.96"
+ subject="comment 2"
+ date="2014-01-11T07:51:57Z"
+ content="""
+I have noticed a .gitrefs/ directory being added to my git-annex repositories as well.
+Two direct-mode git-annex assistant-managed repos have turned up a .gitrefs directory the past month or so, with the directory often returning after I remove it. First occurrance according to git logs is on the 3rd of December.
+
+The directory looks a lot like .git/refs, as if some tool is trying to do something to .git/refs but has a bug that removes the first /, and then proceeds to copy or recreate the files.
+
+    [0 zerodogg@firefly annexed]$ du -hs .gitrefs .git/refs
+    172K    .gitrefs
+    192K    .git/refs
+    [0 zerodogg@firefly annexed]$ find .gitrefs > /tmp/gitr1
+    [0 zerodogg@firefly annexed]$ find .git/refs > /tmp/gitr2
+    [0 zerodogg@firefly annexed]$ perl -pi -e 's/^\.git.?refs//' /tmp/gitr*                                                                                                   
+    [0 zerodogg@firefly annexed]$ diff -BrayN --suppress-common-lines /tmp/gitr1 /tmp/gitr2                                                                                   
+                                                                  > /tags
+                                                                  > /remotes/browncoats
+                                                                  > /remotes/browncoats/master
+                                                                  > /remotes/browncoats/synced
+                                                                  > /remotes/browncoats/synced/master
+                                                                  > /remotes/browncoats/synced/git-annex
+                                                                  > /remotes/browncoats/git-annex
+                                                                  > /remotes/browncoats/annex
+                                                                  > /remotes/browncoats/annex/direct
+                                                                  > /remotes/browncoats/annex/direct/master
+    /remotes/serenity/master                                      <
+    /remotes/zoe                                                  | /remotes/faerun/annex
+    /remotes/zoe/master                                           | /remotes/faerun/annex/direct
+    /remotes/zoe/synced                                           | /remotes/faerunpi
+    /remotes/zoe/synced/master                                    | /remotes/faerunpi/synced
+    /remotes/zoe/synced/git-annex                                 | /remotes/faerunpi/annex
+    /remotes/firefly                                              | /remotes/faerunpi/annex/direct
+    /remotes/firefly/master                                       <
+    /remotes/firefly/synced                                       <
+    /remotes/firefly/synced/master                                <
+    /remotes/firefly/synced/git-annex                             <
+    /remotes/firefly/git-annex                                    <
+    /remotes/firefly/annex                                        <
+    /remotes/firefly/annex/direct                                 <
+    /remotes/firefly/annex/direct/master                          <
+    /remotes/river/master                                         <
+                                                                  > /remotes/origin
+                                                                  > /remotes/origin/synced
+                                                                  > /remotes/hufsa
+                                                                  > /remotes/hufsa/synced
+                                                                  > /synced
+
+"""]]
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment b/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment
new file mode 100644
index 000000000..7f170975a
--- /dev/null
+++ b/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkI9pq1WH6MWeExXHVQVEsniT3DdFv4AB8"
+ nickname="Roberto"
+ subject="My usecase too"
+ date="2014-01-12T23:43:18Z"
+ content="""
+Just wanted to thank your for describing my very same use case. Unfortunately I still haven't wrapped my head around git annex to accommodate such scenario.
+"""]]
diff --git a/doc/forum/Weird_directories_appearing.mdwn b/doc/forum/Weird_directories_appearing.mdwn
new file mode 100644
index 000000000..5b2e59793
--- /dev/null
+++ b/doc/forum/Weird_directories_appearing.mdwn
@@ -0,0 +1,73 @@
+Hello!
+
+Can someone explain this behavior to me? System is ArchLinux with the newest prebuilt tarballs as of Jan 12th.
+
+     ~ % mkdir GA1
+     ~ % cd GA1
+     ~/GA1 % git init      
+    Initialized empty Git repository in /home/florian/GA1/.git/
+     ~/GA1 (git)-[master] % git annex init
+    init  ok
+    (Recording state in git...)
+     ~/GA1 (git)-[master] % echo "GA1" > testfile
+     ~/GA1 (git)-[master] % git annex add .
+    add testfile ok
+    (Recording state in git...)
+     ~/GA1 (git)-[master] % git annex sync
+    commit  ok
+     ~/GA1 (git)-[master] % cd ..
+
+     ~ % git clone GA1 GA2
+    Cloning into 'GA2'...
+    done.
+     ~ % cd GA2
+     ~/GA2 (git)-[master] % git annex init
+    init  ok
+    (Recording state in git...)
+     ~/GA2 (git)-[master] % git annex get .
+    get testfile (merging origin/git-annex into git-annex...)
+    (Recording state in git...)
+    (from origin...) ok
+    (Recording state in git...)
+     ~/GA2 (git)-[master] % git annex unlock testfile 
+    unlock testfile (copying...) ok
+     ~/GA2 (git)-[master] % echo "GA2" > testfile 
+    commit  ok
+    pull origin 
+    ok
+    push origin 
+    Counting objects: 27, done.
+    Delta compression using up to 4 threads.
+    Compressing objects: 100% (16/16), done.
+    Writing objects: 100% (20/20), 1.88 KiB | 0 bytes/s, done.
+    Total 20 (delta 2), reused 0 (delta 0)
+    To /home/florian/GA1
+       f0654aa..8d0bdf9  master -> synced/master
+     * [new branch]      git-annex -> synced/git-annex
+    ok
+     ~/GA2 (git)-[master] % cd ../GA1
+
+     ~/GA1 (git)-[master] % git annex sync
+    (merging synced/git-annex into git-annex...)
+    commit  ok
+    merge synced/master 
+    Updating f0654aa..8d0bdf9
+    Fast-forward
+     e6a/e57/SHA256E-s4--241dca52164d30bee7a0be8c097f02e382acff765a9d4136718a37abd437a57c.log | 1 +
+     testfile                                                                                 | 2 +-
+     2 files changed, 2 insertions(+), 1 deletion(-)
+     create mode 100644 e6a/e57/SHA256E-s4--241dca52164d30bee7a0be8c097f02e382acff765a9d4136718a37abd437a57c.log
+    ok
+
+     ~/GA1 (git)-[master] % ll
+    total 4
+    drwxr-x--- 1 florian florian   6 Jan 12 13:59 e6a/
+    lrwxrwxrwx 1 florian florian 178 Jan 12 13:59 testfile -> .git/annex/objects/V6/ZM/SHA256E-s4--241dca52164d30bee7a0be8c097f02e382acff765a9d4136718a37abd437a57c/SHA256E-s4--241dca52164d30bee7a0be8c097f02e382acff765a9d4136718a37abd437a57c
+
+     ~/GA1 (git)-[master] % cat e6a/e57/SHA256E-s4--241dca52164d30bee7a0be8c097f02e382acff765a9d4136718a37abd437a57c.log
+    1389531554.951523s 1 dedf9799-0131-4773-8939-8f76294fa8e9
+
+Where does the e6a directory comes from? I don't suspect a bug there, but in my conception of git-annex.
+
+Thanks!
+Florian
diff --git a/doc/tips/emacs_integration.mdwn b/doc/tips/emacs_integration.mdwn
index 12f16888a..2390474a4 100644
--- a/doc/tips/emacs_integration.mdwn
+++ b/doc/tips/emacs_integration.mdwn
@@ -17,4 +17,9 @@ Emacs, which aims to integrate with the standard facilities
 He has also added support to org-attach; if
 `org-attach-git-annex-cutoff' is non-nil and smaller than the size
  of the file you're attaching then org-attach will `git annex add the
-file`; otherwise it will "git add" it. 
+file`; otherwise it will "git add" it.
+
+----
+
+[magit-annex](https://github.com/kyleam/magit-annex) adds magit support
+for a few features, including adding files and syncing.
diff --git a/doc/tips/skydriveannex.mdwn b/doc/tips/skydriveannex.mdwn
index c293e43be..3b4aee04a 100644
--- a/doc/tips/skydriveannex.mdwn
+++ b/doc/tips/skydriveannex.mdwn
@@ -1,4 +1,4 @@
-skydriveannex 0.2.0
+skydriveannex 0.2.1
 =========
 
 Hook program for gitannex to use [skydrive](http://en.wikipedia.org/wiki/SkyDrive) (previously *Windows Live SkyDrive* and *Windows Live Folders*) as backend
diff --git a/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp/comment_2_ebe7a75ca291e7f749bfe9f46d10909d._comment b/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp/comment_2_ebe7a75ca291e7f749bfe9f46d10909d._comment
new file mode 100644
index 000000000..d06fe3961
--- /dev/null
+++ b/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp/comment_2_ebe7a75ca291e7f749bfe9f46d10909d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlzlNQbf6wBgv9j6-UqfpXcQyAYMF8S3t4"
+ nickname="Tim"
+ subject="comment 2"
+ date="2014-01-12T09:19:31Z"
+ content="""
+I am pretty sure you know about it, but have you seen https://f-droid.org/?  I was rather surprised that git-annex isn't yet listed in that \"store\".
+"""]]
diff --git a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment b/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment
new file mode 100644
index 000000000..bd3885a96
--- /dev/null
+++ b/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkgy5Qf4bivpTfYPw_yh92OcDlesrVTREg"
+ nickname="François"
+ subject="comment 2"
+ date="2014-01-12T20:31:44Z"
+ content="""
+I understand your concerns about keeping the UI straightforward.
+
+It makes sense however to allow users to add a custom backend without using the CLI. What about a new \"Custom backend (expert only)\" option which directly asks for a string with the arguments to 'git annex initremote'?
+"""]]