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

11 files changed, 162 insertions, 1 deletions

diff --git a/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn b/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn
new file mode 100644
index 000000000..d05335353
--- /dev/null
+++ b/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn
@@ -0,0 +1,37 @@
+What steps will reproduce the problem?
+
+Install 4.20130417 as packaged in Debian unstable.
+Using "git annex webapp", setup on first machine adding repository ~/annex.  Add a Box.com repository in directory "annex", encrypted.  Add a jabber account (apparently successful).
+Add test file to ~/annex.  Login via website to box.com, notice that the "annex" directory is created and contains encrypted file.
+On second (remote machine), follow the same steps (add repository in ~/annex, Add a Box.com repository in directory "annex", encrypted, Add same jabber account).
+
+What is the expected output? What do you see instead?
+
+Expected the file to appear in the second machine's ~/annex.  The webapp indicates: Synced with box.com
+Log file says:
+
+[2013-04-23 06:50:16 EDT] main: starting assistant version 4.20130417
+(scanning...) [2013-04-23 06:50:16 EDT] Watcher: Performing startup scan
+(started...) 
+(encryption setup shared cipher) (testing WebDAV server...)
+(gpg) [2013-04-23 06:50:50 EDT] main: Syncing with box.com 
+[2013-04-23 06:50:50 EDT] main: Share with friends, and keep your devices in sync across the cloud. 
+[2013-04-23 06:51:03 EDT] main: Share with friends, and keep your devices in sync across the cloud. 
+warning: Not updating non-default fetch respec
+	
+	Please update the configuration manually if necessary.
+Initializing nautilus-gdu extension
+Shutting down nautilus-gdu extension
+git-annex: Daemon is already running.
+
+What version of git-annex are you using? On what operating system?
+
+4.20130417, debian testing with apt-pinning to unstable on both systems.
+
+Please provide any additional information below.
+
+When editing the Box.com repository, the option to select a directory no longer appears (and the configuration doesn't show the one selected at creation).
+There's no indication if the jabber communication is working successfully.  It could be that signalling isn't working for some reason, but the user has no information to determine that.
+It would be helpful if there were some indication in the Dashboard as to the number of files/directories/objects that git annex believes exists in each location.  It could be that it's not accessing the Box.com server successfully, but again, this is difficult to determine.
+
+It's great to see that git annex might make a box.com account useful for automatic upload and sync... looking forward to getting it to work on both sides! Thanks for making this!
diff --git a/doc/bugs/error_on_only_repository_copy_deletion.mdwn b/doc/bugs/error_on_only_repository_copy_deletion.mdwn
new file mode 100644
index 000000000..83b3f53d3
--- /dev/null
+++ b/doc/bugs/error_on_only_repository_copy_deletion.mdwn
@@ -0,0 +1,14 @@
+**What steps will reproduce the problem?**<br>
+Delete the last repository in the current repository (where it says: warning type in "yes please do as i say").
+Then try running git annex webapp
+<br><br>
+**What is the expected output? What do you see instead?**<br>
+Webapp starts. git-annex: Not in a git repository.
+<br><br>
+**What version of git-annex are you using? On what operating system?**<br>
+4.20130417. Debian wheezy/testing
+<br><br>
+**Please provide any additional information below.**<br>
+See also
+[[bugs/git-annex:_Not_in_a_git_repository._/]]
+where the same error message occurs
diff --git a/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__.mdwn b/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__.mdwn
new file mode 100644
index 000000000..1651457a7
--- /dev/null
+++ b/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__.mdwn
@@ -0,0 +1,46 @@
+What steps will reproduce the problem?
+On Arch Linux, using a cabal installation or prebuilt binaries:
+
+    git-annex get foobar
+
+The remote is an ssh URL: ssh://user@host/path/to/repo.git. Fetching the URL worked just fine.
+
+
+What is the expected output? What do you see instead?
+I expect git-annex to retrieve the file from the remote.
+Insted I see this:
+
+        get foobar (from origin...)                                              
+        git-annex-shell: user error (unrecognized option `--uuid'                                                                                       
+                                                                                 
+        Usage: git-annex-shell [-c] command [parameters ...] [option ..]         
+                                                                                 
+        Options:                                                                 
+                   --force         allow actions that may lose annexed data      
+          -F       --fast          avoid slow operations                         
+          -q       --quiet         avoid verbose output                          
+          -v       --verbose       allow verbose output (default)                
+          -d       --debug         show debug messages                           
+          -b NAME  --backend=NAME  specify key-value backend to use              
+                                                                                 
+        Commands:                                                                
+          configlist DIRECTORY          outputs relevant git configuration       
+          inannex    DIRECTORY KEY ...  checks if keys are present in the annex  
+          dropkey    DIRECTORY KEY ...  drops annexed content for specified keys 
+          recvkey    DIRECTORY KEY      runs rsync in server mode to receive content
+          sendkey    DIRECTORY KEY      runs rsync in server mode to send content
+        )                                                                        
+        rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
+        rsync error: error in rsync protocol data stream (code 12) at io.c(605) [Receiver=3.0.9]
+                                                                                 
+          Unable to access these remotes: origin                                 
+                                                                                 
+          Try making some of these repositories available:                       
+                5afcfc68-aa55-11e2-b5aa-73eac1531269 -- origin (my_remote)       
+        failed                                                                   
+        git-annex: get: 1 failed
+
+
+What version of git-annex are you using? On what operating system?
+git-annex does not understand a '--version' switch and I cannot find another option to print the version. It's the latest I just installed via cabal.
+OS is Arch Linux on kernel 3.8.8
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
index ee4b0716f..06e4fab4e 100644
--- a/doc/design/assistant/polls/Android_default_directory.mdwn
+++ b/doc/design/assistant/polls/Android_default_directory.mdwn
@@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
 want the first time they run it, but to save typing on android, anything
 that gets enough votes will be included in a list of choices as well.
 
-[[!poll open=yes expandable=yes 37 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
+[[!poll open=yes expandable=yes 39 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment b/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment
new file mode 100644
index 000000000..a338fa0bf
--- /dev/null
+++ b/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="hhm"
+ ip="108.17.80.177"
+ subject="file transfer?"
+ date="2013-04-23T10:22:43Z"
+ content="""
+Would it be possible to add optional support for transferring files over XMPP (possibly being disabled out-of-the-box so as not to suck up third-party bandwidth)?
+"""]]
diff --git a/doc/design/assistant/xmpp/comment_4_773102522f21844cffc841e6cde9229e._comment b/doc/design/assistant/xmpp/comment_4_773102522f21844cffc841e6cde9229e._comment
new file mode 100644
index 000000000..f8ddf0a3b
--- /dev/null
+++ b/doc/design/assistant/xmpp/comment_4_773102522f21844cffc841e6cde9229e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="hhm"
+ ip="108.17.80.177"
+ subject="file transfer?"
+ date="2013-04-23T10:22:51Z"
+ content="""
+Would it be possible to add optional support for transferring files over XMPP (possibly being disabled out-of-the-box so as not to suck up third-party bandwidth)?
+"""]]
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa.mdwn b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa.mdwn
new file mode 100644
index 000000000..351c6f92d
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa.mdwn
@@ -0,0 +1,6 @@
+Hi, I have installed latest version from https://launchpad.net/~rubiojr/+archive/git-annex, that is git-annex version: 3.20121017-ubuntu1ppa1~precise
+When running git annex webapp I get 
+
+git-annex: unknown command webapp
+
+I only installed git-annex. Are there more packages to be installed to make it work?
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_1_9345551f5772c3a6f1490b00e1edbf69._comment b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_1_9345551f5772c3a6f1490b00e1edbf69._comment
new file mode 100644
index 000000000..aae67b95e
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_1_9345551f5772c3a6f1490b00e1edbf69._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo"
+ nickname="Tobias"
+ subject="comment 1"
+ date="2013-04-23T08:39:50Z"
+ content="""
+This version does not have the webapp. Use a newer one (maybe you need the standalone build)
+"""]]
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_2_0b688a442b6a911a0353e73097a24cb6._comment b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_2_0b688a442b6a911a0353e73097a24cb6._comment
new file mode 100644
index 000000000..b83eb40ec
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_2_0b688a442b6a911a0353e73097a24cb6._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="tomas"
+ ip="64.103.25.104"
+ subject="comment 2"
+ date="2013-04-23T11:50:21Z"
+ content="""
+According to documentation:
+http://git-annex.branchable.com/assistant/
+The git-annex assistant comes as part of git-annex, starting with version 3.20120924.
+
+So it should be there in 3.20121017, no?
+"""]]
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_3_7e246caa00005560bb489c927c663046._comment b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_3_7e246caa00005560bb489c927c663046._comment
new file mode 100644
index 000000000..e2463ba23
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_3_7e246caa00005560bb489c927c663046._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-04-23T16:05:31Z"
+ content="""
+git-annex can be built without the webapp, and if some of the necessary dependencies for the webapp are not available, it will build without it by default. More recent versions than that one let you run `git annex version` and see the build flags, which can all be disabled due to missing dependencies. For example:
+
+    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
+
+Sergio does seem to be trying to backport all the dependencies of the webapp, but it looks to me like some of them, particularly haskell-xml-hamlet, have not successfully built yet.
+"""]]
diff --git a/doc/forum/Need_some_help_to_fix_my_repository/comment_2_a3fcfa1f8eadec5fa8a9efacca174048._comment b/doc/forum/Need_some_help_to_fix_my_repository/comment_2_a3fcfa1f8eadec5fa8a9efacca174048._comment
new file mode 100644
index 000000000..bded393bf
--- /dev/null
+++ b/doc/forum/Need_some_help_to_fix_my_repository/comment_2_a3fcfa1f8eadec5fa8a9efacca174048._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkyQL8VPwrSf8LA0k8PKDWFCEKFH3O5Jds"
+ nickname="marco"
+ subject="Brvo"
+ date="2013-04-22T23:33:10Z"
+ content="""
+Bravo. Mon Hero.
+
+You save my data ! I can't find what happen but thanks a lot.
+"""]]