diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-05 16:42:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-05 17:05:03 -0400 |
| commit | 4f6c8222072ace33e3acedddd31637089ae474b6 (patch) | |
| tree | 720d851820dd6ccc51e5393f2dc87818141ec2ed /Annex/Version.hs | |
| parent | da9eea5dc0e86b4abb14064346eddc5689d94333 (diff) | |
v5 for direct mode, with automatic upgrade
This includes storing the current state of the HEAD ref, which git annex
sync is going to need, but does not make sync use it.
Diffstat (limited to 'Annex/Version.hs')
| -rw-r--r-- | Annex/Version.hs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Annex/Version.hs b/Annex/Version.hs index 05b3f0227..2b4a49fd2 100644 --- a/Annex/Version.hs +++ b/Annex/Version.hs @@ -19,18 +19,21 @@ defaultVersion :: Version defaultVersion = "3" directModeVersion :: Version -directModeVersion = "4" +directModeVersion = "5" supportedVersions :: [Version] supportedVersions = [defaultVersion, directModeVersion] upgradableVersions :: [Version] #ifndef mingw32_HOST_OS -upgradableVersions = ["0", "1", "2"] +upgradableVersions = ["0", "1", "2", "4"] #else -upgradableVersions = ["2"] +upgradableVersions = ["2", "4"] #endif +autoUpgradeableVersions :: [Version] +autoUpgradeableVersions = ["4"] + versionField :: ConfigKey versionField = annexConfig "version" @@ -42,12 +45,3 @@ setVersion = setConfig versionField removeVersion :: Annex () removeVersion = unsetConfig versionField - -checkVersion :: Version -> Annex () -checkVersion v - | v `elem` supportedVersions = noop - | v `elem` upgradableVersions = err "Upgrade this repository: git-annex upgrade" - | otherwise = err "Upgrade git-annex." - where - err msg = error $ "Repository version " ++ v ++ - " is not supported. " ++ msg |