mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into sqlite

Browse source
This commit is contained in:
Joey Hess 2019-12-19 16:26:23 -04:00
commit 02e00fd7ab
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
37 changed files with 314 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Upgrade/V0.hs
View file

@ -16,7 +16,7 @@ upgrade = do
showAction "v0 to v1"
-- do the reorganisation of the key files
olddir <- fromRepo gitAnnexDir
olddir <- fromRawFilePath <$> fromRepo gitAnnexDir
keys <- getKeysPresent0 olddir
forM_ keys $ \k -> moveAnnex k $ olddir </> keyFile0 k

2
Upgrade/V1.hs
View file

@ -238,7 +238,7 @@ logFile2 = logFile' (hashDirLower def)
logFile' :: (Key -> RawFilePath) -> Key -> Git.Repo -> String
logFile' hasher key repo =
gitStateDir repo ++ fromRawFilePath (hasher key) ++ keyFile key ++ ".log"
gitStateDir repo ++ fromRawFilePath (hasher key) ++ fromRawFilePath (keyFile key) ++ ".log"
stateDir :: FilePath
stateDir = addTrailingPathSeparator ".git-annex"

4
Upgrade/V7.hs
View file

@ -46,7 +46,7 @@ upgrade automatic = do
return True
gitAnnexKeysDbOld :: Git.Repo -> FilePath
gitAnnexKeysDbOld r = gitAnnexDir r </> "keys"
gitAnnexKeysDbOld r = fromRawFilePath (gitAnnexDir r) </> "keys"
gitAnnexKeysDbLockOld :: Git.Repo -> FilePath
gitAnnexKeysDbLockOld r = gitAnnexKeysDbOld r ++ ".lck"
@ -55,7 +55,7 @@ gitAnnexKeysDbIndexCacheOld :: Git.Repo -> FilePath
gitAnnexKeysDbIndexCacheOld r = gitAnnexKeysDbOld r ++ ".cache"
gitAnnexContentIdentifierDbDirOld :: Git.Repo -> FilePath
gitAnnexContentIdentifierDbDirOld r = gitAnnexDir r </> "cids"
gitAnnexContentIdentifierDbDirOld r = fromRawFilePath (gitAnnexDir r) </> "cids"
gitAnnexContentIdentifierLockOld :: Git.Repo -> FilePath
gitAnnexContentIdentifierLockOld r = gitAnnexContentIdentifierDbDirOld r ++ ".lck"