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

5 files changed, 70 insertions, 0 deletions

diff --git a/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_5_a2ff7668f2a0d549b362d7de97fac8a1._comment b/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_5_a2ff7668f2a0d549b362d7de97fac8a1._comment
new file mode 100644
index 000000000..10c068f13
--- /dev/null
+++ b/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_5_a2ff7668f2a0d549b362d7de97fac8a1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 5"
+ date="2013-04-08T21:16:33Z"
+ content="""
+\"I would imagine\" is not a useful debugging method. I asked you to run `git annex add` so that if it succeeds, I have a verified data point that reduces the problem space to only code inside the assistant, and if it fails, I have an easy way to reproduce the problem to debug further. At the moment, I have neither. :P
+
+`.gitignore` is really, truely, not supported by the assistant. I just ran your test case, and it added `file.test` as soon as I created it. Also, I never wrote support for `.gitignore`; I know right where that support should go, and I have a dozen people who have complained it is not supported.
+"""]]
diff --git a/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_6_60d72f34a6cfd1c081f74aa610f4305a._comment b/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_6_60d72f34a6cfd1c081f74aa610f4305a._comment
new file mode 100644
index 000000000..c8a2730c2
--- /dev/null
+++ b/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_6_60d72f34a6cfd1c081f74aa610f4305a._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="Xyem"
+ ip="87.194.19.134"
+ subject="comment 6"
+ date="2013-04-08T22:06:35Z"
+ content="""
+When you asked me if 'git annex add' worked, I wasn't in the position to test it as I didn't have any files in this failed state. All reported occurrences had been added by the assistant's startup scan on its second running...
+
+I've managed to reproduce the issue again and can confirm 'git annex add'ing the file that failed to checksum through the assistant works successfully. The only difference on this occurrence is that I downloaded the files from a local webserver, sharing the files from my disk as it was taking several gigabytes of download to occur. All other files were added successfully.
+
+daemon.log
+
+    [2013-04-08 22:41:13 BST] Committer: Adding blender_l.eos_04.zip
+    add blender_lowpoly_videos_04.zip (checksum...) failed
+
+git annex add
+
+    $ git annex add blender_lowpoly_videos_04.zip
+    add blender_lowpoly_videos_04.zip (checksum...) ok
+
+In case it matters at all, the workaround I am using below has not demonstrated the issue yet:
+
+    while true; do git annex add; sleep 1; done
+
+Still very interesting that .gitignore is not supposed to work. After running through the test case on my machine:
+Restarting the assistant doesn't add file.test
+'git annex add' doesn't add file.test
+'git annex add file.test' doesn't add file.test
+
+Looks like it works as one would expect from here. Perhaps I'm in some backwards dimension where what should work, doesn't, and what shouldn't work, does! :) Would certainly explain a lot..
+
+Thanks for your help. As you can probably tell, I really want to use git-annex!
+"""]]
diff --git a/doc/design/assistant/blog/day_232__headless_webapp/comment_1_0fdd77d143ecba6fdb9f75cb6fc37bfb._comment b/doc/design/assistant/blog/day_232__headless_webapp/comment_1_0fdd77d143ecba6fdb9f75cb6fc37bfb._comment
new file mode 100644
index 000000000..1b36a9ad8
--- /dev/null
+++ b/doc/design/assistant/blog/day_232__headless_webapp/comment_1_0fdd77d143ecba6fdb9f75cb6fc37bfb._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="Certificate storage"
+ date="2013-04-09T00:43:12Z"
+ content="""
+Why not store the certificate within the repository? Either a common one in, e.g.
+
+    .git-annex.key-cert.pem
+
+or host-specific as per
+
+    .git-annex.key-cert.pem.$HOST
+
+-- Richard
+"""]]
diff --git a/doc/todo/wishlist:_allow_configuration_of_downloader_for_addurl.mdwn b/doc/todo/wishlist:_allow_configuration_of_downloader_for_addurl.mdwn
new file mode 100644
index 000000000..ec05d426f
--- /dev/null
+++ b/doc/todo/wishlist:_allow_configuration_of_downloader_for_addurl.mdwn
@@ -0,0 +1 @@
+It would be neat if Git annex addurl allowed a configuration option for a download manager command to do the actual download in place of wget/curl with a placeholder for the file name to save to & URL to get from (if that's all annex needs). That would allow the user to choose a graphical download manager if desired to make progress easier to monitor. The specific circumstance I'm seeing is with [[wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads]]. I found that the existing Firefox addon [FlashGot](http://flashgot.net/) can run any command with arbitrary arguments including placeholders. Right now I've got a [script](https://gist.github.com/andyg0808/5342434) that changes to a user-selected directory and then runs git-annex addurl in it with the provided url. It works fine as a download manager for FlashGot. The issue is that there is no progress information for large file downloads. If git-annex could start a separate download manager to do the actual download, then the user would be able to check status at any time, even though the git-annex command was run from a GUI and not a terminal.
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment b/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment
new file mode 100644
index 000000000..7efd583c0
--- /dev/null
+++ b/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="andy"
+ ip="99.48.75.171"
+ subject="I've just written a script that does this (with a Firefox download manager)"
+ date="2013-04-09T02:51:26Z"
+ content="""
+So I've just written a two-line shell script that makes [FlashGot](http://flashgot.net/) able to do this. It's available on GitHub at <https://gist.github.com/andyg0808/5342434>.
+
+This could be even neater if Git-annex had the ability to set the download manager... Wishlist created: [[wishlist:_allow_configuration_of_downloader_for_addurl]]
+"""]]