From 944c51ba26efc39416c5f148b6ec36151dc7f42e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Jun 2011 18:07:45 -0400
Subject: 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.
---
 Command/Init.hs    | 2 +-
 Command/Version.hs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Command')

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
-- 
cgit v1.2.3