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

7 files changed, 235 insertions, 0 deletions

diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings.mdwn b/doc/bugs/Android:_Several_error_messages___47___warnings.mdwn
new file mode 100644
index 000000000..c6085c21a
--- /dev/null
+++ b/doc/bugs/Android:_Several_error_messages___47___warnings.mdwn
@@ -0,0 +1,38 @@
+### Please describe the problem.
+
+When I start Git Annex then there are several warnings. The app renders my phone basically unusable (two time my phone rebooted and several time I had to remove the battery because the phone didn't respond).
+
+It seems Git Annex uses all the available memory (one warning is that git-annex has text relocations and that this wastes memory.
+
+I've attached a screen shot of the error messages.
+
+
+### What steps will reproduce the problem?
+
+Starting Git Annex on my phone
+
+
+### What version of git-annex are you using? On what operating system?
+
+Git Annex: 5.20150927-gb506fb2
+Android: 5.0.2
+
+
+### Please provide any additional information below.
+
+My phone is low-end (it has only ~512MB memory for example) - but normally everything works more or less okay.
+
+If I use Chrome as the browser and start the webapp then Git Annex gets (it seems) killed quite often. It seems because there is not enough memory.
+
+If I use a browser with a small memory footprint then the webapp works only barely better - very unresponsive (but at least Git Annex isn't killed).
+
+
+### 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)
+
+Sorry, no, I'm just starting out with Git Annex :)
+
+But Git Annex looks amazing - exactly what I need! ;)
+
+Can I somehow help to find the problem?
+
+I'd really love to use Git Annex on my phone.
diff --git a/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_2_8a23d2743cdad0ef29265e59adcebd6f._comment b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_2_8a23d2743cdad0ef29265e59adcebd6f._comment
new file mode 100644
index 000000000..ea82fca2e
--- /dev/null
+++ b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_2_8a23d2743cdad0ef29265e59adcebd6f._comment
@@ -0,0 +1,84 @@
+[[!comment format=mdwn
+ username="bgilbert@a0c64716cf22216de5eeb15a5ca4f009164c8fb3"
+ nickname="bgilbert"
+ subject="comment 2"
+ date="2015-09-27T01:00:46Z"
+ content="""
+It does work now with manually-created buckets.  It still doesn't work when the bucket is created automatically:
+
+    $ git annex -d initremote nearline type=S3 encryption=none host=storage.googleapis.com storageclass=NEARLINE
+    [2015-09-26 19:21:43.877399] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"show-ref\",\"git-annex\"]
+    [2015-09-26 19:21:43.888972] process done ExitSuccess
+    [2015-09-26 19:21:43.889496] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
+    [2015-09-26 19:21:43.894184] process done ExitSuccess
+    [2015-09-26 19:21:43.895521] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"log\",\"refs/heads/git-annex..113c78849a7fcb8c834e03feac3c492aaa58d8e5\",\"-n1\",\"--pretty=%H\"]
+    [2015-09-26 19:21:43.901039] process done ExitSuccess
+    [2015-09-26 19:21:43.902895] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"cat-file\",\"--batch\"]
+    initremote nearline (checking bucket...) [2015-09-26 19:21:43.912757] String to sign: \"GET\n\n\nSat, 26 Sep 2015 23:21:43 GMT\n/nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460/annex-uuid\"
+    [2015-09-26 19:21:43.914566] Host: \"nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460.storage.googleapis.com\"
+    [2015-09-26 19:21:43.916021] Path: \"/annex-uuid\"
+    [2015-09-26 19:21:43.916716] Query string: \"\"
+    [2015-09-26 19:21:44.161168] Response status: Status {statusCode = 404, statusMessage = \"Not Found\"}
+    [2015-09-26 19:21:44.162829] Response header 'X-GUploader-UploadID': '[...]'
+    [2015-09-26 19:21:44.165422] Response header 'Content-Type': 'application/xml; charset=UTF-8'
+    [2015-09-26 19:21:44.16679] Response header 'Content-Length': '133'
+    [2015-09-26 19:21:44.167806] Response header 'Date': 'Sat, 26 Sep 2015 23:21:44 GMT'
+    [2015-09-26 19:21:44.169038] Response header 'Expires': 'Sat, 26 Sep 2015 23:21:44 GMT'
+    [2015-09-26 19:21:44.170508] Response header 'Cache-Control': 'private, max-age=0'
+    [2015-09-26 19:21:44.171829] Response header 'Server': 'UploadServer'
+    [2015-09-26 19:21:44.172773] Response metadata: S3: request ID=<none>, x-amz-id-2=<none>
+    [2015-09-26 19:21:44.173874] String to sign: \"GET\n\n\nSat, 26 Sep 2015 23:21:44 GMT\n/nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460/\"
+    [2015-09-26 19:21:44.175243] Host: \"nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460.storage.googleapis.com\"
+    [2015-09-26 19:21:44.176297] Path: \"/\"
+    [2015-09-26 19:21:44.176719] Query string: \"\"
+    [2015-09-26 19:21:44.316739] Response status: Status {statusCode = 404, statusMessage = \"Not Found\"}
+    [2015-09-26 19:21:44.318835] Response header 'X-GUploader-UploadID': '[...]'
+    [2015-09-26 19:21:44.322411] Response header 'Content-Type': 'application/xml; charset=UTF-8'
+    [2015-09-26 19:21:44.324451] Response header 'Content-Length': '133'
+    [2015-09-26 19:21:44.326001] Response header 'Date': 'Sat, 26 Sep 2015 23:21:44 GMT'
+    [2015-09-26 19:21:44.327709] Response header 'Expires': 'Sat, 26 Sep 2015 23:21:44 GMT'
+    [2015-09-26 19:21:44.329293] Response header 'Cache-Control': 'private, max-age=0'
+    [2015-09-26 19:21:44.331073] Response header 'Server': 'UploadServer'
+    [2015-09-26 19:21:44.332693] Response metadata: S3: request ID=<none>, x-amz-id-2=<none>
+    (creating bucket in US...) [2015-09-26 19:21:44.334384] String to sign: \"PUT\n\n\nSat, 26 Sep 2015 23:21:44 GMT\n/nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460/\"
+    [2015-09-26 19:21:44.336832] Host: \"nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460.storage.googleapis.com\"
+    [2015-09-26 19:21:44.338583] Path: \"/\"
+    [2015-09-26 19:21:44.339326] Query string: \"\"
+    [2015-09-26 19:21:50.024323] Response status: Status {statusCode = 200, statusMessage = \"OK\"}
+    [2015-09-26 19:21:50.02519] Response header 'X-GUploader-UploadID': '[...]'
+    [2015-09-26 19:21:50.026329] Response header 'x-goog-metageneration': '1'
+    [2015-09-26 19:21:50.026902] Response header 'Vary': 'Origin'
+    [2015-09-26 19:21:50.027376] Response header 'Content-Length': '0'
+    [2015-09-26 19:21:50.027993] Response header 'Date': 'Sat, 26 Sep 2015 23:21:49 GMT'
+    [2015-09-26 19:21:50.028587] Response header 'Server': 'UploadServer'
+    [2015-09-26 19:21:50.029113] Response header 'Content-Type': 'text/html; charset=UTF-8'
+    [2015-09-26 19:21:50.029772] Response metadata: S3: request ID=<none>, x-amz-id-2=<none>
+    [2015-09-26 19:21:50.030493] String to sign: \"GET\n\n\nSat, 26 Sep 2015 23:21:50 GMT\n/nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460/annex-uuid\"
+    [2015-09-26 19:21:50.031606] Host: \"nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460.storage.googleapis.com\"
+    [2015-09-26 19:21:50.032369] Path: \"/annex-uuid\"
+    [2015-09-26 19:21:50.032786] Query string: \"\"
+    [2015-09-26 19:21:50.280518] Response status: Status {statusCode = 404, statusMessage = \"Not Found\"}
+    [2015-09-26 19:21:50.280995] Response header 'X-GUploader-UploadID': '[...]'
+    [2015-09-26 19:21:50.281575] Response header 'Content-Type': 'application/xml; charset=UTF-8'
+    [2015-09-26 19:21:50.28201] Response header 'Content-Length': '127'
+    [2015-09-26 19:21:50.282269] Response header 'Date': 'Sat, 26 Sep 2015 23:21:50 GMT'
+    [2015-09-26 19:21:50.282555] Response header 'Expires': 'Sat, 26 Sep 2015 23:21:50 GMT'
+    [2015-09-26 19:21:50.282919] Response header 'Cache-Control': 'private, max-age=0'
+    [2015-09-26 19:21:50.283199] Response header 'Server': 'UploadServer'
+    [2015-09-26 19:21:50.283585] Response metadata: S3: request ID=<none>, x-amz-id-2=<none>
+    [2015-09-26 19:21:50.283998] String to sign: \"PUT\n\n\nSat, 26 Sep 2015 23:21:50 GMT\nx-amz-storage-class:NEARLINE\n/nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460/annex-uuid\"
+    [2015-09-26 19:21:50.284663] Host: \"nearline-38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460.storage.googleapis.com\"
+    [2015-09-26 19:21:50.28504] Path: \"/annex-uuid\"
+    [2015-09-26 19:21:50.285233] Query string: \"\"
+    [2015-09-26 19:21:50.285421] Body: \"38b55d4f-fe3f-4b7a-a4b2-ad22d29ad460\"
+    [2015-09-26 19:21:50.431435] Response status: Status {statusCode = 400, statusMessage = \"Bad Request\"}
+    [2015-09-26 19:21:50.431926] Response header 'X-GUploader-UploadID': '[...]'
+    [2015-09-26 19:21:50.432473] Response header 'Content-Type': 'application/xml; charset=UTF-8'
+    [2015-09-26 19:21:50.432797] Response header 'Content-Length': '117'
+    [2015-09-26 19:21:50.433033] Response header 'Vary': 'Origin'
+    [2015-09-26 19:21:50.433301] Response header 'Date': 'Sat, 26 Sep 2015 23:21:50 GMT'
+    [2015-09-26 19:21:50.433581] Response header 'Server': 'UploadServer'
+    [2015-09-26 19:21:50.433961] Response metadata: S3: request ID=<none>, x-amz-id-2=<none>
+    git-annex: S3Error {s3StatusCode = Status {statusCode = 400, statusMessage = \"Bad Request\"}, s3ErrorCode = \"InvalidArgument\", s3ErrorMessage = \"Invalid argument.\", s3ErrorResource = Nothing, s3ErrorHostId = Nothing, s3ErrorAccessKeyId = Nothing, s3ErrorStringToSign = Nothing, s3ErrorBucket = Nothing, s3ErrorEndpointRaw = Nothing, s3ErrorEndpoint = Nothing}
+
+"""]]
diff --git a/doc/bugs/annex-ssh-options_seem_to_be_ignored_in_some_occasion_by_the_assistnat.mdwn b/doc/bugs/annex-ssh-options_seem_to_be_ignored_in_some_occasion_by_the_assistnat.mdwn
new file mode 100644
index 000000000..6616db835
--- /dev/null
+++ b/doc/bugs/annex-ssh-options_seem_to_be_ignored_in_some_occasion_by_the_assistnat.mdwn
@@ -0,0 +1,47 @@
+### Please describe the problem.
+When assistant sync with some remote, it will call git that will call ssh without annex-sync
+
+### What steps will reproduce the problem?
+I've remote that have:
+
+    [remote "shukrat"]
+      [...]
+      annex-ignore = true
+      annex-ssh-options = -i /home/moi/.ssh/git-annex/some-key
+
+When I run `git annex sync shukrat` in the repository, it will sync it using the key, but when I ask the assistant to sync it, it will use some otherkey and so it will ask for my passphrase.
+
+
+### What version of git-annex are you using? On what operating system?
+
+    % git annex version 
+    git-annex version: 5.20150916-1
+    build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA Database
+    key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5    WORM URL
+    remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+    local repository version: 5
+    supported repository version: 5
+    upgrade supported from repository versions: 0 1 2 4
+
+on debian/sid
+
+### Please provide any additional information below.
+
+when the assistant is syncing, I've:
+
+    $ pstree -p | grep ssh-ask
+           |-git(27589)---ssh(27590)---ssh-askpass(27617)
+    $ ps -f -p 275900
+    UID        PID  PPID  C STIME TTY          TIME CMD
+    moi      27590 27589  0 14:10 ?        00:00:00 ssh user-data@shukrat git-receive-pack '/home/user-data/git-repos/Images.git/
+
+log from .git/annex/daemon.log:
+
+    [2015-09-27 14:09:55.844597] main: Syncing with shukrat 
+    Pass a valid window to KWallet::Wallet::openWallet().
+    Pass a valid window to KWallet::Wallet::openWallet().
+    Everything up-to-date
+
+
+
+
diff --git a/doc/bugs/the_assistant_fail_to_correctly_add_or_sync_ssh_remote_with_non_ascii_letter_in_the_directory.mdwn b/doc/bugs/the_assistant_fail_to_correctly_add_or_sync_ssh_remote_with_non_ascii_letter_in_the_directory.mdwn
new file mode 100644
index 000000000..179e353c8
--- /dev/null
+++ b/doc/bugs/the_assistant_fail_to_correctly_add_or_sync_ssh_remote_with_non_ascii_letter_in_the_directory.mdwn
@@ -0,0 +1,40 @@
+### Please describe the problem.
+I've tried to setup a remote using assistant, but it failed to correctly sync apparently because there is a "è" in the directory
+
+### What steps will reproduce the problem?
+run the webapp
+use "Add another directory"
+then Remote Server
+add host name, user name password and directory as "Bibliothèque calibre" (to a repository that already exists)
+
+the remote is added as metadata only and the assistant will try to upload every file to it every time it is restarted.
+
+if a symlink is created named "calibre library", and is used instead, there is no problem.
+
+### What version of git-annex are you using? On what operating system?
+it is git-annex version: 5.20150916-1 on debian/sid
+
+### Please provide any additional information below.
+
+the log is full of:
+[[!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
+ssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-volesprit.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-volesprit.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+sssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-volesprit.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-volesprit.lot-of-stuff.info-moi_22_biblioth%c3%a8que.20calibre: Name or service not known
+ssh: Could not resolve hostname git-annex-toubib.lot-of-stuff.info-moi_22_biblioth%c3%a8que.2ssh: Could not resolve hostname git-annex-volesprit.lot-of-stuff.info-m
+
+
+# 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)
+
+Adding remote that use only ascii letter work realy well with the webapp. 
diff --git a/doc/coding_style/comment_3_61c178b997dd044f3531303913f8fa91._comment b/doc/coding_style/comment_3_61c178b997dd044f3531303913f8fa91._comment
new file mode 100644
index 000000000..c0a566158
--- /dev/null
+++ b/doc/coding_style/comment_3_61c178b997dd044f3531303913f8fa91._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="Don"
+ subject="Style for man pages?"
+ date="2015-09-28T10:00:45Z"
+ content="""
+Could you add some suggestions for editing the .mdwn files?  I'd like to help clean up a few (really minor) things I noticed, but I don't want to make more work for you with the changes I make.  One thing I'm not sure about is where to set my fill column when editing--I can't seem to pick any single value (79? 80?) that doesn't make some paragraphs change when I rewrap them.  Also, it might be helpful to have a quick guide for when you surround commands and other computer-y words with quotes, backticks, or nothing at all.
+   
+"""]]
diff --git a/doc/todo/does_not_preserve_timestamps/comment_8_f2a32e39356f7b772ab9cf3136436700._comment b/doc/todo/does_not_preserve_timestamps/comment_8_f2a32e39356f7b772ab9cf3136436700._comment
new file mode 100644
index 000000000..6085171f2
--- /dev/null
+++ b/doc/todo/does_not_preserve_timestamps/comment_8_f2a32e39356f7b772ab9cf3136436700._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="graboluk@f6de53961ab0f884e203f602f65eb5cdc0fb7513"
+ nickname="graboluk"
+ subject="timestamps are wrong as of 5.20150731"
+ date="2015-09-26T18:31:46Z"
+ content="""
+I confirm this issue is still present in the debian testing version 5.20150731. This really makes git-annex quite unusable for me, as part of my setup is that my server downloads various podcasts (think news videos from euronews, german tagesschau, some youtube podcasts), which then get distributed to my other computers. This way I don't have to use youtube etc., which makes a huge difference in terms of speed (my main home  computer is from 2006 and it plays all hte videos just fine, but a website likie youtube.com is too much for it). At a speed of single shortcut I see a list of newest podcasts and I can choose one without bothering to open the webbrowser.
+
+The point is that I really like to have all those podcasts to be sorted by their modified date, for rather obvious reasons. (with dropbox it works fine.) 
+"""]]
diff --git a/doc/todo/does_not_preserve_timestamps/comment_9_62736ee2f299d62f685800353fc36ccf._comment b/doc/todo/does_not_preserve_timestamps/comment_9_62736ee2f299d62f685800353fc36ccf._comment
new file mode 100644
index 000000000..ed9c0e41e
--- /dev/null
+++ b/doc/todo/does_not_preserve_timestamps/comment_9_62736ee2f299d62f685800353fc36ccf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="kalle@bdf75651b439b088e51f28f10f5a46ffcd2a704d"
+ nickname="kalle"
+ subject="importfeed template"
+ date="2015-09-28T19:52:16Z"
+ content="""
+You can use the `--template` flag and prefix the filename with the date. See [[/tips/downloading_podcasts]]. If you need very accurate modification times that won't work but should work in this case?
+"""]]