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

4 files changed, 83 insertions, 0 deletions

diff --git a/doc/bugs/regression_-_yt__58___prefix_for___34__regular__34___urls.mdwn b/doc/bugs/regression_-_yt__58___prefix_for___34__regular__34___urls.mdwn
new file mode 100644
index 000000000..0dd86d57f
--- /dev/null
+++ b/doc/bugs/regression_-_yt__58___prefix_for___34__regular__34___urls.mdwn
@@ -0,0 +1,31 @@
+### Please describe the problem.
+
+some tests started to fail in datalad when tried current master version of annex
+
+### What version of git-annex are you using? On what operating system?
+
+6.20171205+gitgcf05ebbeb-1~ndall+1
+
+### Please provide any additional information below.
+
+[[!format sh """
+(git-annex)hopa:/tmp/datalad_temp_test_AnnexRepo_web_remoteRusdWA[master]git
+$> git annex whereis --json 127.0.0.1_about.txt
+{"command":"whereis","note":"web: http://example.com/someurl\nweb: yt:http://127.0.0.1:33587/about.txt\n","success":true,"untrusted":[],"key":"SHA256E-s14--198775960d0d9827f134da4e219e5793949d24b62bfcb92aa9e2dc16d411b776.txt","whereis":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","urls":["http://example.com/someurl","yt:http://127.0.0.1:33587/about.txt"],"description":"web"}],"file":"127.0.0.1_about.txt"}
+
+$> git annex whereis 127.0.0.1_about.txt      
+whereis 127.0.0.1_about.txt (1 copy) 
+  	00000000-0000-0000-0000-000000000001 -- web
+
+  web: http://example.com/someurl
+  web: yt:http://127.0.0.1:33587/about.txt
+
+"""]]
+
+This is a new behavior, this test was passing before, and I do not think we suggested that those test files are anyhow related to youtube before.
+
+Some tests also failed related to our datalad archives git annex special remote but I didn't look into them yet -- I guess though that it is related ;-)
+
+[[!meta author=yoh]]
+
+
diff --git a/doc/forum/How_to_organise_backup_to_S3__63__/comment_2_e0ae05276ef7e1dcb21ef0986b6f7531._comment b/doc/forum/How_to_organise_backup_to_S3__63__/comment_2_e0ae05276ef7e1dcb21ef0986b6f7531._comment
new file mode 100644
index 000000000..e176eabab
--- /dev/null
+++ b/doc/forum/How_to_organise_backup_to_S3__63__/comment_2_e0ae05276ef7e1dcb21ef0986b6f7531._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="Horus"
+ avatar="http://cdn.libravatar.org/avatar/8f0ee08b98ea5bba76c3fe112c08851c"
+ subject="comment 2"
+ date="2017-12-06T11:45:33Z"
+ content="""
+Hi,
+
+thanks for your reply. The repo server I used to store just the repository does not need to have git-annex installed, correct? As long as I do not intend to use it for exchanging files... 
+
+This message can be ignored?
+
+    Remote xgm does not have git-annex installed; setting annex-ignore
+
+    This could be a problem with the git-annex installation on the remote. Please make sure that git-annex-shell is available in PATH when you ssh into the remote. Once you have fixed the git-annex installation, run: git annex enableremote xgm
+"""]]
diff --git a/doc/forum/What_does_a___91__RepoName__93___means__63__/comment_2_a233086f100fec27cd26f4d39c25a385._comment b/doc/forum/What_does_a___91__RepoName__93___means__63__/comment_2_a233086f100fec27cd26f4d39c25a385._comment
new file mode 100644
index 000000000..cac61f40d
--- /dev/null
+++ b/doc/forum/What_does_a___91__RepoName__93___means__63__/comment_2_a233086f100fec27cd26f4d39c25a385._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="http://xgm.de/oid/"
+ nickname="Flo"
+ avatar="http://cdn.libravatar.org/avatar/4c5c0e290374d76c713f482e41f60a3cbee0fa64bb94c6da94e5a61a50824811"
+ subject="comment 2"
+ date="2017-12-06T08:39:10Z"
+ content="""
+Sure, that I know. But what does it mean for a S3 type special remote? 
+
+
+    repository mode: indirect
+    trusted repositories: 0
+    semitrusted repositories: 6
+           00000000-0000-0000-0000-000000000001 -- web
+           00000000-0000-0000-0000-000000000002 -- bittorrent
+           4cc98291-9ee9-4331-b089-b57d3d03ab0e -- Horus [horus]
+           8c201bd1-9089-4a4c-a795-7b5def64e470 -- [S3]
+           a2d60179-3e1e-49d9-90bf-f98b8a77590d -- Asaru [local]
+           ebb96a27-c997-46b5-b896-bb4f313f6e76 -- External_2TB [here]
+    untrusted repositories: 0
+    transfers in progress: none
+    available local disk space: 536.31 gigabytes (+1 megabyte reserved)
+
+I have seen the S3 remote without brackets at some repo, with at others.
+
+"""]]
diff --git a/doc/todo/make_annex_info_more_efficient/comment_9_3bec13ce0c9f0932715d73106d576e86._comment b/doc/todo/make_annex_info_more_efficient/comment_9_3bec13ce0c9f0932715d73106d576e86._comment
new file mode 100644
index 000000000..c3d063897
--- /dev/null
+++ b/doc/todo/make_annex_info_more_efficient/comment_9_3bec13ce0c9f0932715d73106d576e86._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="yarikoptic"
+ avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
+ subject="comment 9"
+ date="2017-12-05T18:51:49Z"
+ content="""
+rereading my previous comment (it has been awhile), I was suggesting a super-dooper-feature.  I am not sure if it is still needed/desired since upon a quick try again, info seems to be indeed relatively speedy when ran on \"hot\" (e.g. 2nd time in a row; not sure how long the effect lasts ;)).
+The idea was -- to cache \"status\" information locally so subsequent invocations (if git-annex branch didn't change) could just pick it up from the cache if nothing has changed in terms of the git-annex branch and current branch position. E.g. if I am at a commit ABC and at git-annex branch state XYZ, why not to have .git/annex/caches/info/XYZ-ABC.json which would pretty much have output of `git annex info --json` which it could reuse, without ANY traversal of git-annex branch or local files tree, on a subsequent call if still in XYZ state and that commit.  Whenever git-annex branch progresses away from XYZ, all previous ones in the cache could be let RiP.
+
+"""]]