summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 17:51:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 17:51:48 -0400
commit1a182d4d047c24e217663dbccfa39aae907cbbc0 (patch)
treee157eb0aec0aa4bba168443247cfac9771cb2998
parentc3d96ee38a07e2cd9b27241155f80c5020a814f1 (diff)
stub in v2 upgrade
-rw-r--r--Locations.hs1
-rw-r--r--Upgrade.hs2
-rw-r--r--Upgrade/V2.hs24
3 files changed, 10 insertions, 17 deletions
diff --git a/Locations.hs b/Locations.hs
index d2241636e..7f9626a11 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -23,6 +23,7 @@ module Locations (
logFile,
logFileKey,
hashDirMixed,
+ hashDirLower,
prop_idempotent_fileKey
) where
diff --git a/Upgrade.hs b/Upgrade.hs
index 08481755f..6cd75cf3e 100644
--- a/Upgrade.hs
+++ b/Upgrade.hs
@@ -11,6 +11,7 @@ import Types
import Version
import qualified Upgrade.V0
import qualified Upgrade.V1
+import qualified Upgrade.V2
{- Uses the annex.version git config setting to automate upgrades. -}
upgrade :: Annex Bool
@@ -19,4 +20,5 @@ upgrade = do
case version of
"0" -> Upgrade.V0.upgrade
"1" -> Upgrade.V1.upgrade
+ "2" -> Upgrade.V2.upgrade
_ -> return True
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 03ef7ba69..df1f62b8c 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -5,32 +5,22 @@
- 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 Control.Monad.State (liftIO)
-import Control.Monad (filterM, forM_, unless)
-import System.Posix.Files
import System.FilePath
-import Data.String.Utils
-import System.Posix.Types
-import Data.Maybe
-import Data.Char
import Types.Key
-import Content
import Types
-import Locations
-import LocationLog
-import qualified Annex
-import qualified AnnexQueue
import qualified GitRepo as Git
-import Backend
import Messages
-import Version
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. -}
attrLines :: [String]