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

14 files changed, 181 insertions, 0 deletions

diff --git a/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment b/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment
new file mode 100644
index 000000000..b99d9e22b
--- /dev/null
+++ b/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 2"
+ date="2013-07-30T18:08:38Z"
+ content="""
+I'm afraid I don't quite understand the question.
+"""]]
diff --git a/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_4_4a579e9a13305ab4157f4b3eba46b92d._comment b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_4_4a579e9a13305ab4157f4b3eba46b92d._comment
new file mode 100644
index 000000000..e8337926f
--- /dev/null
+++ b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_4_4a579e9a13305ab4157f4b3eba46b92d._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 4"
+ date="2013-07-30T18:06:05Z"
+ content="""
+There's clearly something not quite right with how the program is started on OSX. I've had reports about the app icon \"bouncing\" for a long time, and now this. 
+
+Since I do not own a Mac, and only have VNC access to a Mac desktop one for about 1 hour a week (and that's pretty slow), doing anything to improve this is quite a low priority background task for me.
+
+It seems that, as a non-Cocoa application, there are only a couple of behaviors that git-annex could have that play into this. 
+
+Perhaps the problem is that if the git-annex assistant daemon is not already running (it's supposed to autostart on login, but this may not be working, or perhaps git-annex has only just been installed and has not started yet), git-annex-webapp runs the daemon, and keeps it running, in the foreground. Perhaps this is interpreted by the GUI as an app that has not finished starting up, or as an app that is already running so it does not re-run it when the icon is clicked on again (which would run git-annex webapp and have it open a new browser window). This should be easy to play around with, by just editing the `git-annex-webapp` shell script. For example, adding a \"&\" at the end of the last line in the file would make it instead run in the background.
+
+Or, the problem might be with the .plist file for the app. Perhaps there's some change that could be made to it that would clue OSX in on how git-annex works.
+"""]]
diff --git a/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_5_2a710960dc3a177ce62ef92f8546c496._comment b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_5_2a710960dc3a177ce62ef92f8546c496._comment
new file mode 100644
index 000000000..f3505ba60
--- /dev/null
+++ b/doc/bugs/OS_X_10.8:_Can__39__t_reopen_webapp/comment_5_2a710960dc3a177ce62ef92f8546c496._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl-BU4KfFktO2-bqaFmlArHta0Oy7zJrCs"
+ nickname="J. Ryan"
+ subject="comment 5"
+ date="2013-07-30T18:44:00Z"
+ content="""
+Joey: Success!  I was able to get things working properly by backgrounding the app by adding `&` at the end of `git-annex-webapp` like you suggested.
+
+After doing that, I am able to relaunch the OS X app as many times as I want, and each time I get a new tab in my browser as desired.
+
+I guess if it's left in the foreground, OS X thinks \"there's already an instance of that app running\" and does nothing.  If it were a GUI app, it would focus the GUI app in that case, but with a shell script there's nothing really for it to do, so that sort of explains the behavior.  
+"""]]
diff --git a/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__.mdwn b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__.mdwn
new file mode 100644
index 000000000..d8b70a66a
--- /dev/null
+++ b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__.mdwn
@@ -0,0 +1,43 @@
+### Please describe the problem.
+
+In webapp UI, added on first install, the location for repository: /storage/sdcard1
+
+!warning
+
+Watcher crashed: addWatch:
+
+permission denied (Permission denied)
+
+[Restart Thread]
+
+:Performing startup scan
+
+In terminal Window 1:
+
+nex webapp <
+
+Detected a crippled filesystem.
+
+Enabling direct mode.
+
+Detected a filesystem without fifo support.
+
+Disabling ssh connection caching.
+
+### What steps will reproduce the problem?
+
+In webapp UI, added on first install, the location for repository: /storage/sdcard1
+
+### What version of git-annex are you using? On what operating system?
+
+Android 4.1.1 Huawei Y300 Annex.apk v1.0.52 version 4.20130723
+
+### 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
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_1_71b052be40fbdaca09ca3ede8c59ac7a._comment b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_1_71b052be40fbdaca09ca3ede8c59ac7a._comment
new file mode 100644
index 000000000..0622a2439
--- /dev/null
+++ b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_1_71b052be40fbdaca09ca3ede8c59ac7a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 1"
+ date="2013-07-30T18:42:32Z"
+ content="""
+You should have a `/storage/sdcard1/.git/annex/daemon.log` file. Please paste it here.
+"""]]
diff --git a/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_2_6d360a15818866242f9cbcf383094f8a._comment b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_2_6d360a15818866242f9cbcf383094f8a._comment
new file mode 100644
index 000000000..b0fe1b0fa
--- /dev/null
+++ b/doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_2_6d360a15818866242f9cbcf383094f8a._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="log file"
+ date="2013-07-30T19:03:03Z"
+ content="""
+Yes, will do.  But need to recreate - I repeatedly executed rm -rf .git to repeat the test and left it 'clean'.
+
+PS.  Is there an easy(er) way to 'undo' the creation of a repository without loosing any file content?  One day I will run rm -rf in the wrong place!
+After an uninstall of annex it was hard for me to figure out how to start with a clean system when the webapp found the previously created repo.
+"""]]
diff --git a/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa/comment_2_e9e1f38880a32610b3fbce475bffc3e4._comment b/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa/comment_2_e9e1f38880a32610b3fbce475bffc3e4._comment
new file mode 100644
index 000000000..6028f49ed
--- /dev/null
+++ b/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa/comment_2_e9e1f38880a32610b3fbce475bffc3e4._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 2"
+ date="2013-07-30T18:16:06Z"
+ content="""
+Local pairing always sets up a dedicated ssh key that can only be used for git-annex syncing.
+
+I'm afraid that, unless your login is literally \"user@host.fqdn\", you've obfuscated exactly the information I'd need to diagnose the problem. If you don't feel comfortable including the real information here you can mail it to me; see [[privacy]]
+
+Also, you may want to file a new bug report, since I *did* fix and close this bug. You're probably seeing a slightly different bug.
+"""]]
diff --git a/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment b/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment
new file mode 100644
index 000000000..b7fc68ffd
--- /dev/null
+++ b/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 1"
+ date="2013-07-30T19:00:43Z"
+ content="""
+You have a somewhat out of date version there. Can you please try again with a newer version? There have been several fixes to bugs that could present like this.
+"""]]
diff --git a/doc/bugs/remote_files_appear_but_are_unreadable_because_their_symlink_targets_don__39__t_exist/comment_13_ca9c87a10f29e41572540edeb99652f2._comment b/doc/bugs/remote_files_appear_but_are_unreadable_because_their_symlink_targets_don__39__t_exist/comment_13_ca9c87a10f29e41572540edeb99652f2._comment
new file mode 100644
index 000000000..07cf64865
--- /dev/null
+++ b/doc/bugs/remote_files_appear_but_are_unreadable_because_their_symlink_targets_don__39__t_exist/comment_13_ca9c87a10f29e41572540edeb99652f2._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 13"
+ date="2013-07-30T18:51:38Z"
+ content="""
+I'm more interested in fixing core problems, like why it was not able to find git-annex-shell, than in fixing bugs in the web UI that follow on from those problems. 
+
+When you're using the standalone tarball, it's supposed to set up `~/.ssh/git-annex-shell` to point to wherever you've unpacked the tarball. The assistant does this the first time you run it, and any time it sees the file is out of date.
+I've tested this, and it appears to be working ok. I don't understand what happened in your case to prevent this from happening.
+"""]]
diff --git a/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_5_c0e7742672db2629bd906cebefe74f72._comment b/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_5_c0e7742672db2629bd906cebefe74f72._comment
new file mode 100644
index 000000000..4b6ae9349
--- /dev/null
+++ b/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_5_c0e7742672db2629bd906cebefe74f72._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 5"
+ date="2013-07-30T18:39:58Z"
+ content="""
+Your transcript shows unannex without --fast having the problem, and uninit not having the problem. Which is just what I said. Although I had to spend 15 minutes reading and replicating your transcript to figure that out.
+
+This has been previously reported and discussed at [[Large_unannex_operations_result_in_stale_symlinks_and_data_loss]]. There does not seem to be a single entirely satesfactory solution. unannex --fast seems to be what you're looking for.
+"""]]
diff --git a/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_6_c56171665db3ed14109a09097d49ac5d._comment b/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_6_c56171665db3ed14109a09097d49ac5d._comment
new file mode 100644
index 000000000..692813fbd
--- /dev/null
+++ b/doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_6_c56171665db3ed14109a09097d49ac5d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
+ nickname="Matthew"
+ subject="comment 6"
+ date="2013-07-30T19:01:31Z"
+ content="""
+You're right, sorry, I missed the \"--fast\", I'd spent all morning replicating the n~ bug on my phone and recovering from unannex wasn't a short job either.
+"""]]
diff --git a/doc/forum/How_to_make_Maven_releases_work_with_git_annex___63__/comment_1_9298aa55771b68873de02e6a7964bbdc._comment b/doc/forum/How_to_make_Maven_releases_work_with_git_annex___63__/comment_1_9298aa55771b68873de02e6a7964bbdc._comment
new file mode 100644
index 000000000..ca62bd43e
--- /dev/null
+++ b/doc/forum/How_to_make_Maven_releases_work_with_git_annex___63__/comment_1_9298aa55771b68873de02e6a7964bbdc._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 1"
+ date="2013-07-30T18:20:53Z"
+ content="""
+If you can find a way to run `git annex get` in the cloned repo, it will copy over the files. Perhaps there is some way to make Maven do that via a hook script or similar?
+"""]]
diff --git a/doc/forum/expire_files__44___move_to_other_hosts/comment_1_ddcc2a00be1ae96a352d75a443458bcf._comment b/doc/forum/expire_files__44___move_to_other_hosts/comment_1_ddcc2a00be1ae96a352d75a443458bcf._comment
new file mode 100644
index 000000000..a23a21494
--- /dev/null
+++ b/doc/forum/expire_files__44___move_to_other_hosts/comment_1_ddcc2a00be1ae96a352d75a443458bcf._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 1"
+ date="2013-07-30T19:14:25Z"
+ content="""
+I think that you're conflating two different features.
+
+First, there's the question of determining which remotes should store a file. The [[preferred_content]] expressions are a way to let the user define this in a way that makes sense for their setup. There's also the annex.diskreserve setting, to allow a remote to reject a file if it doesn't have space. The git-annex assistant can automatically apply those, and arrange to transfer files to all remotes that want a copy. Or you can do it on the command line using --auto. Perhaps it would be nice to have a `git annex copy --auto --to any`, to avoid needing to run copy multiple times to send to different remotes.
+
+Second, there's the concept of expiring files. I don't think relatime would prevent using atime for this (git-annex could just set the atime to 0 when it first gets a file to work around relatime), and I don't like the idea of inotify watching all files just to work around noatime. I suppose that the preferred content expressions could have an atime check operation added to them. Although I guess you could just as well use `find`..
+
+(Finally, I don't think there's a good way to block processes that are trying to open files that are not there, without using FuSE. And I don't know that a system that could block any program indefinitely waiting on some large files being pulled down from wherever would be one I'd want to use. This has prevented me from going down that path so far.)
+"""]]
diff --git a/doc/forum/remote_server_client_repositories_are_bare__33____63__/comment_2_42dfc382d07af2a4f29c76016084f87c._comment b/doc/forum/remote_server_client_repositories_are_bare__33____63__/comment_2_42dfc382d07af2a4f29c76016084f87c._comment
new file mode 100644
index 000000000..84a2f36d6
--- /dev/null
+++ b/doc/forum/remote_server_client_repositories_are_bare__33____63__/comment_2_42dfc382d07af2a4f29c76016084f87c._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="comment 2"
+ date="2013-07-30T18:56:00Z"
+ content="""
+Make a non-bare git repository on your server. Run `git annex init` in it. Run `git annex assistant` in it.
+
+Now on your notebook, you can tell the assistant to use a remote ssh server, and point it at that directory. It will see the repository already exists, and use it, rather than making a new bare repository. The assistant daemon you've run on the server will notice when changes are pushed to the directory, and update it. 
+
+You can further set up XMPP, so that the server can tell the notebook if you make any modifications to the server. You can do this by running `git annex webapp --listen=IPADDRESS` on the server, and opening the url it prints out. But this is optional, only needed if you're going to be editing files on the server.
+"""]]