diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 18:07:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 18:07:45 -0400 |
| commit | 944c51ba26efc39416c5f148b6ec36151dc7f42e (patch) | |
| tree | badbf7ca754618df5c2e045c4ac3aed12664b0d6 /Command | |
| parent | c7a1690f0247fefedc9b735bee1273660fc94e77 (diff) | |
improve version checking for v3
Do not set annex.version whenever any command is run. Just do it in init.
This ensures that, if a repo has annex.version=3, it has a git-annex
branch, so we don't have to run a command every time to check for the
branch.
Remove the old ad-hoc logic for v0 and v1, to simplify version checking.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Init.hs | 2 | ||||
| -rw-r--r-- | Command/Version.hs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index dbf5666cd..df416eed3 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -22,7 +22,7 @@ import Types import Utility command :: [Command] -command = [repoCommand "init" paramDesc seek +command = [standaloneCommand "init" paramDesc seek "initialize git-annex with repository description"] seek :: [CommandSeek] diff --git a/Command/Version.hs b/Command/Version.hs index 755b95acc..bb7acd12d 100644 --- a/Command/Version.hs +++ b/Command/Version.hs @@ -9,6 +9,7 @@ module Command.Version where import Control.Monad.State (liftIO) import Data.String.Utils +import Data.Maybe import Command import qualified SysConfig @@ -24,7 +25,7 @@ start :: CommandStartNothing start = do liftIO $ putStrLn $ "git-annex version: " ++ SysConfig.packageversion v <- getVersion - liftIO $ putStrLn $ "local repository version: " ++ v + liftIO $ putStrLn $ "local repository version: " ++ fromMaybe "unknown" v liftIO $ putStrLn $ "default repository version: " ++ defaultVersion liftIO $ putStrLn $ "supported repository versions: " ++ vs supportedVersions liftIO $ putStrLn $ "upgrade supported from repository versions: " ++ vs upgradableVersions |