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

9 files changed, 83 insertions, 42 deletions

diff --git a/doc/bugs/git-annex_fails_to_parse_external_remotes__39_____34__CHECKPRESENT-SUCCESS__34___response/comment_1_25f456784172f591f8a587f8106d9793._comment b/doc/bugs/git-annex_fails_to_parse_external_remotes__39_____34__CHECKPRESENT-SUCCESS__34___response/comment_1_25f456784172f591f8a587f8106d9793._comment
new file mode 100644
index 000000000..bc5a787e8
--- /dev/null
+++ b/doc/bugs/git-annex_fails_to_parse_external_remotes__39_____34__CHECKPRESENT-SUCCESS__34___response/comment_1_25f456784172f591f8a587f8106d9793._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="encryptio"
+ subject="comment 1"
+ date="2015-05-31T13:54:30Z"
+ content="""
+Confirmed fixed at least as of 5.20150528-gedaacae.
+"""]]
diff --git a/doc/bugs/importfeed_can__39__t_deal_with_pycon_rss_feeds/comment_2_a76c59499546fc045a40a21a9ab6d4dc._comment b/doc/bugs/importfeed_can__39__t_deal_with_pycon_rss_feeds/comment_2_a76c59499546fc045a40a21a9ab6d4dc._comment
new file mode 100644
index 000000000..1022aa7a5
--- /dev/null
+++ b/doc/bugs/importfeed_can__39__t_deal_with_pycon_rss_feeds/comment_2_a76c59499546fc045a40a21a9ab6d4dc._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 2"
+ date="2015-05-31T15:50:02Z"
+ content="""
+i agree the feed is broken.
+
+i guess what i was surprised about is that importfeed wasn't just doing a `addurl`, which would have detected the youtube site and shoved it into quvi for retrieval... 
+"""]]
diff --git a/doc/forum/how_to_disable_a_remote_temporarily.mdwn b/doc/forum/how_to_disable_a_remote_temporarily.mdwn
deleted file mode 100644
index 4caa97ad0..000000000
--- a/doc/forum/how_to_disable_a_remote_temporarily.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-In our quest to find dumb replacements for [[todo/wishlist: 'get' queue and schedule.]] (and a more complete [[git-annex-schedule]]), we have setup a cronjob that would start and stop the assistant during certain time windows, to ensure that it would not download during prime bandwidth time.
-
-But that isn't exactly what we're looking for: we would like the assistant to continue doing its usual thing of adding and removing files, and even syncing the git branches. Just not get/move files around.
-
-One way I thought of doing this was to disable a remote locally. [[git-annex-dead]] of course comes to mind, but that applies to all repositories, so it's not an option. If the remote was in git, i could just `git remote rm origin` and `git remote add origin` and be done with it, but this is the *web* remote, so it doesn't even show up in `git remote -v`.
-
-So how do i disable a [[special remotes]]?
-
-Thanks! --[[anarcat]]
diff --git a/doc/forum/how_to_disable_a_remote_temporarily/comment_1_22493ac2e1e74a6ef5223630747a029c._comment b/doc/forum/how_to_disable_a_remote_temporarily/comment_1_22493ac2e1e74a6ef5223630747a029c._comment
deleted file mode 100644
index ff2780a61..000000000
--- a/doc/forum/how_to_disable_a_remote_temporarily/comment_1_22493ac2e1e74a6ef5223630747a029c._comment
+++ /dev/null
@@ -1,32 +0,0 @@
-[[!comment format=mdwn
- username="joey"
- subject="""comment 1"""
- date="2015-05-30T15:56:09Z"
- content="""
-I think you should be able to use remote.name.annex-ignore for this.
-
-Let's see:
-
-	joey@darkstar:~/tmp/a>git annex addurl --fast http://localhost
-	addurl localhost ok
-	(recording state in git...)
-	joey@darkstar:~/tmp/a>git config remote.web.annex-ignore true
-	joey@darkstar:~/tmp/a>git annex get localhost
-	get localhost (not available) 
-	  Try making some of these repositories available:
-	  	00000000-0000-0000-0000-000000000001 -- web
-	
-	  (Note that these git remotes have annex-ignore set: web)
-	failed
-	git-annex: get: 1 failed
-	joey@darkstar:~/tmp/a>git config remote.web.annex-ignore false
-	joey@darkstar:~/tmp/a>git annex get localhost
-	get localhost (from web...) 
-	/home/joey/tmp/a/.g 100%[=====================>]      10  --.-KB/s   in 0s     
-	ok
-
-Yay, it worked!
-
-I think the assistant might need a restart to notice git config changes
-like this.
-"""]]
diff --git a/doc/tips/disabling_a_special_remote.mdwn b/doc/tips/disabling_a_special_remote.mdwn
new file mode 100644
index 000000000..3b80ef25c
--- /dev/null
+++ b/doc/tips/disabling_a_special_remote.mdwn
@@ -0,0 +1,35 @@
+In our quest to find dumb replacements for [[todo/wishlist: 'get' queue and schedule.]] (and a more complete [[git-annex-schedule]]), we have setup a cronjob that would start and stop the assistant during certain time windows, to ensure that it would not download during prime bandwidth time.
+
+But that isn't exactly what we're looking for: we would like the assistant to continue doing its usual thing of adding and removing files, and even syncing the git branches. Just not get/move files around.
+
+One way I thought of doing this was to disable a remote locally. [[git-annex-dead]] of course comes to mind, but that applies to all repositories, so it's not an option. If the remote was in git, i could just `git remote rm origin` and `git remote add origin` and be done with it, but this is the *web* remote, so it doesn't even show up in `git remote -v`.
+
+But this doesn't work with [[special remotes]]. Another solution is
+simply to use the `remote.name.annex-ignore` configuration documented
+in the main [[git-annex]] manpage. For example, to disable the web
+remote, you would use:
+
+    git config remote.web.annex-ignore false
+
+The result would be:
+
+	joey@darkstar:~/tmp/a>git annex addurl --fast http://localhost
+	addurl localhost ok
+	(recording state in git...)
+	joey@darkstar:~/tmp/a>git config remote.web.annex-ignore true
+	joey@darkstar:~/tmp/a>git annex get localhost
+	get localhost (not available) 
+	  Try making some of these repositories available:
+	  	00000000-0000-0000-0000-000000000001 -- web
+	
+	  (Note that these git remotes have annex-ignore set: web)
+	failed
+	git-annex: get: 1 failed
+	joey@darkstar:~/tmp/a>git config remote.web.annex-ignore false
+	joey@darkstar:~/tmp/a>git annex get localhost
+	get localhost (from web...) 
+	/home/joey/tmp/a/.g 100%[=====================>]      10  --.-KB/s   in 0s     
+	ok
+
+The assistant (probably?) needs to be restarted for those changes to
+take effect.  --[[anarcat]] and [[joeyh]].
diff --git a/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn b/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn
index d3e20b6db..d055a3556 100644
--- a/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn
+++ b/doc/todo/A_really_simple_way_to_pair_devices_like_bittorent_sync.mdwn
@@ -7,3 +7,5 @@ It would be just great to have some means to sync files without cloud just the t
 Anyway thanks for hearing. I'm looking forward to know more about git-annex. Thank you for that sw. =-<>-=
 
 > [[design/assistant/telehash]] --[[Joey]] 
