move
This commit is contained in:
parent
1870186632
commit
235e2e63a1
2 changed files with 6 additions and 5 deletions
|
@ -20,6 +20,7 @@ module Locations (
|
||||||
gitAnnexBadLocation,
|
gitAnnexBadLocation,
|
||||||
gitAnnexUnusedLog,
|
gitAnnexUnusedLog,
|
||||||
isLinkToAnnex,
|
isLinkToAnnex,
|
||||||
|
uuidLog,
|
||||||
logFile,
|
logFile,
|
||||||
logFileKey,
|
logFileKey,
|
||||||
hashDirMixed,
|
hashDirMixed,
|
||||||
|
@ -117,6 +118,10 @@ gitAnnexUnusedLog prefix r = gitAnnexDir r </> (prefix ++ "unused")
|
||||||
isLinkToAnnex :: FilePath -> Bool
|
isLinkToAnnex :: FilePath -> Bool
|
||||||
isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s
|
isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s
|
||||||
|
|
||||||
|
{- Filename of uuid.log. -}
|
||||||
|
uuidLog :: FilePath
|
||||||
|
uuidLog = "uuid.log"
|
||||||
|
|
||||||
{- The filename of the log file for a given key. -}
|
{- The filename of the log file for a given key. -}
|
||||||
logFile :: Key -> String
|
logFile :: Key -> String
|
||||||
logFile key = hashDirLower key ++ keyFile key ++ ".log"
|
logFile key = hashDirLower key ++ keyFile key ++ ".log"
|
||||||
|
|
6
UUID.hs
6
UUID.hs
|
@ -19,7 +19,6 @@ module UUID (
|
||||||
genUUID,
|
genUUID,
|
||||||
prettyPrintUUIDs,
|
prettyPrintUUIDs,
|
||||||
describeUUID,
|
describeUUID,
|
||||||
uuidLog,
|
|
||||||
uuidMap
|
uuidMap
|
||||||
) where
|
) where
|
||||||
|
|
||||||
|
@ -36,6 +35,7 @@ import Types.UUID
|
||||||
import qualified Annex
|
import qualified Annex
|
||||||
import qualified SysConfig
|
import qualified SysConfig
|
||||||
import Config
|
import Config
|
||||||
|
import Locations
|
||||||
|
|
||||||
configkey :: String
|
configkey :: String
|
||||||
configkey = "annex.uuid"
|
configkey = "annex.uuid"
|
||||||
|
@ -116,7 +116,3 @@ uuidMap = do
|
||||||
if 1 < length (words l)
|
if 1 < length (words l)
|
||||||
then (head $ words l, unwords $ drop 1 $ words l)
|
then (head $ words l, unwords $ drop 1 $ words l)
|
||||||
else ("", "")
|
else ("", "")
|
||||||
|
|
||||||
{- Filename of uuid.log. -}
|
|
||||||
uuidLog :: FilePath
|
|
||||||
uuidLog = "uuid.log"
|
|
||||||
|
|
Loading…
Reference in a new issue