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

5 files changed, 114 insertions, 0 deletions

diff --git a/doc/bugs/Initial___34__Make_repository__34___fails_due_to___34__empty_ident_name___40__for___60__email-address__62____41___not_allowed__34__.mdwn b/doc/bugs/Initial___34__Make_repository__34___fails_due_to___34__empty_ident_name___40__for___60__email-address__62____41___not_allowed__34__.mdwn
new file mode 100644
index 000000000..b15cfad68
--- /dev/null
+++ b/doc/bugs/Initial___34__Make_repository__34___fails_due_to___34__empty_ident_name___40__for___60__email-address__62____41___not_allowed__34__.mdwn
@@ -0,0 +1,43 @@
+### Please describe the problem.
+
+During an initial run of "git annex webapp", it gets stuck at the "Make repository" stage. Entering a directory and pressing "Make repository" takes the user back to the same page repeatedly, preventing them from advancing.
+
+### What steps will reproduce the problem?
+
+Download https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz from 2015-10-19 (sha1: 3b30de86d6790fdf80de90b2f54967de8345fe98 ) on an Ubuntu Trusty Tahr server, untar, run git-annex-webapp, attempt to make a Repository in ~/annex. "Make repository" fails to advance.
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex-standalone-i386.tar.gz downloaded on 2015-10-19 (sha1: 3b30de86d6790fdf80de90b2f54967de8345fe98), on Ubuntu Trusty Tahr (14.04.3).
+
+### Please provide any additional information below.
+
+The following is printed to the console (no daemon.log is generated):
+
+[[!format sh """
+~/src/git-annex.linux$ ./git-annex-webapp 
+Launching web browser on file:///tmp/webapp8296.html
+
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: empty ident name (for <k@home.everets.org>) not allowed
+(recording state in git...)
+
+
+# End of transcript or log.
+"""]]
+
+Manually running the "git config --global user.name" will allow the process to proceed. It will just be confusing to users who launched the webapp via a menu item.
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Works well using the debian testing package on a debian laptop!
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment
new file mode 100644
index 000000000..82012ec6a
--- /dev/null
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="FWIW"
+ date="2015-10-30T17:51:09Z"
+ content="""
+found another user of lustre who wouldn't be able to use annex there -- 'sync' is not an option for them since it has heavy performance hit.
+
+What does git do?
+"""]]
diff --git a/doc/todo/Bittorrent-like_features.mdwn b/doc/todo/Bittorrent-like_features.mdwn
index fe6f78f6b..912bf1d5d 100644
--- a/doc/todo/Bittorrent-like_features.mdwn
+++ b/doc/todo/Bittorrent-like_features.mdwn
@@ -39,6 +39,9 @@ Update: there are multiple projects trying to solve this problem space outside o
  * [syncthing](https://syncthing.net/) looks like a btsync replacement, and could also be interesting, see the [[todo/syncthing_special_remote]] discussion
  * [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
+ * [tox](https://tox.chat/) - DHT-enabled chat, file transfer and messaging platform, [no stable release](https://github.com/irungentoo/toxcore/issues/1353), [security concerns](http://lists.alioth.debian.org/pipermail/pkg-privacy-maintainers/Week-of-Mon-20150928/000046.html)
+ * [ricochet](https://ricochet.im/) - similar, but relies on Tor, unclear if it supports file transfers, packaged in Debian
+ * [pond](https://pond.imperialviolet.org/) - similar to ricochet
 
 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!
 
diff --git a/doc/todo/xmpp_removal/comment_2_1c92cde199612bbd765c818e7b64f944._comment b/doc/todo/xmpp_removal/comment_2_1c92cde199612bbd765c818e7b64f944._comment
new file mode 100644
index 000000000..f13386a7f
--- /dev/null
+++ b/doc/todo/xmpp_removal/comment_2_1c92cde199612bbd765c818e7b64f944._comment
@@ -0,0 +1,46 @@
+[[!comment format=mdwn
+ username="Gastlag"
+ subject="Is xmpp the problem ?"
+ date="2015-10-30T10:42:06Z"
+ content="""
+Hello, 
+
+I was wondering why assistant \"is increasingly rarely used\" ?
+if you look the different item of the survey http://git-annex-survey.branchable.com/polls/2015/, yes 53% of people said \"I use the assistant, but without XMPP\"
+
+And \"missing ports\" :
+
+ - \"I'm good -- git-annex runs on my OSes of choice! (43%)\"
+   - \"Windows (13%)\"
+   - Android (6%)
+
+But if you look other anwsers you see
+
+ - \"using with\" :
+   - by myself (59%)
+   - by myself so far but I hope to get others using my repository (28%)
+
+And :
+
+  - \"Pick the operating system which you use git-annex on the most.\" :
+    - \"Linux (78%)\"
+    - \"OSX (13%)\"
+
+
+Further more \"blocking problems\" :
+
+  - too hard to install (4%)
+  - too hard to use (7%)
+  - not good enough documentation (16%)
+  - The only use for the assistant would be in combination with a good, native, fully automagic Android version which includes some sort of native UI (16%)
+  - I use the command line, and **find it difficult to show others** how to use the git-annex assistant (12%)
+  - The lack of selective file sync (ie, git annex get and git annex drop) is what prevents me from using the Assistant (5%)
+
+And \"focus\" : 
+
+  -  make it easier for nontechnical users (25%) 
+
+I think remove xmpp is a bad idea because as you say it's enable \"Friend discovery and easy sharing of git repo to friends.\" and there is already a lot of people who use xmpp and XMPP address are user friendly because close to email adress. And the main problem seems to be that git-annex assistant still too hard to use and not usable on the platform where users are : windows.
+
+The main problem is that git-annex is still not ready for users. It have too reach other people than \"hardcore linux users\" to be a social tool and remove xmpp may not be the good solution.
+"""]]
diff --git a/doc/todo/xmpp_removal/comment_3_661be364029ce45db7d6a111b9d65ee7._comment b/doc/todo/xmpp_removal/comment_3_661be364029ce45db7d6a111b9d65ee7._comment
new file mode 100644
index 000000000..f17a19869
--- /dev/null
+++ b/doc/todo/xmpp_removal/comment_3_661be364029ce45db7d6a111b9d65ee7._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="re tox"
+ date="2015-10-30T15:37:09Z"
+ content="""
+i am not sure the proper replacement for XMPP is tox. First off, Debian privacy folks have [expressed concerns about the actual security of Tox](http://lists.alioth.debian.org/pipermail/pkg-privacy-maintainers/Week-of-Mon-20150928/000046.html), which is not a big requirement here, but nevertheless is a question worth adressing. [Pond](https://pond.imperialviolet.org/) and [Ricochet](http://ricochet.im/) are interesting alternatives that are being packaged in Debian (the latter which just entered unstable).
+
+Furthermore, it seems that XMPP is really a \"patch\", a workaround for NAT issues and, in general, how to share git-annex repositories with users in arbitrary locations. This problem space is more similar to [[todo/Bittorrent-like_features/#index1h1]] than XMPP. Using tox libraries may enable git-annex to share git metadata around, but would it allow git-annex to download actual files from other users through tox? How stable is tox? Last I checked, [tox core don't actually want to make any releases](https://github.com/irungentoo/toxcore/issues/1353), which makes it a much less attractive option because the API can change all the time...
+
+I have nevertheless added the three tools to [[todo/Bittorrent-like_features/]].
+
+Anyways, it seems that XMPP is rarely used and could be removed if it makes maintenance easier: i have never found a good use case for it, personnally: you can usually find a space for a private git repo fairly easily... the problem is sharing the big files! --[[anarcat]]
+"""]]