+
+> > telehash has been mostly put aside for now, but there are interesting alternatives, including an [[special_remotes/ipfs]] special remote available. see [[todo/Bittorrent-like_features]] for followup on the discussion. so i'm marking this as a [[duplicate|done]]. --[[anarcat]]
diff --git a/doc/todo/Bittorrent-like_features.mdwn b/doc/todo/Bittorrent-like_features.mdwn
index f1075a124..cf67d5a3f 100644
--- a/doc/todo/Bittorrent-like_features.mdwn
+++ b/doc/todo/Bittorrent-like_features.mdwn
@@ -29,7 +29,18 @@ Another thing, this would be completely trackerless. You just use remote groups
 
 This was originally posted [[as a forum post|forum/Wishlist:_Bittorrent-like_transfers]] by [[users/GLITTAH]].
 
-Update: note how [[design/assistant/telehash/]] may be able to answer this specific use case.
+Update: there are multiple projects trying to solve this problem space outside of git-annex, which git-annex should reuse.
+
+ * [[design/assistant/telehash/]] support is still not complete, as the upstream spec and implementation (particularly Haskell bits), need to mature
+ * [[special_remotes/ipfs/]] is now a special remote that does respond to some of the requirements (but [duplicates files around](https://github.com/ipfs/go-ipfs/issues/875) even more and is [kind of](https://github.com/ipfs/go-ipfs/issues/872) [slow](https://github.com/ipfs/go-ipfs/issues/898))
+ * [Maidsafe](http://maidsafe.net/) is another option, which provides storage and uses crypto-currency incentives
+ * [Storj](http://storj.io/) is similar
+ * [camlistore](https://camlistore.org/) is yet another option
+ * [syncthing](https://syncthing.net/) looks like a btsync replacement, and could also be interesting
+ * [gittorrent](http://blog.printf.net/articles/2015/05/29/announcing-gittorrent-a-decentralized-github/) allows for decentralised sharing of the git objects, which could replace pairing between repositories, except it [doesn't support push yet](https://github.com/cjb/GitTorrent/issues/3)
+ * [gitocalypse](https://github.com/SeekingFor/gitocalypse) is similar to gittorrent, except it uses Freenet and HG (Mercurial?!) instead of the bittorrent DHT
+
+joeyh's approach for now is to [[wait and see what will emerge|devblog/day_219__catching_up_and_looking_back/]], but of course people are welcome to implement their own [[special_remotes]] to fix this problem!
 
 Using an external client (addurl torrent support)
 =================================================
diff --git a/doc/todo/Metadata_on_regular_git_objects___40__blob__44___trees__41____63__.mdwn b/doc/todo/Metadata_on_regular_git_objects___40__blob__44___trees__41____63__.mdwn
new file mode 100644
index 000000000..b3793501a
--- /dev/null
+++ b/doc/todo/Metadata_on_regular_git_objects___40__blob__44___trees__41____63__.mdwn
@@ -0,0 +1 @@
+Is it technically possible for the metadata interface to also support regular git objects, so that committed files or directories were also subject to tagging? For most metadata-related intents and purposes it seems I’d like to treat annexed and regular files alike; so I’d like to tag the LaTeX/ReST/etc. source for a presentation the same way I treat the output PDF, only that the former are likely not annexed. In the design docs it says metadata is attached to annex keys. Could it equally be attached to git blobs and trees, or would that break horribly somewhere?
diff --git a/doc/todo/shorten_git-annex_manpage/comment_2_859444d7e2826ac4448b0ba0f716328f._comment b/doc/todo/shorten_git-annex_manpage/comment_2_859444d7e2826ac4448b0ba0f716328f._comment
new file mode 100644
index 000000000..a0ec1c77c
--- /dev/null
+++ b/doc/todo/shorten_git-annex_manpage/comment_2_859444d7e2826ac4448b0ba0f716328f._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="no easy fix, i guess then"
+ date="2015-05-31T16:51:36Z"
+ content="""
+right, that would be great. unfortunately, we use the `.IP` macro in the rendered groff output, which only has a leader and nothing on the right. i don't believe there's a macro that would answer the requirement, and i looked at `man(7)`, `mdoc(7)`, `man-pages(7)`, `groff_man(7)`, `groff_mdoc(7)`... which probably covers most of the man material i am aware of.
+
+there *is* the `\h'N'` macro that allows moving `N` spaces to the right, but that wouldn't align the references, so we'd be better off with something like:
+
+<pre>
+ * undo `[filename|directory]` # git-annex-undo(1)
+
+   Undo last change to a file or directory.
+</pre>
+
+... or something like that...
+"""]]