add v6; keep v5 working for now and manual upgrade

Since all places where a repo is used in direct mode need to have git-annex
upgraded before the repo can safely be converted to v6, the upgrade needs
to be manual for now.

I suppose that at some point I'll want to drop all the direct mode support
code. At that point, will stop supporting v5, and will need to auto-upgrade
any remaining v5 repos. If possible, I'd like to carry the direct mode
support for say, a year or so, to give people plenty of time to upgrade and
avoid disruption.
This commit is contained in:
Joey Hess 2015-12-04 16:14:48 -04:00
parent 34ead644d9
commit ccc49861ca
Failed to extract signature
9 changed files with 74 additions and 14 deletions

View file

@ -54,14 +54,14 @@ upgrade = do
ifM (fromRepo Git.repoIsLocalBare)
( do
moveContent
setVersion supportedVersion
setVersion currentVersion
, do
moveContent
updateSymlinks
moveLocationLogs
Annex.Queue.flush
setVersion supportedVersion
setVersion currentVersion
)
Upgrade.V2.upgrade

18
Upgrade/V5.hs Normal file
View file

@ -0,0 +1,18 @@
{- git-annex v5 -> v6 uppgrade support
-
- Copyright 2015 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
module Upgrade.V5 where
import Common.Annex
import Config
upgrade :: Bool -> Annex Bool
upgrade automatic = do
unless automatic $
showAction "v5 to v6"
configureSmudgeFilter
return True