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

14 files changed, 304 insertions, 0 deletions

diff --git a/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching.mdwn b/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching.mdwn
new file mode 100644
index 000000000..4bb1fc0e2
--- /dev/null
+++ b/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+When switching between my 2 repositories I now see a "." repository, see screenshot: http://screencast.com/t/0wxugJ9P 
+If I chose to switch to it, I get this error: http://screencast.com/t/5mndGNlhh8oN
+
+### What steps will reproduce the problem?
+Not sure if this is a real bug, maybe I screwed up?
+
+### What version of git-annex are you using? On what operating system?
+Version: 5.20150929-g7010007 
+Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA TorrentParser Database
+MAC OSX 10.10.5
+
+### 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
+there is nothing relevant to this error in there unfortunately.
+
+# End of transcript or log.
+"""]]
+
+### 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)
+
+
diff --git a/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching/comment_1_70a34d43629075249897bdc5301c55f5._comment b/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching/comment_1_70a34d43629075249897bdc5301c55f5._comment
new file mode 100644
index 000000000..3780297f6
--- /dev/null
+++ b/doc/bugs/A_weird___34__.__34___repository_shows_up_when_switching/comment_1_70a34d43629075249897bdc5301c55f5._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 1"
+ date="2015-10-03T19:03:17Z"
+ content="""
+trying to delete the test-repository I had created I get: 
+http://screencast.com/t/AhSiNXESvm 
+trying again I get: 
+http://screencast.com/t/hpFZL0mL
+
+but in the end it got deleted. kinda. not sure. :-( one deleted successfully one simply hangs.
+still nothing in the logs.
+"""]]
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment b/doc/bugs/Android:_Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment
new file mode 100644
index 000000000..22aacf306
--- /dev/null
+++ b/doc/bugs/Android:_Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="dah"
+ subject="comment 2"
+ date="2015-10-04T18:25:29Z"
+ content="""
+I think the CPU of my phone is not good enough to be usable with a web browser on my phone.
+
+I can use Git Annex without the WebApp without phone stability problems. But if I start the WebApp then nothing works (it seems 100% of my CPU is used - but it could also be that the CPU monitor app did freeze).
+
+Websites like Google and Wikipedia work without problems but I had another website that made my phone unusable and forced me to restart my phone.
+
+I think therefore my phone is the problem and not Git Annex.
+
+So, the best way for me to use Git Annex on my phone is probably the cammand line interface.
+
+Besides the text relocations warning there was another message that said \"Falling back to hardcoded app location: cannot find expected files in $path\".
+
+Is this a problem or does everything work properly?
+
+
+"""]]
diff --git a/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly.mdwn b/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly.mdwn
new file mode 100644
index 000000000..613e11eae
--- /dev/null
+++ b/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly.mdwn
@@ -0,0 +1,81 @@
+### Please describe the problem.
+
+There exist more BSD systems than FreeBSD. Thus I propose diff for Utility/libdiskfree.c.
+
+Based on pkgsrc patching guidelines https://www.netbsd.org/docs/pkgsrc/components.html#components.patches.guidelines
+I tried to cook a diff even I'm not C developer.
+
+
+### What steps will reproduce the problem?
+
+Add support for more OS for disk free check.
+
+### What version of git-annex are you using? On what operating system?
+git-annex-5.20150930
+
+
+### Please provide any additional information below.
+
+The diff probably needs check, improvement...
+
+[[!format sh """
+--- libdiskfree.c.orig	Sun Oct  4 15:18:07 2015
++++ libdiskfree.c	Sun Oct  4 15:23:23 2015
+@@ -7,35 +7,30 @@
+ 
+ /* Include appropriate headers for the OS, and define what will be used to
+  * check the free space. */
+-#if defined(__APPLE__)
+-# define _DARWIN_FEATURE_64_BIT_INODE 1
+-# include <sys/param.h>
+-# include <sys/mount.h>
+-# define STATCALL statfs
+-# define STATSTRUCT statfs64
+-#else
+-#if defined (__FreeBSD__)
+-# include <sys/param.h>
+-# include <sys/mount.h>
+-# define STATCALL statfs /* statfs64 not yet tested on a real FreeBSD machine */
+-# define STATSTRUCT statfs
+-#else
+-#if defined __ANDROID__
+-# warning free space checking code not available for Android
+-# define UNKNOWN
+-#else
+ #if defined (__linux__) || defined (__FreeBSD_kernel__)
+ /* Linux or Debian kFreeBSD */
+ /* This is a POSIX standard, so might also work elsewhere too. */
+ # include <sys/statvfs.h>
+ # define STATCALL statvfs
+ # define STATSTRUCT statvfs
+-#else
+-# warning free space checking code not available for this OS
++#endif
++
++#if defined __ANDROID__
++# warning free space checking code not available for Android
+ # define UNKNOWN
+ #endif
++
++#if defined (HAVE_SYS_PARAM_H) && defined (HAVE_SYS_MOUNT_H)
++#if defined(__APPLE__)
++# define _DARWIN_FEATURE_64_BIT_INODE 1
+ #endif
+-#endif
++# include <sys/param.h>
++# include <sys/mount.h>
++# define STATCALL statfs /* statfs64 not yet tested on a real FreeBSD machine */
++# define STATSTRUCT statfs64
++#else
++# warning free space checking code not available for this OS
++# define UNKNOWN
+ #endif
+ 
+ #include <errno.h>
+
+"""]]
+
+### 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)
+
+Not tested this "feature" yet, I got another issue which blocks me for now.
+
diff --git a/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly/comment_1_cdbf63d15795946f55aaea3da4755a22._comment b/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly/comment_1_cdbf63d15795946f55aaea3da4755a22._comment
new file mode 100644
index 000000000..2b3113561
--- /dev/null
+++ b/doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly/comment_1_cdbf63d15795946f55aaea3da4755a22._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="jirib@503223f0610c6c66f4e6dc738a5a0b2648c290b1"
+ nickname="jirib"
+ subject="no statfs64 on OpenBSD"
+ date="2015-10-04T13:47:30Z"
+ content="""
+there's no statfs64 on OpenBSD, maybe following similar diff from conky fs part could help:
+
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/conky/patches/patch-src_fs_c?rev=1.3&content-type=text/x-cvsweb-markup
+"""]]
diff --git a/doc/devblog/day_321__download_verification/comment_3_fb0ed50c27a493c3494bf2efbf9a9c5d._comment b/doc/devblog/day_321__download_verification/comment_3_fb0ed50c27a493c3494bf2efbf9a9c5d._comment
new file mode 100644
index 000000000..657b61bac
--- /dev/null
+++ b/doc/devblog/day_321__download_verification/comment_3_fb0ed50c27a493c3494bf2efbf9a9c5d._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="encryptio"
+ subject="comment 3"
+ date="2015-10-03T21:09:31Z"
+ content="""
+Nice! I actually had been doing `git annex get $file && git annex fsck $file` in all my scripts already because I had run into an issue where a bad file got replicated everywhere, and the only good copy I had was `drop`ped before I realized. This would have caught it. Thanks!
+"""]]
diff --git a/doc/forum/Trying_to_delete_an_S3_repo_fails.mdwn b/doc/forum/Trying_to_delete_an_S3_repo_fails.mdwn
new file mode 100644
index 000000000..6544fd1f3
--- /dev/null
+++ b/doc/forum/Trying_to_delete_an_S3_repo_fails.mdwn
@@ -0,0 +1,3 @@
+[2015-10-03 22:10:53.948377] TransferScanner: warning TransferScanner crashed: unknown response from git cat-file ("refs/heads/git-annex:706/2a9/SHA256E-s13840914--38cdcf384aee777000693f58f1302684bf18f577045c1340d7aeb72b6d6f2233.dmg.log.cnk missing","refs/heads/git-annex:b8f/4d2/SHA256E-s26301635--ce2f215486df83c6ada74a81679ff78f717404d0637bfd51ecbf0330c21db12b.dmg.log")
+
+What exactly is this telling me?
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback.mdwn b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback.mdwn
new file mode 100644
index 000000000..934617888
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback.mdwn
@@ -0,0 +1,39 @@
+So after more than a year I think I am slowly beginning grasping git-annex. I'd like to put all my questions and ideas into this one thread, maybe you guys can help me sort things out. I'll number everything so you're more than welcome to chime in with regards to a particular item only. Happy to get links to read up stuff, don't hesitate to just paste a link if you think it is useful.
+
+	*1.* Right or wrong: I can only "work" with files in "CLIENT" repositories, not with backup, archive or anything else?
+
+	*2.* How does the copying or synching work? Is it comparable to rsync? How good is it at solving conflicts?
+
+	*3.* Can I get some feedback if git-annex is a solution for my scenario?
+
+*I have 1 Macbook, 1 NAS (Freenas running freeBSD) and access to S3 and box.com as well as a few external HDs.*
+My current setup involves a lot of manual copying, (very careful usage of) rsync and basically ends up me having a copy/backup of everything on the NAS and the files I currently work with on my Macbook.
+
+
+*Ideally I'd want to achieve something like this:*
+
+	- Have all files on the NAS
+	- Only have current work files on my Macbook
+	- Use external HDs only when necessary or transferign stuff
+	- S3 and box.com can be used however needed.
+
+	*4.* DOCUMENTS
+So in case I am travelling without Macbook, I use another PC or my Android phone to connect to my router at home via VPN then access a share on my NAS, work on a file, print it, save it back so whenever my MACbook is online again, it syncs the latest version.
+To achieve this with got-annex I guess I need the repository on the NAS to be a client repo, right? But the problem I see is that if I move a sub-folder from Docs into Archive, i.e. a folder of manuals I don't need on my MACbook all the time, it also gets moved out of the client repo on the NAS into an archive repo so how would I access it remotely if necessary?
+Also, talking about archiving, doesn't this get messy if you have a complicated folder structure inside a repo? How would you put stuff back from archives exactly where it was? 
+Sorry if this sounds a bit silly but I rely on a very precise folder system, everything is properly placed where I know it will be so if I now drag/drop all sorts of files/folders into archive I'll never figure out what's what again.
+
+	*5.* MUSIC
+This should be fairly easy, all my music is on my NAS and on my macbook, whenever I add music to my macbook it'll automatically sync to the NAS.
+
+	*6.* PICTURES
+This is where it gets complicated.
+I have a folder: Pictures with subfolders for each year, aka 2010, 2011 ... 2015 and inside is a sub folder for each photographed event. Now these pics get too big for my macbook so I'd like all images to be on my NAS, available for access, and to be able to simply archive say 2014. Now the question is if later I remember I need access to a particular event in 2014, can I browse that folder and un-archive that particular folder?
+
+	*7.* Also, say I'd like to be able to take a folder/sub-folder of images with me for external editing on a HD, and when coming back with them I'd like them to be synced back when I plug the HD back in, what type of repository would i have to set this HD to?
+
+	*8.* Obviously I'd need to setup a different repository for each Documents, Pictures, Music with their own settings, right?
+
+        *9.* At the moment it is not possible to have separate number of minimum number of copies per repository?
+
+So, what do you think, is git-annex suitable for my needs? Partially at least?
diff --git a/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_1_86a86f1f3ea2e778e4022689391b887b._comment b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_1_86a86f1f3ea2e778e4022689391b887b._comment
new file mode 100644
index 000000000..4ef121bf9
--- /dev/null
+++ b/doc/forum/Trying_to_wrap_my_head_around_git-annex__44___need_some_feedback/comment_1_86a86f1f3ea2e778e4022689391b887b._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="comment 1"
+ date="2015-10-04T17:58:48Z"
+ content="""
+I think it can be a good fit. Let me try to answer some of your questions in the order that seems most reasonable to me
+
+*8* It is not a strict requirement to hav different repos for the different things, but I guess it might simplify things. Plus You can start with one of them and when that is properly set up continue with the next one.
+
+*5* your music solution seems simple enough. Numcopies=2 and everything should work. 
+
+*1*, *4*, *9* There is nothing magic with client remotes. It is just a group, that has some default rules. You can create your own groups and also change their rules. For my documents, I have two custom groups, \"offsite\" and \"cloud\". I have set up rules so that files prefer to be in one offsite remote and one cloud remote. However until I had possibility to plug my computer into an off site disc and sync it all files want to be in two cloud remotes. 
+
+*4*, *6* I personally do not run the assistant, but do everything on the command line. For me the setup where old things that I will probably never access again lies in an archive folder, if I do need it I can get the file back wit a simple \"git annex get $filename\". For my documents tree I only add files and folder or move folders into an archive folder. (Also note that archive folders can be located anywhere in your file tree, and that you can have arbitrarily many
+"""]]
diff --git a/doc/forum/external_special_remote_protocol_and_threads/comment_2_df97223aad2c8c95ce109944d64a59fe._comment b/doc/forum/external_special_remote_protocol_and_threads/comment_2_df97223aad2c8c95ce109944d64a59fe._comment
new file mode 100644
index 000000000..11ce16ac8
--- /dev/null
+++ b/doc/forum/external_special_remote_protocol_and_threads/comment_2_df97223aad2c8c95ce109944d64a59fe._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="comment 2"
+ date="2015-10-04T07:49:02Z"
+ content="""
+Thanks for a clear answer. It seems that I am still in the sweet spot for using -J4. I.e transport everything to multiple remotes in parallel. 
+
+I do however take it as a recommendation to be careful, and will give it another consideration to be careful in case of doing more development work and releasing it.
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_1_9d0694204984ec96379a62f0f70ba696._comment b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_1_9d0694204984ec96379a62f0f70ba696._comment
new file mode 100644
index 000000000..3a17029ee
--- /dev/null
+++ b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_1_9d0694204984ec96379a62f0f70ba696._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="Need advice on using gitlab with the assistant"
+ date="2015-10-03T21:03:45Z"
+ content="""
+There is a GUI and I followed it but when upgrading it to a full git-annex repository I get:
+
+remote: GitLab: You are not allowed to force push code to a protected branch on this project.        
+To git@git-annex-gitlab.com-git_22_pacuraru.2Fgitannex.2Egit:pacuraru/gitannex.git
+ ! [remote rejected] refs/gcrypt/gitception+ -> master (pre-receive hook declined)
+error: failed to push some refs to 'git@git-annex-gitlab.com-git_22_pacuraru.2Fgitannex.2Egit:pacuraru/gitannex.git'
+error: failed to push some refs to 'gcrypt::git@git-annex-gitlab.com-git_22_pacuraru.2Fgitannex.2Egit:pacuraru/gitannex.git'
+[2015-10-03 23:01:30.409376] main: Syncing with gitlab.com_pacuraru_gitannex.git 
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_2_1c33d3f62ec7119c116ad02b75c91f8a._comment b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_2_1c33d3f62ec7119c116ad02b75c91f8a._comment
new file mode 100644
index 000000000..cdbc035e4
--- /dev/null
+++ b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_2_1c33d3f62ec7119c116ad02b75c91f8a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 2"
+ date="2015-10-03T21:27:46Z"
+ content="""
+I managed to overcome that hurdle but now gitlab shows as \"just a git repository\" and I don't seem to be able to do the conversion \"Upgrade Repository\" - nothing in the logs, any ideas?
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_3_7d3ea328a42c3a1df01f87e5233eca62._comment b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_3_7d3ea328a42c3a1df01f87e5233eca62._comment
new file mode 100644
index 000000000..514334247
--- /dev/null
+++ b/doc/tips/centralized_git_repository_tutorial/on_GitLab/comment_3_7d3ea328a42c3a1df01f87e5233eca62._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 3"
+ date="2015-10-03T21:29:29Z"
+ content="""
+oh, and btw. there's no button in the assistant to delete this useless gitlab repo, I can only edit it and try and upgrade it which doesn't work :-(
+"""]]
diff --git a/doc/tips/skydriveannex/comment_11_13692d8cb9ccf10ced26d90739385a6a._comment b/doc/tips/skydriveannex/comment_11_13692d8cb9ccf10ced26d90739385a6a._comment
new file mode 100644
index 000000000..981c3dcdc
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_11_13692d8cb9ccf10ced26d90739385a6a._comment
@@ -0,0 +1,47 @@
+[[!comment format=mdwn
+ username="ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626"
+ nickname="ovidiu"
+ subject="comment 11"
+ date="2015-10-03T19:18:24Z"
+ content="""
+shiny:skydriveannex ovi$ git annex initremote skydrive type=external externaltype=skydrive encryption=shared folder=gitannex
+initremote skydrive (encryption setup) (shared cipher)  21:14:20 [skydriveannex-0.2.1] <module> : 'Starting'
+ 21:14:20 [skydriveannex-0.2.1] login : 'EXCEPTION api.auth_get_token:AuthenticationError(u\"Insufficient authentication data provided (missing keys: [u'code'])\",)'
+osascript: OpenScripting.framework - scripting addition \"/Library/ScriptingAdditions/AeroFSFinderExtension.osax\" cannot be used with the current OS because it has no OSAXHandlers entry in its Info.plist.
+git-annex: You need to set OAUTH environment variables and folder and encryption parameters when running initremote.
+
+the folder gitannex was created on my onedrive but that is all.
+
+Log files:
+[2015-10-03 21:12:43.322605] main: Syncing with onedrive 
+ 21:12:50 [skydriveannex-0.2.1] <module> : 'Starting'
+ 21:12:5
+
+9  [ sYkoyud rnieveeda ntnoe xs-e0t. 2O.A1U]T Hl oegnivni r:o n'mEeXnCtE PvTaIrOiNa balpeis. aauntdh _fgoeltd_etro kaennd: PernoctroycpotliEornr opra(r4a0m0e,t e'r4s0 0f oCrl itehnet  rEermrootre:. 
+Bad Request')'
+[2015-10-03 21:13:07.435901] main: Syncing with onedrive 
+
+
+  You need to set OAUTH environment variables and folder and encryption parameters for the remote.
+[2015-10-03 21:15:14.60821] main: Syncing with onedrive 
+
+
+  You need to set OAUTH environment variables and folder and encryption parameters for the remote.
+[2015-10-03 21:15:57.926083] main: starting assistant version 5.20150929-g7010007
+(scanning...) [2015-10-03 21:15:58.506776] Watcher: Performing startup scan
+(started...) gpg: Signature made Wed Sep 30 20:45:53 2015 CEST using DSA key ID 89C809CB
+gpg: /var/folders/m6/zkd11n111m38ff37zbtgq0lr0000gp/T/git-annex-gpg.tmp.0/trustdb.gpg: trustdb created
+gpg: Good signature from \"git-annex distribution signing key (for Joey Hess) <id@joeyh.name>\"
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 4005 5C6A FD2D 526B 2961  E78F 5EE1 DBA7 89C8 09CB
+ 21:16:01 [skydriveannex-0.2.1] <module> : 'Starting'
+ 21:16:
+
+01   [Ysokuy dnreievde atnon esxe-t0 .O2A.U1T]H  leongviinr o:n m'eEnXtC EvPaTrIiOaNb laepsi .aanudt hf_ogledte_rt oaknedn :ePnrcortyopctoiloEnr rpoarr(a4m0e0t,e r's4 0f0o rC ltiheen tr eEmrortoer.:
+ Bad Request')'
+[2015-10-03 21:16:34.655604] main: Syncing with onedrive 
+
+
+  You need to set OAUTH environment variables and folder and encryption parameters for the remote.
+"""]]