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

11 files changed, 110 insertions, 2 deletions

diff --git a/doc/bugs/S3_upload_not_using_multipart.mdwn b/doc/bugs/S3_upload_not_using_multipart.mdwn
new file mode 100644
index 000000000..3aa0ce6a5
--- /dev/null
+++ b/doc/bugs/S3_upload_not_using_multipart.mdwn
@@ -0,0 +1,42 @@
+I am trying to 'git annex copy large_file.tgz --to cloud' where cloud is an Amazon S3 remote.  My file is 7.4G as reported by 'ls'.  The output of the operation is...
+
+    copy large-file.tgz (gpg) (checking cloud...) (to cloud...) Reading passphrase from file descriptor 12    
+
+
+     Your proposed upload exceeds the maximum allowed size
+     failed
+     git-annex: copy: 1 failed
+
+Looks like git-annex may not be using the Multipart Upload API: http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html
+
+Here is some output from my local client that may be helpful.
+
+    annex [master●] % git annex status
+	supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
+	supported remote types: git S3 bup directory rsync web webdav glacier hook
+	repository mode: indirect
+	trusted repositories: 0
+	semitrusted repositories: 3
+		00000000-0000-0000-0000-000000000001 -- web
+	 	BE1D8EC7-C64B-47DE-AD4E-2A50437532B4 -- cloud
+	 	E84568BA-6A4B-4AA1-B622-605B9248EDB1 -- here (eric laptop)
+	untrusted repositories: 0
+	dead repositories: 0
+	transfers in progress: none
+	available local disk space: 169 gigabytes (+1 megabyte reserved)
+	temporary directory size: 218 megabytes (clean up with git-annex unused)
+	local annex keys: 24
+	local annex size: 8 gigabytes
+	known annex keys: 25
+	known annex size: 8 gigabytes
+	bloom filter size: 16 mebibytes (0% full)
+	backend usage: 
+		SHA256E: 49
+	annex [master●] % git annex version
+	git-annex version: 3.20130114
+	local repository version: 3
+	default repository version: 3
+	supported repository versions: 3
+	upgrade supported from repository versions: 0 1 2
+
+
diff --git a/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn b/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn
new file mode 100644
index 000000000..5415e7b43
--- /dev/null
+++ b/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn
@@ -0,0 +1,24 @@
+What steps will reproduce the problem?
+
+I downloaded the os x assistant today.
+
+I'd previously installed it but hadn't linked it to another repo.
+
+I tried to create a remote repo on an ssh server using the assistant.
+
+What is the expected output? What do you see instead?
+
+Creating a remote repo or giving an understandable error message.
+
+What version of git-annex are you using? On what operating system?
+
+3.20121212
+OS X 10.8.2 (Mountain Lion)
+
+The remote machine is running debian stable.
+
+Please provide any additional information below.
+
+Internal Server Error
+user error (gpg ["--quiet","--trust-model","always","--gen-random","--armor","1","512"] exited 127)
+git-annex version 3.20121212
diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
index e85be6d9a..3a56a0c09 100644
--- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
+++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
@@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
 adept friends or family -- what's preventing you from introducing them to
 the assistant?
 
