webapp: Avoid stomping on existing group and preferred content settings when adding a local repository (or removable drive repository) that already exists.

This does mean that if the webapp is asked to add a git repository on
a removable drive that already exists, but is not yet a git-annex
repository, it will avoid putting it in any group. That unlikely edge case
is ok; the next step is the edit repository screen, which will show it's
not in any group and the user can pick one.

Assistant/WebApp/Configurators/Local.hs

@@ -337,6 +337,7 @@ getFinishAddDriveR drive = go
 			setConfig (ConfigKey "core.fsyncobjectfiles")
 				(Git.Config.boolConfig True)
 		(u, r) <- a isnew
+		when isnew $
 			liftAnnex $ setStandardGroup u TransferGroup
 		liftAssistant $ syncRemote r
 		redirect $ EditNewRepositoryR u
@@ -459,14 +460,14 @@ initRepo True primary_assistant_repo dir desc mgroup = inDir dir $ do
 		inRepo $ Git.Command.run
 			[Param "config", Param "gc.auto", Param "0"]
 	getUUID
-{- Repo already exists, could be a non-git-annex repo though. -}
+{- Repo already exists, could be a non-git-annex repo though so
+ - still initialize it. -}
 initRepo False _ dir desc mgroup = inDir dir $ do
 	initRepo' desc mgroup
 	getUUID
 
 initRepo' :: Maybe String -> Maybe StandardGroup -> Annex ()
-initRepo' desc mgroup = do
+initRepo' desc mgroup = unlessM isInitialized $ do
-	unlessM isInitialized $ do
 	initialize desc
 	u <- getUUID
 	maybe noop (setStandardGroup u) mgroup

debian/changelog

@@ -3,6 +3,9 @@ git-annex (5.20140530) UNRELEASED; urgency=medium
   * webapp: When adding a new local repository, fix bug that caused its
     group and preferred content to be set in the current repository,
     even when not combining.
+  * webapp: Avoid stomping on existing group and preferred content settings
+    when adding a local repository (or removable drive repository) that
+    already exists.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 29 May 2014 20:10:59 -0400
 

doc/bugs/adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn

@@ -5,4 +5,7 @@ settings.
 Adding existing local repositories or repositories from removable drives
 may have the same problems. Didn't check yet.
 
-[[!ttag confirmed]] --[[Joey]] 
+[[!tag confirmed]] --[[Joey]] 
+
+> Fixed for local repos and repos on removable drives. Still open for
+> ssh remotes (incl gcrypt). --[[Joey]]