Merge remote-tracking branch 'origin/master' into assistant

Conflicts:
	Init.hs

Command/Unused.hs

@@ -229,9 +229,12 @@ withKeysReferencedM a = withKeysReferenced' () calla
 withKeysReferenced' :: v -> (Key -> v -> Annex v) -> Annex v
 withKeysReferenced' initial a = go initial =<< files
 	where
-		files = do
+		files = ifM isBareRepo
-			top <- fromRepo Git.repoPath
+			( return []
-			inRepo $ LsFiles.inRepo [top]
+			, do
+				top <- fromRepo Git.repoPath
+				inRepo $ LsFiles.inRepo [top]
+			)
 		go v [] = return v
 		go v (f:fs) = do
 			x <- Backend.lookupFile f

debian/changelog

@@ -4,6 +4,7 @@ git-annex (3.20120722) UNRELEASED; urgency=low
     that its config is valid.
   * init: If no description is provided for a new repository, one will
     automatically be generated, like "joey@gnu:~/foo"
+  * unused, status: Avoid crashing when ran in bare repo.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 27 Jul 2012 21:04:47 -0400
 

doc/design/assistant/blog/day_52__file_browser.mdwn

@@ -0,0 +1,21 @@
+Today I added a "Files" link in the navbar of the WebApp. It looks like a
+regular hyperlink, but clicking on it opens up your desktop's native file
+manager, to manage the files in the repository!
+
+Quite fun to be able to do this kind of thing from a web page. :)
+
+---
+
+Made `git annex init` (and the WebApp) automatically generate a description
+of the repo when none is provided.
+
+---
+
+Also worked on the configuration pages some. I don't want to get ahead
+of myself by diving into the full configuration stage yet, but I am at
+least going to add a configuration screen to clone the repo to a removable
+drive.
+
+After that, the list of transfers on the dashboard needs some love.
+I'll probably start by adding UI to cancel running transfers, and then
+try to get drag and drop reordering of transfers working.

doc/design/assistant/webapp.mdwn

@@ -17,10 +17,10 @@ The webapp is a web server that displays a shiny interface.
 ## interface
 
 * list of files uploading and downloading **done**
-* progress bars for each file
+* button to open file browser on repo (`xdg-open $DIR`) **done**
+* progress bars for each file (see [[progressbars]])
 * drag and drop to reorder
 * cancel and pause
-* button to open file browser on repo (`xdg-open $DIR`)
 * keep it usable w/o javascript, and accessible to blind, etc
 
 ## other features
@@ -29,18 +29,16 @@ The webapp is a web server that displays a shiny interface.
   over http by the web app
 * Display any relevant warning messages. One is the `inotify max_user_watches`
   exceeded message.
+* possibly add a desktop file to the top of the repository that can be used
+  to open the webapp (rather than using the menus). Would be complicated
+  some by the path to git-annex sometimes needing to be hardcoded and varying
+  across systems, so it would need to be a symlink to `.git/annex/desktop`
+  which would be per-system.
 
-## first start
+## first start **done**
 
 * make git repo **done**
-* generate a nice description like "joey@hostname Desktop/annex"
+* generate a nice description like "joey@hostname Desktop/annex" **done**
-* record repository that was made, and use it next time run
+* record repository that was made, and use it next time run **done**
 * write a pid file, to prevent more than one first-start process running
-  at once
+  at once **done**
-
-## implementation
-
-* possibly lose the ugly auth= token past the first page,
-  and use a client-side session. It could be encrypted using the token
-  as the `encryptKey`. Note: Would need to set the session duration
-  to infinite (how?)

doc/forum/public-web-frontend.mdwn

@@ -0,0 +1,16 @@
+Hi,
+
+Use case: I would like to have a "Public" top-level directory in my annex, which gets files in there published over HTTP on a particular server.
+
+How I see doing this:
+
+1. Put my annex to an http server with exported-over-http `/Public/` directory.
+2. Configure a `post-update` hook with the following:
+
+        $ git annex fix
+
+3. Push files on `/Public/` to that annex.
+
+Does it make sense? If yes, are there any gotchas I should beware of?
+
+Thanks.

doc/forum/public-web-frontend/comment_1_c73bd2dfe020c25eaad1c0707dd2db01._comment

@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="should work.."
+ date="2012-08-05T17:18:47Z"
+ content="""
+I see no need for `git annex fix` here.
+
+Web server default configurations may not allow following symlinks outside the web server document root. On apache, it can be enabled with `Options FollowSymLinks`
+"""]]