-[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 19 "I need a Windows port" 29 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 23 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 11 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 3 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 3 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package"]]
+[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 21 "I need a Windows port" 29 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 23 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 7 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 12 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 3 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 3 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package"]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.
diff --git a/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_2_00e6576e3e60d2650461eeb0f918e6e5._comment b/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_2_00e6576e3e60d2650461eeb0f918e6e5._comment
new file mode 100644
index 000000000..64f111921
--- /dev/null
+++ b/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_2_00e6576e3e60d2650461eeb0f918e6e5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM"
+ nickname="Karsten"
+ subject="comment 2"
+ date="2013-01-21T07:02:17Z"
+ content="""
+An alternative to running git annex sync in the non-bare remote is running an assistant there.
+"""]]
diff --git a/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_3_c36a9562c53ac683b62fc4471405aa2a._comment b/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_3_c36a9562c53ac683b62fc4471405aa2a._comment
new file mode 100644
index 000000000..db7dec37f
--- /dev/null
+++ b/doc/forum/Repo_accessible_from___34__dumb__34___client_without_git-annex/comment_3_c36a9562c53ac683b62fc4471405aa2a._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk3HGoDpnOPob5jOjvIootmkve1-nCpRiI"
+ nickname="Kalle"
+ subject="Thanks for the help"
+ date="2013-01-21T20:40:39Z"
+ content="""
+I take it all the above requires mounting an sshfs filsystem of the remote client to run the git-annex or the assistant \"locally\" on the desktop or laptop. Or am I missing something.
+
+For the usb usecase a normal mount would suffice of course.
+
+The lack of automation means running a rsync script from (or to) the phone is easier. Not as clever though :( and means running a separate \"system\" for distributing files to the phone.
+
+Thanks again!
+
+"""]]
diff --git a/doc/forum/one_or_many_annexes__63__.mdwn b/doc/forum/one_or_many_annexes__63__.mdwn
new file mode 100644
index 000000000..57b311c18
--- /dev/null
+++ b/doc/forum/one_or_many_annexes__63__.mdwn
@@ -0,0 +1,7 @@
+Just a question about other peoples' annex usage.  I've got one uber-annex (in ~/annex of course) where I keep ALL THE THINGS, movies, music, pictures, whatever.
+
+It's very big, of course.  And I worry about doing anything unusual with it (like trying out direct mode) because, hey, that's all my stuff.
+
+Like, just now, I tried flipping it into direct mode, and a handful of files stayed symlinks, which weirded me out.  (Maybe because I had the assistant running while I switched it, and that caused chaos?)  Then I flipped it back to indirect, and a bunch of files were left un-tracked, as real files rather than links!  I kind of freaked out, and did a big "git annex add" to add them all back. I haven't left a bug report because it's not something I want to try again experimentally to reproduce, I just want my repo back, you know?
+
+Anyways, this kind of thing might not happen if I kept multiple small repos.  I was wondering if anybody else worked that way, and what advantages/disadvantages you've found compared to having one super-repo.
diff --git a/doc/forum/one_or_many_annexes__63__/comment_1_656d96011801d67a45b0b3bb3d70fa63._comment b/doc/forum/one_or_many_annexes__63__/comment_1_656d96011801d67a45b0b3bb3d70fa63._comment
new file mode 100644
index 000000000..240f9868f
--- /dev/null
+++ b/doc/forum/one_or_many_annexes__63__/comment_1_656d96011801d67a45b0b3bb3d70fa63._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM"
+ nickname="Karsten"
+ subject="comment 1"
+ date="2013-01-21T21:25:12Z"
+ content="""
+That's an interesting question. Personally, I have two annexes. One for my \"digital library\": movies, music, ebooks, downloads, everything I want to keep but was not created by me. I don't want to loose them because getting them back would be expensive and cumbersome. The other is my personal archive for Photos and Videos I've taken, which are valuable as they contain many memories which would be impossible to recreate if lost. With the first one, I'm experimenting quite a lot, with the second one I'm very conservative. Hope that helps.
+"""]]
diff --git a/doc/forum/switching_to__47__from_direct_mode_while_assistant_is_running.mdwn b/doc/forum/switching_to__47__from_direct_mode_while_assistant_is_running.mdwn
new file mode 100644
index 000000000..f92b5aca3
--- /dev/null
+++ b/doc/forum/switching_to__47__from_direct_mode_while_assistant_is_running.mdwn
@@ -0,0 +1,2 @@
+Is that really unsafe?  Because I did that and the switch to direct mode seemed to leave a lot of files still as links, and when I panicked and switched back to indirect mode, a whole lot of stuff seemed to have become unannexed and I reannexed it.
+
diff --git a/doc/special_remotes/bup.mdwn b/doc/special_remotes/bup.mdwn
index 519b5607f..ec444912c 100644
--- a/doc/special_remotes/bup.mdwn
+++ b/doc/special_remotes/bup.mdwn
@@ -1,5 +1,5 @@
 This special remote type stores file contents in a 
-[bup](http://github.com/apenwarr/bup) repository. By using git-annex
+[bup](http://github.com/bup/bup) repository. By using git-annex
 in the front-end, and bup as a remote, you get an easy git-style
 interface to large files, and easy backups of the file contents using git.
 
diff --git a/doc/todo/add_an_icon_for_the_.desktop_file.mdwn b/doc/todo/add_an_icon_for_the_.desktop_file.mdwn
new file mode 100644
index 000000000..3be158a0a
--- /dev/null
+++ b/doc/todo/add_an_icon_for_the_.desktop_file.mdwn
@@ -0,0 +1 @@
+Maybe add the icon /usr/share/doc/git-annex/html/logo.svg to the .desktp file.
diff --git a/doc/todo/wishlist:_special_remote_mega.co.nz.mdwn b/doc/todo/wishlist:_special_remote_mega.co.nz.mdwn
new file mode 100644
index 000000000..788a3a43f
--- /dev/null
+++ b/doc/todo/wishlist:_special_remote_mega.co.nz.mdwn
@@ -0,0 +1 @@
+mega.co.nz has 50gb for free accounts. They also have an API, so I guess it wouldn't be too hard to use it as a special remote.