diff options
-rw-r--r-- | Annex/Content.hs | 6 | ||||
-rw-r--r-- | Command.hs | 4 | ||||
-rw-r--r-- | Command/Add.hs | 2 | ||||
-rw-r--r-- | Command/AddUrl.hs | 2 | ||||
-rw-r--r-- | Command/ConfigList.hs | 2 | ||||
-rw-r--r-- | Command/Describe.hs | 2 | ||||
-rw-r--r-- | Command/Drop.hs | 4 | ||||
-rw-r--r-- | Command/DropKey.hs | 2 | ||||
-rw-r--r-- | Command/Fsck.hs | 6 | ||||
-rw-r--r-- | Command/Init.hs | 2 | ||||
-rw-r--r-- | Command/InitRemote.hs | 12 | ||||
-rw-r--r-- | Command/Map.hs | 4 | ||||
-rw-r--r-- | Command/Move.hs | 4 | ||||
-rw-r--r-- | Command/Semitrust.hs | 4 | ||||
-rw-r--r-- | Command/SetKey.hs | 2 | ||||
-rw-r--r-- | Command/Status.hs | 2 | ||||
-rw-r--r-- | Command/Trust.hs | 4 | ||||
-rw-r--r-- | Command/Unannex.hs | 2 | ||||
-rw-r--r-- | Command/Untrust.hs | 4 | ||||
-rw-r--r-- | Command/Unused.hs | 2 | ||||
-rw-r--r-- | Command/Whereis.hs | 4 | ||||
-rw-r--r-- | Git.hs | 4 | ||||
-rw-r--r-- | Init.hs | 2 | ||||
-rw-r--r-- | Limit.hs | 2 | ||||
-rw-r--r-- | Logs/Location.hs (renamed from LocationLog.hs) | 6 | ||||
-rw-r--r-- | Logs/Presence.hs (renamed from PresenceLog.hs) | 2 | ||||
-rw-r--r-- | Logs/Remote.hs (renamed from RemoteLog.hs) | 6 | ||||
-rw-r--r-- | Logs/Trust.hs (renamed from Trust.hs) | 6 | ||||
-rw-r--r-- | Logs/UUID.hs (renamed from UUID.hs) | 4 | ||||
-rw-r--r-- | Logs/UUIDBased.hs (renamed from UUIDLog.hs) | 2 | ||||
-rw-r--r-- | Remote.hs | 12 | ||||
-rw-r--r-- | Remote/Bup.hs | 2 | ||||
-rw-r--r-- | Remote/Directory.hs | 2 | ||||
-rw-r--r-- | Remote/Git.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Special.hs | 2 | ||||
-rw-r--r-- | Remote/Hook.hs | 2 | ||||
-rw-r--r-- | Remote/Rsync.hs | 2 | ||||
-rw-r--r-- | Remote/Web.hs | 6 | ||||
-rw-r--r-- | Upgrade/V1.hs | 2 | ||||
-rw-r--r-- | Upgrade/V2.hs | 2 | ||||
-rw-r--r-- | Utility/Ssh.hs | 2 | ||||
-rw-r--r-- | git-annex-shell.hs | 2 | ||||
-rw-r--r-- | git-annex.cabal | 2 | ||||
-rw-r--r-- | test.hs | 34 |
44 files changed, 92 insertions, 92 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 3827154a6..9cf7ea8f2 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -22,8 +22,8 @@ module Annex.Content ( ) where import Common.Annex -import LocationLog -import UUID +import Logs.Location +import Logs.UUID import qualified Git import qualified Annex import qualified Annex.Queue @@ -52,7 +52,7 @@ calcGitLink file key = do where whoops = error $ "unable to normalize " ++ file -{- Updates the LocationLog when a key's presence changes in the current +{- Updates the Logs.Location when a key's presence changes in the current - repository. -} logStatus :: Key -> LogStatus -> Annex () logStatus key status = do diff --git a/Command.hs b/Command.hs index 54dc9603f..f282791fb 100644 --- a/Command.hs +++ b/Command.hs @@ -13,8 +13,8 @@ import qualified Annex import qualified Git import qualified Git.LsFiles as LsFiles import Types.Key -import Trust -import LocationLog +import Logs.Trust +import Logs.Location import Config import Backend import Limit diff --git a/Command/Add.hs b/Command/Add.hs index e6e7a7c77..bfddd72ee 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -13,7 +13,7 @@ import Command import qualified Annex import qualified Annex.Queue import qualified Backend -import LocationLog +import Logs.Location import Annex.Content import Utility.Touch import Backend diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index c5417bf5b..4447dee81 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -18,7 +18,7 @@ import qualified Command.Add import qualified Annex import qualified Backend.URL import Annex.Content -import PresenceLog +import Logs.Presence command :: [Command] command = [repoCommand "addurl" (paramRepeating paramUrl) seek diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs index 60f71eee6..b50c759ee 100644 --- a/Command/ConfigList.hs +++ b/Command/ConfigList.hs @@ -9,7 +9,7 @@ module Command.ConfigList where import Common.Annex import Command -import UUID +import Logs.UUID command :: [Command] command = [repoCommand "configlist" paramNothing seek diff --git a/Command/Describe.hs b/Command/Describe.hs index 336804639..65cd8d0bf 100644 --- a/Command/Describe.hs +++ b/Command/Describe.hs @@ -10,7 +10,7 @@ module Command.Describe where import Common.Annex import Command import qualified Remote -import UUID +import Logs.UUID command :: [Command] command = [repoCommand "describe" (paramPair paramRemote paramDesc) seek diff --git a/Command/Drop.hs b/Command/Drop.hs index fabacbb72..dc858fb29 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -11,9 +11,9 @@ import Common.Annex import Command import qualified Remote import qualified Annex -import LocationLog +import Logs.Location +import Logs.Trust import Annex.Content -import Trust import Config command :: [Command] diff --git a/Command/DropKey.hs b/Command/DropKey.hs index 35ebfc219..fde6ce02e 100644 --- a/Command/DropKey.hs +++ b/Command/DropKey.hs @@ -10,7 +10,7 @@ module Command.DropKey where import Common.Annex import Command import qualified Annex -import LocationLog +import Logs.Location import Annex.Content command :: [Command] diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 16e834fbf..632570b11 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -12,10 +12,10 @@ import Command import qualified Remote import qualified Types.Backend import qualified Types.Key -import UUID import Annex.Content -import LocationLog -import Trust +import Logs.Location +import Logs.Trust +import Logs.UUID import Utility.DataUnits import Utility.FileMode import Config diff --git a/Command/Init.hs b/Command/Init.hs index b9dffb5cd..dcc6bfe6b 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -9,7 +9,7 @@ module Command.Init where import Common.Annex import Command -import UUID +import Logs.UUID import Init command :: [Command] diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 918604f85..240528b87 100644 --- a/Command/InitRemote.hs +++ b/Command/InitRemote.hs @@ -12,9 +12,9 @@ import qualified Data.Map as M import Common.Annex import Command import qualified Remote -import qualified RemoteLog +import qualified Logs.Remote import qualified Types.Remote as R -import UUID +import Logs.UUID command :: [Command] command = [repoCommand "initremote" @@ -38,7 +38,7 @@ start ws = do where name = head ws - config = RemoteLog.keyValToConfig $ tail ws + config = Logs.Remote.keyValToConfig $ tail ws needname = do let err s = error $ "Specify a name for the remote. " ++ s names <- remoteNames @@ -54,13 +54,13 @@ perform t u c = do cleanup :: UUID -> R.RemoteConfig -> CommandCleanup cleanup u c = do - RemoteLog.configSet u c + Logs.Remote.configSet u c return True {- Look up existing remote's UUID and config by name, or generate a new one -} findByName :: String -> Annex (UUID, R.RemoteConfig) findByName name = do - m <- RemoteLog.readRemoteLog + m <- Logs.Remote.readRemoteLog maybe generate return $ findByName' name m where generate = do @@ -79,7 +79,7 @@ findByName' n m = if null matches then Nothing else Just $ head matches remoteNames :: Annex [String] remoteNames = do - m <- RemoteLog.readRemoteLog + m <- Logs.Remote.readRemoteLog return $ mapMaybe (M.lookup nameKey . snd) $ M.toList m {- find the specified remote type -} diff --git a/Command/Map.hs b/Command/Map.hs index 1155c4a6e..5cbf51b27 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -13,8 +13,8 @@ import qualified Data.Map as M import Common.Annex import Command import qualified Git -import UUID -import Trust +import Logs.UUID +import Logs.Trust import Utility.Ssh import qualified Utility.Dot as Dot diff --git a/Command/Move.hs b/Command/Move.hs index 52eb49da1..62f38224c 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -11,10 +11,10 @@ import Common.Annex import Command import qualified Command.Drop import qualified Annex -import LocationLog +import Logs.Location import Annex.Content import qualified Remote -import UUID +import Logs.UUID command :: [Command] command = [repoCommand "move" paramPaths seek diff --git a/Command/Semitrust.hs b/Command/Semitrust.hs index 53b29c98a..e13785a38 100644 --- a/Command/Semitrust.hs +++ b/Command/Semitrust.hs @@ -10,8 +10,8 @@ module Command.Semitrust where import Common.Annex import Command import qualified Remote -import UUID -import Trust +import Logs.UUID +import Logs.Trust command :: [Command] command = [repoCommand "semitrust" (paramRepeating paramRemote) seek diff --git a/Command/SetKey.hs b/Command/SetKey.hs index 28bc9a48d..b707e0b91 100644 --- a/Command/SetKey.hs +++ b/Command/SetKey.hs @@ -9,7 +9,7 @@ module Command.SetKey where import Common.Annex import Command -import LocationLog +import Logs.Location import Annex.Content command :: [Command] diff --git a/Command/Status.hs b/Command/Status.hs index 37e13f0d8..70282b79e 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -23,7 +23,7 @@ import Utility.DataUnits import Annex.Content import Types.Key import Backend -import UUID +import Logs.UUID import Remote -- a named computation that produces a statistic diff --git a/Command/Trust.hs b/Command/Trust.hs index bc655e3f6..fb7f47ec0 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -10,8 +10,8 @@ module Command.Trust where import Common.Annex import Command import qualified Remote -import Trust -import UUID +import Logs.Trust +import Logs.UUID command :: [Command] command = [repoCommand "trust" (paramRepeating paramRemote) seek diff --git a/Command/Unannex.hs b/Command/Unannex.hs index d0cef7678..083984d0c 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -13,7 +13,7 @@ import qualified Command.Drop import qualified Annex import qualified Annex.Queue import Utility.FileMode -import LocationLog +import Logs.Location import Annex.Content import qualified Git import qualified Git.LsFiles as LsFiles diff --git a/Command/Untrust.hs b/Command/Untrust.hs index bcde0e0a0..6f2b60203 100644 --- a/Command/Untrust.hs +++ b/Command/Untrust.hs @@ -10,8 +10,8 @@ module Command.Untrust where import Common.Annex import Command import qualified Remote -import UUID -import Trust +import Logs.UUID +import Logs.Trust command :: [Command] command = [repoCommand "untrust" (paramRepeating paramRemote) seek diff --git a/Command/Unused.hs b/Command/Unused.hs index abf5a5361..874b0ca06 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -16,7 +16,7 @@ import Common.Annex import Command import Annex.Content import Utility.FileMode -import LocationLog +import Logs.Location import qualified Annex import qualified Git import qualified Git.LsFiles as LsFiles diff --git a/Command/Whereis.hs b/Command/Whereis.hs index 0eeb17414..b1646ae69 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -8,10 +8,10 @@ module Command.Whereis where import Common.Annex -import LocationLog +import Logs.Location import Command import Remote -import Trust +import Logs.Trust command :: [Command] command = [repoCommand "whereis" paramPaths seek @@ -338,9 +338,9 @@ urlHostUser r = urlAuthPart uriUserInfo r ++ urlAuthPart uriRegName' r {- The full authority portion an URL repo. (ie, "user@host:port") -} urlAuthority :: Repo -> String -urlAuthority = urlAuthPart combine +urlAuthority = urlAuthPart assemble where - combine a = uriUserInfo a ++ uriRegName' a ++ uriPort a + assemble a = uriUserInfo a ++ uriRegName' a ++ uriPort a {- Applies a function to extract part of the uriAuthority of an URL repo. -} urlAuthPart :: (URIAuth -> a) -> Repo -> a @@ -15,7 +15,7 @@ import Common.Annex import qualified Git import qualified Annex.Branch import Annex.Version -import UUID +import Logs.UUID initialize :: Annex () initialize = do @@ -15,7 +15,7 @@ import qualified Annex import qualified Utility.Matcher import qualified Remote import qualified Backend -import LocationLog +import Logs.Location import Annex.Content type Limit = Utility.Matcher.Token (FilePath -> Annex Bool) diff --git a/LocationLog.hs b/Logs/Location.hs index 5cbdbb28a..4e8b2b535 100644 --- a/LocationLog.hs +++ b/Logs/Location.hs @@ -11,7 +11,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module LocationLog ( +module Logs.Location ( LogStatus(..), logChange, readLog, @@ -24,8 +24,8 @@ module LocationLog ( import Common.Annex import qualified Git import qualified Annex.Branch -import UUID -import PresenceLog +import Logs.UUID +import Logs.Presence {- Log a change in the presence of a key's value in a repository. -} logChange :: Git.Repo -> Key -> UUID -> LogStatus -> Annex () diff --git a/PresenceLog.hs b/Logs/Presence.hs index 4e4960f0a..7211eba03 100644 --- a/PresenceLog.hs +++ b/Logs/Presence.hs @@ -11,7 +11,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module PresenceLog ( +module Logs.Presence ( LogStatus(..), addLog, readLog, diff --git a/RemoteLog.hs b/Logs/Remote.hs index d49635b93..47c2d7472 100644 --- a/RemoteLog.hs +++ b/Logs/Remote.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module RemoteLog ( +module Logs.Remote ( readRemoteLog, configSet, keyValToConfig, @@ -21,8 +21,8 @@ import Data.Char import Common.Annex import qualified Annex.Branch import Types.Remote -import UUID -import UUIDLog +import Logs.UUID +import Logs.UUIDBased {- Filename of remote.log. -} remoteLog :: FilePath diff --git a/Trust.hs b/Logs/Trust.hs index 2971256a4..6966ffdd6 100644 --- a/Trust.hs +++ b/Logs/Trust.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Trust ( +module Logs.Trust ( TrustLevel(..), trustGet, trustSet, @@ -20,8 +20,8 @@ import Types.TrustLevel import qualified Annex.Branch import qualified Annex -import UUID -import UUIDLog +import Logs.UUID +import Logs.UUIDBased {- Filename of trust.log. -} trustLog :: FilePath @@ -13,7 +13,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module UUID ( +module Logs.UUID ( UUID, getUUID, getRepoUUID, @@ -33,7 +33,7 @@ import qualified Annex.Branch import Types.UUID import qualified Build.SysConfig as SysConfig import Config -import UUIDLog +import Logs.UUIDBased configkey :: String configkey = "annex.uuid" diff --git a/UUIDLog.hs b/Logs/UUIDBased.hs index d6eb8fbbb..46fa80be0 100644 --- a/UUIDLog.hs +++ b/Logs/UUIDBased.hs @@ -12,7 +12,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module UUIDLog ( +module Logs.UUIDBased ( Log, LogEntry(..), parseLog, @@ -34,12 +34,12 @@ import Text.JSON.Generic import Common.Annex import Types.Remote -import UUID import qualified Annex import Config -import Trust -import LocationLog -import RemoteLog +import Logs.UUID +import Logs.Trust +import Logs.Location +import Logs.Remote import qualified Remote.Git import qualified Remote.S3 @@ -163,12 +163,12 @@ remotesWithUUID rs us = filter (\r -> uuid r `elem` us) rs remotesWithoutUUID :: [Remote Annex] -> [UUID] -> [Remote Annex] remotesWithoutUUID rs us = filter (\r -> uuid r `notElem` us) rs -{- Cost ordered lists of remotes that the LocationLog indicate may have a key. +{- Cost ordered lists of remotes that the Logs.Location indicate may have a key. -} keyPossibilities :: Key -> Annex [Remote Annex] keyPossibilities key = fst <$> keyPossibilities' False key -{- Cost ordered lists of remotes that the LocationLog indicate may have a key. +{- Cost ordered lists of remotes that the Logs.Location indicate may have a key. - - Also returns a list of UUIDs that are trusted to have the key - (some may not have configured remotes). diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 986be7fc4..dfc911688 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -15,7 +15,7 @@ import System.Process import Common.Annex import Types.Remote import qualified Git -import UUID +import Logs.UUID import Config import Utility.Ssh import Remote.Helper.Special diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 03b17456a..270c78f83 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -15,7 +15,7 @@ import Common.Annex import Utility.CopyFile import Types.Remote import qualified Git -import UUID +import Logs.UUID import Config import Utility.FileMode import Remote.Helper.Special diff --git a/Remote/Git.hs b/Remote/Git.hs index e9919e636..42d1b5858 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -17,7 +17,7 @@ import Utility.Ssh import Types.Remote import qualified Git import qualified Annex -import UUID +import Logs.UUID import qualified Annex.Content import qualified Utility.Url as Url import Config diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index 5f66e8cd9..5603d13aa 100644 --- a/Remote/Helper/Special.hs +++ b/Remote/Helper/Special.hs @@ -12,7 +12,7 @@ import qualified Data.Map as M import Common.Annex import Types.Remote import qualified Git -import UUID +import Logs.UUID {- Special remotes don't have a configured url, so Git.Repo does not - automatically generate remotes for them. This looks for a different diff --git a/Remote/Hook.hs b/Remote/Hook.hs index cc8ed69ab..2c6b50c7d 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -15,7 +15,7 @@ import System.Exit import Common.Annex import Types.Remote import qualified Git -import UUID +import Logs.UUID import Config import Annex.Content import Remote.Helper.Special diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 3474f8b25..321656747 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -13,7 +13,7 @@ import qualified Data.Map as M import Common.Annex import Types.Remote import qualified Git -import UUID +import Logs.UUID import Config import Annex.Content import Remote.Helper.Special diff --git a/Remote/Web.hs b/Remote/Web.hs index ed9c94909..51373a49c 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -13,10 +13,10 @@ module Remote.Web ( import Common.Annex import Types.Remote import qualified Git -import UUID import Config -import PresenceLog -import LocationLog +import Logs.Presence +import Logs.Location +import Logs.UUID import qualified Utility.Url as Url type URLString = String diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 132e694eb..6c6531ace 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -14,7 +14,7 @@ import Data.Char import Common.Annex import Types.Key import Annex.Content -import PresenceLog +import Logs.Presence import qualified Annex.Queue import qualified Git import qualified Git.LsFiles as LsFiles diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 39c7b1561..d6334ed65 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -10,7 +10,7 @@ module Upgrade.V2 where import Common.Annex import qualified Git import qualified Annex.Branch -import LocationLog +import Logs.Location import Annex.Content olddir :: Git.Repo -> FilePath diff --git a/Utility/Ssh.hs b/Utility/Ssh.hs index a0e52507d..1847ff244 100644 --- a/Utility/Ssh.hs +++ b/Utility/Ssh.hs @@ -13,7 +13,7 @@ import qualified Git import Utility.SafeCommand import Types import Config -import UUID +import Logs.UUID {- Generates parameters to ssh to a repository's host and run a command. - Caller is responsible for doing any neccessary shellEscaping of the diff --git a/git-annex-shell.hs b/git-annex-shell.hs index a4d8dd65b..f19abe6c3 100644 --- a/git-annex-shell.hs +++ b/git-annex-shell.hs @@ -13,7 +13,7 @@ import qualified Git import CmdLine import Command import Options -import UUID +import Logs.UUID import qualified Command.ConfigList import qualified Command.InAnnex diff --git a/git-annex.cabal b/git-annex.cabal index 450adea75..e9ec08967 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20111011 +Version: 3.20111012 Cabal-Version: >= 1.6 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -29,12 +29,12 @@ import qualified Locations import qualified Types.Backend import qualified Types import qualified GitAnnex -import qualified LocationLog -import qualified UUID -import qualified UUIDLog -import qualified Trust +import qualified Logs.Location +import qualified Logs.UUID +import qualified Logs.UUIDBased +import qualified Logs.Trust +import qualified Logs.Remote import qualified Remote -import qualified RemoteLog import qualified Command.DropUnused import qualified Types.Key import qualified Config @@ -73,14 +73,14 @@ quickcheck = TestLabel "quickcheck" $ TestList , qctest "prop_idempotent_key_read_show" Types.Key.prop_idempotent_key_read_show , qctest "prop_idempotent_shellEscape" Utility.SafeCommand.prop_idempotent_shellEscape , qctest "prop_idempotent_shellEscape_multiword" Utility.SafeCommand.prop_idempotent_shellEscape_multiword - , qctest "prop_idempotent_configEscape" RemoteLog.prop_idempotent_configEscape + , qctest "prop_idempotent_configEscape" Logs.Remote.prop_idempotent_configEscape , qctest "prop_parentDir_basics" Utility.Path.prop_parentDir_basics , qctest "prop_relPathDirToFile_basics" Utility.Path.prop_relPathDirToFile_basics , qctest "prop_cost_sane" Config.prop_cost_sane , qctest "prop_hmacWithCipher_sane" Crypto.prop_hmacWithCipher_sane - , qctest "prop_TimeStamp_sane" UUIDLog.prop_TimeStamp_sane - , qctest "prop_addLog_sane" UUIDLog.prop_addLog_sane + , qctest "prop_TimeStamp_sane" Logs.UUIDBased.prop_TimeStamp_sane + , qctest "prop_addLog_sane" Logs.UUIDBased.prop_addLog_sane ] blackbox :: Test @@ -341,22 +341,22 @@ test_fix = "git-annex fix" ~: intmpclonerepo $ do test_trust :: Test test_trust = "git-annex trust/untrust/semitrust" ~: intmpclonerepo $ do git_annex "trust" ["-q", repo] @? "trust failed" - trustcheck Trust.Trusted "trusted 1" + trustcheck Logs.Trust.Trusted "trusted 1" git_annex "trust" ["-q", repo] @? "trust of trusted failed" - trustcheck Trust.Trusted "trusted 2" + trustcheck Logs.Trust.Trusted "trusted 2" git_annex "untrust" ["-q", repo] @? "untrust failed" - trustcheck Trust.UnTrusted "untrusted 1" + trustcheck Logs.Trust.UnTrusted "untrusted 1" git_annex "untrust" ["-q", repo] @? "untrust of untrusted failed" - trustcheck Trust.UnTrusted "untrusted 2" + trustcheck Logs.Trust.UnTrusted "untrusted 2" git_annex "semitrust" ["-q", repo] @? "semitrust failed" - trustcheck Trust.SemiTrusted "semitrusted 1" + trustcheck Logs.Trust.SemiTrusted "semitrusted 1" git_annex "semitrust" ["-q", repo] @? "semitrust of semitrusted failed" - trustcheck Trust.SemiTrusted "semitrusted 2" + trustcheck Logs.Trust.SemiTrusted "semitrusted 2" where repo = "origin" trustcheck expected msg = do present <- annexeval $ do - l <- Trust.trustGet expected + l <- Logs.Trust.trustGet expected u <- Remote.nameToUUID repo return $ u `elem` l assertBool msg present @@ -609,11 +609,11 @@ checkdangling f = do checklocationlog :: FilePath -> Bool -> Assertion checklocationlog f expected = do - thisuuid <- annexeval UUID.getUUID + thisuuid <- annexeval Logs.UUID.getUUID r <- annexeval $ Backend.lookupFile f case r of Just (k, _) -> do - uuids <- annexeval $ LocationLog.keyLocations k + uuids <- annexeval $ Logs.Location.keyLocations k assertEqual ("bad content in location log for " ++ f ++ " key " ++ (show k) ++ " uuid " ++ thisuuid) expected (thisuuid `elem` uuids) _ -> assertFailure $ f ++ " failed to look up key" |