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

6 files changed, 175 insertions, 0 deletions

diff --git a/doc/bugs/IPv6_literal_ssh_servers_break_git_annex_webapp.mdwn b/doc/bugs/IPv6_literal_ssh_servers_break_git_annex_webapp.mdwn
new file mode 100644
index 000000000..f7ab78d71
--- /dev/null
+++ b/doc/bugs/IPv6_literal_ssh_servers_break_git_annex_webapp.mdwn
@@ -0,0 +1,63 @@
+### Please describe the problem.
+When trying to set up the Git Annex webapp to sync with an SSH server on Windows, specifying the remote server address ans an IPv6 literal address will result in an Internal Server Error like this:
+
+`C:\Users\anovak\.ssh\git-annex\key.git-annex-fc2e:f79e:da52:bd92:74f8:b045:e365:5e9d-anovak_22_.2Fhome.2Fanovak.2Fannex: openFile: invalid argument (Invalid argument)`
+
+I think the problem is that it's not escaping the colons, and you can't have colons in a filename on Windows.
+
+### What steps will reproduce the problem?
+
+1. Have Git Annex Webapp runnign on Windows.
+2. Go to the "Adding a remote server using ssh" page.
+3. Enter an IPv6 literal address (in brackets), like `[fc2e:f79e:da52:bd92:74f8:b045:e365:5e9d]`, under "Host name". I hyappen to be using cjdns addresses, but I bet you get the same issue with Internet addresses.
+4. Add the server, and elect to combine repositories if prompted.
+5. You should get the error.
+
+### What version of git-annex are you using? On what operating system?
+
+I have Git Annex: `Version: 6.20160613-g35dbe35` on Windows 7.
+
+### 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
+
+[2016-07-17 11:11:09.3554208] main: starting assistant version 6.20160613-g35dbe35
+Warning: Couldn't open /dev/urandom
+Warning: using system clock for seed instead (quality will be lower)
+Launching web browser on file://C:\Users\anovak\annex\.git\annex\webapp.html
+[2016-07-17 11:11:09.482428] Cronner: You should enable consistency checking to protect your data. 
+(scanning...) [2016-07-17 11:11:09.7544436] Watcher: Performing startup scan
+(started...) 
+recv: failed (No error)
+recv: failed (No error)
+recv: failed (No error)
+(recording state in git...)
+Generating public/private rsa key pair.
+Your identification has been saved in C:\Users\anovak\AppData\Local\Temp\git-annex-keygen.0\key.
+Your public key has been saved in C:\Users\anovak\AppData\Local\Temp\git-annex-keygen.0\key.pub.
+The key fingerprint is:
+SHA256:sNwb2o1rp2ycVaMvEOxKZa2g6YlYVuOtbty8xybl3Uc anovak@Asteria
+The key's randomart image is:
++---[RSA 2048]----+
+|                 |
+|                 |
+|      .. .       |
+|    o..+= . o    |
+|   o =o=So o .   |
+|  o + oo==o   E  |
+| + + *.*+=.o .   |
+|. . * =.X.+ o .  |
+|   o. .B+o . .   |
++----[SHA256]-----+
+17/Jul/2016:11:15:48 -0700 [Error#yesod-core] C:\Users\anovak\.ssh\git-annex\key.git-annex-fc2e:f79e:da52:bd92:74f8:b045:e365:5e9d-anovak_22_.2Fhome.2Fanovak.2Fannex: openFile: invalid argument (Invalid argument) @(yesod_IAZWSEWTVsBHH7DfZiTwkc:Yesod.Core.Class.Yesod .\Yesod\Core\Class\Yesod.hs:628:5)
+
+# 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)
+
+Yeah, it works great on my Linux machines. I'm just getting started with the web app, though; I'm trying to set up limited-access key-based SSH, and the web app seems to be also trying to do that...
+
+
diff --git a/doc/bugs/drop_blows_on_lustre__58___SQLite3_returned_ErrorIO.mdwn b/doc/bugs/drop_blows_on_lustre__58___SQLite3_returned_ErrorIO.mdwn
new file mode 100644
index 000000000..c90a9f21a
--- /dev/null
+++ b/doc/bugs/drop_blows_on_lustre__58___SQLite3_returned_ErrorIO.mdwn
@@ -0,0 +1,51 @@
+[[!format sh """
+$> git clone http://data.pymvpa.org/datasets/tutorial_data/.git tutorial_data-2
+Cloning into 'tutorial_data-2'...
+Checking connectivity... done.
+cd 
+#35 !280 [0].....................................:Thu Jul 14 10:16:49:.
+anthill:/home/ironfs/scratch/yarik
+$> cd tutorial_data-2
+total 36
+ 4 freesurfer/   4 hyperalignment_tutorial_data.hdf5.gz@  20 suma_surfaces/
+ 4 haxby2001/    4 results/
+(git)/home/ironfs/scratch/yarik/tutorial_data-2:[master]
+#36 !281 [0].....................................:Thu Jul 14 10:16:50:.
+anthill:/home/ironfs/scratch/yarik/tutorial_data-2
+$> git annex get hyperalignment_tutorial_data.hdf5.gz 
+
+  Detected a filesystem without POSIX fcntl lock support.
+
+  Enabling annex.pidlock.
+(merging origin/git-annex into git-annex...)
+(recording state in git...)
+/home/ironfs/scratch 100%[===================>]  15.04M  68.9MB/s    in 0.2s    
+(checksum...) ok
+(recording state in git...)
+(git)/home/ironfs/scratch/yarik/tutorial_data-2:[master]
+#37 !282 [0].....................................:Thu Jul 14 10:16:54:.
+anthill:/home/ironfs/scratch/yarik/tutorial_data-2
+$> git annex drop hyperalignment_tutorial_data.hdf5.gz
+drop hyperalignment_tutorial_data.hdf5.gz (checking origin...) git-annex: SQLite3 returned ErrorIO while attempting to perform prepare "PRAGMA journal_mode=WAL;": disk I/O error
+(git)/home/ironfs/scratch/yarik/tutorial_data-2:[master]
+
+$> git annex fsck
+fsck freesurfer/anat_nii.nii sqlite worker thread crashed: SQLite3 returned ErrorIO while attempting to perform prepare "SELECT null from content limit 1": disk I/O error
+git-annex: sqlite query crashed
+
+$> git annex version
+git-annex version: 6.20160613-g35dbe35
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+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 versions: 5 6
+upgrade supported from repository versions: 0 1 2 3 4 5
+operating system: linux x86_64
+(git)/home/ironfs/scratch/yarik/tutorial_data:[master]
+
+"""]]
+
+
+
+[[!meta author=yoh]]
diff --git a/doc/forum/Multiple_prefered_content_groups/comment_2_a91177f4f02500e8fa6594933e128ef0._comment b/doc/forum/Multiple_prefered_content_groups/comment_2_a91177f4f02500e8fa6594933e128ef0._comment
new file mode 100644
index 000000000..84aef3011
--- /dev/null
+++ b/doc/forum/Multiple_prefered_content_groups/comment_2_a91177f4f02500e8fa6594933e128ef0._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 2"
+ date="2016-07-14T08:32:11Z"
+ content="""
+Ah, ok, then it makes sense.
+
+Maybe it's an idea to expand the standard expression for client groups in a way that they drop a file if it has reached a backup repo (additionally to a archive repo)?
+
+Thanks!
+"""]]
diff --git a/doc/forum/copy_--auto_copies_already_synced_files.mdwn b/doc/forum/copy_--auto_copies_already_synced_files.mdwn
new file mode 100644
index 000000000..13a497a9d
--- /dev/null
+++ b/doc/forum/copy_--auto_copies_already_synced_files.mdwn
@@ -0,0 +1,24 @@
+Hello,
+
+I have two repos, both are standard/client and they are in sync:
+
+```
+% git annex sync marduk.dynv6 --content
+commit  ok
+pull marduk.dynv6 
+ok
+git annex sync marduk.dynv6 --content  64,35s user 4,54s system 88% cpu 1:18,15 total
+```
+I would ```copy --auto``` except to copy no files, but still, ```git annex copy --to=marduk.dynv6 --auto``` seems to copy all files:
+
+```
+% git annex copy --to=marduk.dynv6 --auto
+copy .gitignore (checking marduk.dynv6...) ok
+copy Alben/2Raumwohnung - Es wird Morgen/2Raumwohnung - 01 - Wolken ziehen vorbei.mp3 (checking marduk.dynv6...) ok
+copy Alben/2Raumwohnung - Es wird Morgen/2Raumwohnung - 02 - Spiel mit.mp3 (checking marduk.dynv6...) ok
+[... canceled]
+```
+Why is copy --auto copying these (presumably all) files here=
+
+Thanks!
+Florian
diff --git a/doc/forum/copy_--auto_copies_already_synced_files/comment_1_cc5e2e7630a33b73d1eb92eebe254cea._comment b/doc/forum/copy_--auto_copies_already_synced_files/comment_1_cc5e2e7630a33b73d1eb92eebe254cea._comment
new file mode 100644
index 000000000..ae3b46151
--- /dev/null
+++ b/doc/forum/copy_--auto_copies_already_synced_files/comment_1_cc5e2e7630a33b73d1eb92eebe254cea._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 1"
+ date="2016-07-14T09:28:32Z"
+ content="""
+Addendum: It seems it is not really copying the files, but checking. The solution is probably using ```git annex copy --to=marduk.dynv6 --auto --fast``` which behaves like I expect it (copies nothing).
+"""]]
diff --git a/doc/tips/googledriveannex/comment_12_9f3e51a005255655346b2ae39891737f._comment b/doc/tips/googledriveannex/comment_12_9f3e51a005255655346b2ae39891737f._comment
new file mode 100644
index 000000000..1763cdd01
--- /dev/null
+++ b/doc/tips/googledriveannex/comment_12_9f3e51a005255655346b2ae39891737f._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2"
+ nickname="emanuele.olivetti"
+ subject="googledriveannex fails: No handlers could be found for logger "oauth2client.util""
+ date="2016-07-14T14:58:29Z"
+ content="""
+Following the instructions above, when issuing:
+
+    git annex initremote googledrive type=external externaltype=googledrive encryption=shared folder=gitannex
+
+googleannexdrive fails and I get:
+
+    initremote googledrive (encryption setup) (encryption key stored in git repository) No handlers could be found for logger \"oauth2client.util\"
+    git-annex: You need to set OAUTH environment variables and folder and encryption parameters when running initremote.
+
+Am I making some obvious mistake?
+
+If not, I'd like to share my positive experience with git-annex-remote-rclone (<https://github.com/DanielDent/git-annex-remote-rclone>), which wraps rclone (<https://rclone.org>) that supports Google Drive: it worked for me.
+"""]]