annex.version is now set to 4 for direct mode repositories

To avoid old versions of git-annex getting confused.

There is no upgrade required though.
We switch back to 3 when going from direct to indirect.
This commit is contained in:
Joey Hess 2013-02-26 15:13:10 -04:00
parent 9052efbc22
commit 2d9c046dea
8 changed files with 23 additions and 9 deletions

View file

@ -14,6 +14,7 @@ import qualified Git.Command
import qualified Git.LsFiles
import Config
import Annex.Direct
import Annex.Version
def :: [Command]
def = [notBareRepo $
@ -53,4 +54,5 @@ cleanup :: CommandCleanup
cleanup = do
showStart "direct" ""
setDirect True
setVersion directModeVersion
return True

View file

@ -17,6 +17,7 @@ import qualified Annex
import Annex.Direct
import Annex.Content
import Annex.CatFile
import Annex.Version
import Init
def :: [Command]
@ -88,6 +89,7 @@ perform = do
cleanup :: CommandCleanup
cleanup = do
setVersion defaultVersion
showStart "indirect" ""
showEndOk
return True

View file

@ -23,5 +23,5 @@ start :: CommandStart
start = do
showStart "upgrade" "."
r <- upgrade
setVersion
setVersion defaultVersion
next $ next $ return r