stub in v2 upgrade

This commit is contained in:
Joey Hess 2011-06-22 17:51:48 -04:00
parent c3d96ee38a
commit 1a182d4d04
3 changed files with 10 additions and 17 deletions

View file

@ -23,6 +23,7 @@ module Locations (
logFile, logFile,
logFileKey, logFileKey,
hashDirMixed, hashDirMixed,
hashDirLower,
prop_idempotent_fileKey prop_idempotent_fileKey
) where ) where

View file

@ -11,6 +11,7 @@ import Types
import Version import Version
import qualified Upgrade.V0 import qualified Upgrade.V0
import qualified Upgrade.V1 import qualified Upgrade.V1
import qualified Upgrade.V2
{- Uses the annex.version git config setting to automate upgrades. -} {- Uses the annex.version git config setting to automate upgrades. -}
upgrade :: Annex Bool upgrade :: Annex Bool
@ -19,4 +20,5 @@ upgrade = do
case version of case version of
"0" -> Upgrade.V0.upgrade "0" -> Upgrade.V0.upgrade
"1" -> Upgrade.V1.upgrade "1" -> Upgrade.V1.upgrade
"2" -> Upgrade.V2.upgrade
_ -> return True _ -> return True

View file

@ -5,32 +5,22 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Upgrade.V1 where module Upgrade.V2 where
import System.IO.Error (try)
import System.Directory import System.Directory
import Control.Monad.State (liftIO)
import Control.Monad (filterM, forM_, unless)
import System.Posix.Files
import System.FilePath import System.FilePath
import Data.String.Utils
import System.Posix.Types
import Data.Maybe
import Data.Char
import Types.Key import Types.Key
import Content
import Types import Types
import Locations
import LocationLog
import qualified Annex
import qualified AnnexQueue
import qualified GitRepo as Git import qualified GitRepo as Git
import Backend
import Messages import Messages
import Version
import Utility import Utility
import qualified Command.Init import Locations
upgrade :: Annex Bool
upgrade = do
showNote "v2 to v3"
error "TODO"
{- Old .gitattributes contents, not needed anymore. -} {- Old .gitattributes contents, not needed anymore. -}
attrLines :: [String] attrLines :: [String]