break out non-log stuff to separate module

Logs/Location.hs

@@ -24,7 +24,6 @@ module Logs.Location (
 import Common.Annex
 import qualified Git
 import qualified Annex.Branch
-import Logs.UUID
 import Logs.Presence
 
 {- Log a change in the presence of a key's value in a repository. -}

Logs/Remote.hs

@@ -21,7 +21,6 @@ import Data.Char
 import Common.Annex
 import qualified Annex.Branch
 import Types.Remote
-import Logs.UUID
 import Logs.UUIDBased
 
 {- Filename of remote.log. -}

Logs/Trust.hs

@@ -19,8 +19,6 @@ import Common.Annex
 import Types.TrustLevel
 import qualified Annex.Branch
 import qualified Annex
-
-import Logs.UUID
 import Logs.UUIDBased
 
 {- Filename of trust.log. -}

Logs/UUID.hs

@@ -14,12 +14,6 @@
  -}
 
 module Logs.UUID (
-	UUID,
-	getUUID,
-	getRepoUUID,
-	getUncachedUUID,
-	prepUUID,
-	genUUID,
 	describeUUID,
 	uuidMap
 ) where
@@ -28,61 +22,13 @@ import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 
 import Common.Annex
-import qualified Git
 import qualified Annex.Branch
-import Types.UUID
-import qualified Build.SysConfig as SysConfig
-import Config
 import Logs.UUIDBased
 
-configkey :: String
-configkey = "annex.uuid"
-
 {- Filename of uuid.log. -}
 logfile :: FilePath
 logfile = "uuid.log"
 
-{- Generates a UUID. There is a library for this, but it's not packaged,
- - so use the command line tool. -}
-genUUID :: IO UUID
-genUUID = pOpen ReadFromPipe command params hGetLine
-	where
-		command = SysConfig.uuid
-		params = if command == "uuid"
-			-- request a random uuid be generated
-			then ["-m"]
-			-- uuidgen generates random uuid by default
-			else []
-
-getUUID :: Annex UUID
-getUUID = getRepoUUID =<< gitRepo
-
-{- Looks up a repo's UUID. May return "" if none is known. -}
-getRepoUUID :: Git.Repo -> Annex UUID
-getRepoUUID r = do
-	g <- gitRepo
-
-	let c = cached g
-	let u = getUncachedUUID r
-	
-	if c /= u && u /= ""
-		then do
-			updatecache g u
-			return u
-		else return c
-	where
-		cached g = Git.configGet g cachekey ""
-		updatecache g u = when (g /= r) $ setConfig cachekey u
-		cachekey = "remote." ++ fromMaybe "" (Git.repoRemoteName r) ++ ".annex-uuid"
-
-getUncachedUUID :: Git.Repo -> UUID
-getUncachedUUID r = Git.configGet r configkey ""
-
-{- Make sure that the repo has an annex.uuid setting. -}
-prepUUID :: Annex ()
-prepUUID = whenM (null <$> getUUID) $
-	setConfig configkey =<< liftIO genUUID
-
 {- Records a description for a uuid in the log. -}
 describeUUID :: UUID -> String -> Annex ()
 describeUUID uuid desc = do

Logs/Web.hs

@@ -16,7 +16,6 @@ module Logs.Web (
 import Common.Annex
 import Logs.Presence
 import Logs.Location
-import Logs.UUID
 
 type URLString = String