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

7 files changed, 134 insertions, 0 deletions

diff --git a/doc/bugs/Switching_repositories_in_webapp_on_a_remote_server_is_not_honoring_--listen_parameter.mdwn b/doc/bugs/Switching_repositories_in_webapp_on_a_remote_server_is_not_honoring_--listen_parameter.mdwn
new file mode 100644
index 000000000..4829cde08
--- /dev/null
+++ b/doc/bugs/Switching_repositories_in_webapp_on_a_remote_server_is_not_honoring_--listen_parameter.mdwn
@@ -0,0 +1,21 @@
+### Please describe the problem.
+I am running my "origin" repositories on a headless server. Managing these with webapp --listen=<server IP>:<port> is a very conveniant way. Now I am creating more repositories for different content on the same server. When I try to switch the webapp between these repositories webapp gives me a link with 127.0.0.1:<random port> in the URL.
+
+### What steps will reproduce the problem?
+1. Start webapp on a remote system with --listen parameter.
+2. Add an existing (did not try for a new repository) manually created annex to the webapp using "add another local repository" (btw. file select dialog is also not working remotely)
+3. You get asked if you want to combine the new annex with the current or to keep them separate (--> keep them separate)
+4. You get forwarded to the new webapp instance but with a localhost address (127.0.0.1). The same address is also used when you manually try to swich between repositories using the repository menu.
+
+### What version of git-annex are you using? On what operating system?
+4.20130501 on Ubuntu precise from the rubiojr PPA repository
+
+### 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/debug.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/design/assistant/blog/day_265__correctness/comment_1_e8959a6df87eb92310947e66c7471e97._comment b/doc/design/assistant/blog/day_265__correctness/comment_1_e8959a6df87eb92310947e66c7471e97._comment
new file mode 100644
index 000000000..96731a43e
--- /dev/null
+++ b/doc/design/assistant/blog/day_265__correctness/comment_1_e8959a6df87eb92310947e66c7471e97._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o"
+ nickname="Andrew"
+ subject="Android success"
+ date="2013-05-16T04:14:09Z"
+ content="""
+I now have my android phone and laptop talking with GTalk and used a remote ssh server to synchronise files.
+
+Photos are flowing from my phone to my laptop quite happily. Magic.
+
+Would help to exclude .thumbnails from the DCIM directory on the phone though...
+"""]]
diff --git a/doc/forum/nntp__47__usenet_special_remote.mdwn b/doc/forum/nntp__47__usenet_special_remote.mdwn
new file mode 100644
index 000000000..86efa48cf
--- /dev/null
+++ b/doc/forum/nntp__47__usenet_special_remote.mdwn
@@ -0,0 +1,18 @@
+Over the last few weeks i've been working on a seperate python nntp project. But decided that it would be fun to make it usable with git-annex.
+
+The code is almost complete. One major feature left(make it usable without a mysql/sqlite database, and without fetching headers). And of course a lot of bugfixes.
+
+I'm wondering if there is any interest in this special remote hook.
+
+The thought is, buy unlimited usenet account, and you can have a git-annex repository without any upper size limit. You want 100GB, well that'll be 10$ a month, want 100000GB, well that'll be 10$ a month.
+
+Of course there are plenty of caveats(retention on server, it is doubtfull the data will stay up for more than 4 years.). Because the code is in python3 i had to use a lot of external tools (uudeview, par2, ydecode/yydecode) and parse their output. Which is a horrid horrid solution. Since the code is nearing "beta" stage i might see if i can improve on that(possibly with ctypes), if there is any interest.
+
+Currently working on freebsd, ubuntu, debian, mac os x(10.7, not tested in 10.8)
+
+The last feature to be done (and this is UUUUUGLY) is to make it get nzb files from a source like this: http://nzbindex.nl/search/?q=GPGHMACSHA (yes, that is my git-annex repo) instead of from a mysql database.
+
+So, this is a call to see if anyone is interested, and if anyone proficient in *NIX want to test it out.
+
+Sincerely
+Tobias
diff --git a/doc/install/Windows/comment_2_1b4eaffa46dfff0a5e20f7f2016bdf9a._comment b/doc/install/Windows/comment_2_1b4eaffa46dfff0a5e20f7f2016bdf9a._comment
new file mode 100644
index 000000000..5c562887c
--- /dev/null
+++ b/doc/install/Windows/comment_2_1b4eaffa46dfff0a5e20f7f2016bdf9a._comment
@@ -0,0 +1,52 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 2"
+ date="2013-05-16T02:22:26Z"
+ content="""
+By doing `cabal install --only-dependencies -v3` I saw that the problem was that it didn't find `sys/times.h`:
+
+    In file included from C:\cygwin\tmp\36.c:1:0:
+    include/HsUnix.h:33:23: fatal error: sys/times.h: No such file or directory
+    compilation terminated.
+    (\"C:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\mingw\\bin\\gcc.exe\",[\"-Wl,--hash-size=31\",\"-Wl,--reduce-memory-overheads\",\"C:\\cygwin\\tmp\\36.c\",\"-o\",\"C:\\cygwin\\tmp\\36\",\"-E\",\"-D__GLASGOW_HASKELL__=704\",\"-Dmingw32_HOST_OS=1\",\"-Di386_HOST_ARCH=1\",\"-Idist\\build\\autogen\",\"-Iinclude\",\"-I.\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\time-1.4\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\Win32-2.2.2.0\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\bytestring-0.9.2.1\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\base-4.5.1.0\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib/include\"])
+    C:\Program Files (x86)\Haskell Platform\2012.4.0.0\mingw\bin\gcc.exe returned
+    ExitFailure 1 with error message:
+    In file included from C:\cygwin\tmp\36.c:1:0:
+    include/HsUnix.h:33:23: fatal error: sys/times.h: No such file or directory
+    compilation terminated.
+    cabal.exe: Missing dependencies on foreign libraries:
+    * Missing (or bad) header file: HsUnix.h
+    * Missing C libraries: rt, dl
+    This problem can usually be solved by installing the system packages that
+    provide these libraries (you may need the \"-dev\" versions). If the libraries
+    are already installed but in a non-standard location then you can use the
+    flags --extra-include-dirs= and --extra-lib-dirs= to specify where they are.
+    If the header file does exist, it may contain errors that are caught by the C
+    compiler at the preprocessing stage. In this case you can re-run configure
+    with the verbosity flag -v3 to see the error messages.
+    Failed to install unix-2.6.0.1
+
+Is it normal that cabal use mingw's gcc (from the Haskell Platform)?
+
+If so, should the following command work (I'm not sure if mixing mingw and cygwin stuff is ok) ?
+
+cabal install --only-dependencies -v3 --extra-include-dirs=C:\\cygwin\\usr\\include --extra-lib-dirs=c:\\cygwin\\lib
+
+    configure: WARNING: unrecognized options: --with-compiler, --with-gcc
+    Reading parameters from .\unix.buildinfo
+    (\"C:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\mingw\\bin\\gcc.exe\",[\"-Wl,--hash-size=31\",\"-Wl,--reduce-memory-overheads\",\"C:\\cygwin\\tmp\\3504.c\",\"-o\",\"C:\\cygwin\\tmp\\3504\",\"-D__GLASGOW_HASKELL__=704\",\"-Dmingw32_HOST_OS=1\",\"-Di386_HOST_ARCH=1\",\"-Idist\\build\\autogen\",\"-Iinclude\",\"-IC:\\cygwin\\usr\\include\",\"-I.\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\time-1.4\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\Win32-2.2.2.0\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\bytestring-0.9.2.1\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\base-4.5.1.0\\include\",\"-IC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib/include\",\"-lrt\",\"-ldl\",\"-Lc:\\cygwin\\lib\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\time-1.4\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\old-locale-1.0.0.4\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\deepseq-1.3.0.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\array-0.4.0.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\Win32-2.2.2.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\bytestring-0.9.2.1\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\base-4.5.1.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\integer-gmp-0.4.0.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\\ghc-prim-0.2.0.0\",\"-LC:\\Program Files (x86)\\Haskell Platform\\2012.4.0.0\\lib\"])
+    C:\Program Files (x86)\Haskell Platform\2012.4.0.0\mingw\bin\gcc.exe returned
+    ExitFailure 1 with error message:
+    In file included from include/HsUnix.h:39:0,
+    from C:\cygwin\tmp\3504.c:1:
+    C:\cygwin\usr\include/sys/resource.h:76:29: error: expected declaration
+    specifiers or '...' before 'id_t'
+    C:\cygwin\usr\include/sys/resource.h:77:29: error: expected declaration
+    specifiers or '...' before 'id_t'
+    In file included from C:\cygwin\usr\include/dirent.h:6:0,
+    from include/HsUnix.h:75,
+    from C:\cygwin\tmp\3504.c:1:
+    C:\cygwin\usr\include/sys/dirent.h:24:3: error: expected
+    specifier-qualifier-list before '__ino64_t'
+"""]]
diff --git a/doc/install/Windows/comment_3_b0c4c6e77246b1b4a81f6940e11b67d3._comment b/doc/install/Windows/comment_3_b0c4c6e77246b1b4a81f6940e11b67d3._comment
new file mode 100644
index 000000000..fc776f17e
--- /dev/null
+++ b/doc/install/Windows/comment_3_b0c4c6e77246b1b4a81f6940e11b67d3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-05-16T02:29:10Z"
+ content="""
+You need to build from git master, which is fixed to not use unix on windows, or wait for tomorrow's release.
+
+(Cabal will also try to upgrade network as part of installing yesod. Since the webapp is not ported yet, you need to `cabal configure -f-Webapp` for now.)
+"""]]
diff --git a/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote.mdwn b/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote.mdwn
new file mode 100644
index 000000000..4f24117f6
--- /dev/null
+++ b/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote.mdwn
@@ -0,0 +1,7 @@
+It would be nice to have a way to drop files without leaving broken symlinks around, at least while in direct mode.
+
+Here is my user case. I have a collection of music CDs ripped in FLAC formats. At the same time I convert all these files to MP3 files to that I can use them in various other devices and to save space.
+
+The problem is that if I `git annex drop` the FLAC files once they are converted and copied, they leave broken symlinks around; this result in various annoying error messages in almost all the music playback I tried. At the same time, if I `rm` or `git rm` these symlinks, the content of these files will be removed also from the remotes as they are signalled as no longer wanted.
+
+Couldn't git-annex keep a separate index of files that have been removed but are meant to be kept?
diff --git a/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote/comment_1_cba76311e146dabb8ffc789bf4c8b714._comment b/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote/comment_1_cba76311e146dabb8ffc789bf4c8b714._comment
new file mode 100644
index 000000000..c490c826a
--- /dev/null
+++ b/doc/todo/wishlist:_remove_files_and_symlinks_but_keep_in_remote/comment_1_cba76311e146dabb8ffc789bf4c8b714._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://svario.it/gioele"
+ ip="2001:1418:100:262::2"
+ subject="Maybe using branches?"
+ date="2013-05-16T10:22:48Z"
+ content="""
+A suggestion from #git-annex:
+
+> &lt;mhameed&gt; i think others are already doing this, using branches, but not sure if we have a writeup/tutorial of it
+>
+> &lt;mhameed&gt; gioele:  instead of working on master branch, switch to laptop branch, git rm the files that are not wanted and commit
+>
+> &lt;gioele&gt; mhameed: I'm lazy, I'd like git-annex to do that for me :)
+"""]]