e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
49 lines
1.3 KiB
Haskell
49 lines
1.3 KiB
Haskell
{- git-annex v0 -> v1 upgrade support
|
|
-
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Upgrade.V0 where
|
|
|
|
import Common.Annex
|
|
import Annex.Content
|
|
import qualified Upgrade.V1
|
|
|
|
upgrade :: Annex Bool
|
|
upgrade = do
|
|
showAction "v0 to v1"
|
|
|
|
-- do the reorganisation of the key files
|
|
olddir <- fromRepo gitAnnexDir
|
|
keys <- getKeysPresent0 olddir
|
|
forM_ keys $ \k -> moveAnnex k $ olddir </> keyFile0 k
|
|
|
|
-- update the symlinks to the key files
|
|
-- No longer needed here; V1.upgrade does the same thing
|
|
|
|
-- Few people had v0 repos, so go the long way around from 0 -> 1 -> 2
|
|
Upgrade.V1.upgrade
|
|
|
|
-- these stayed unchanged between v0 and v1
|
|
keyFile0 :: Key -> FilePath
|
|
keyFile0 = Upgrade.V1.keyFile1
|
|
fileKey0 :: FilePath -> Key
|
|
fileKey0 = Upgrade.V1.fileKey1
|
|
lookupFile0 :: FilePath -> Annex (Maybe (Key, Backend))
|
|
lookupFile0 = Upgrade.V1.lookupFile1
|
|
|
|
getKeysPresent0 :: FilePath -> Annex [Key]
|
|
getKeysPresent0 dir = ifM (liftIO $ doesDirectoryExist dir)
|
|
( liftIO $ map fileKey0
|
|
<$> (filterM present =<< getDirectoryContents dir)
|
|
, return []
|
|
)
|
|
where
|
|
present d = do
|
|
result <- tryIO $
|
|
getFileStatus $ dir ++ "/" ++ takeFileName d
|
|
case result of
|
|
Right s -> return $ isRegularFile s
|
|
Left _ -> return False
|