34c8af74ba
I've been disliking how the command seek actions were written for some time, with their inversion of control and ugly workarounds. The last straw to fix it was sync --content, which didn't fit the Annex [CommandStart] interface well at all. I have not yet made it take advantage of the changed interface though. The crucial change, and probably why I didn't do it this way from the beginning, is to make each CommandStart action be run with exceptions caught, and if it fails, increment a failure counter in annex state. So I finally remove the very first code I wrote for git-annex, which was before I had exception handling in the Annex monad, and so ran outside that monad, passing state explicitly as it ran each CommandStart action. This was a real slog from 1 to 5 am. Test suite passes. Memory usage is lower than before, sometimes by a couple of megabytes, and remains constant, even when running in a large repo, and even when repeatedly failing and incrementing the error counter. So no accidental laziness space leaks. Wall clock speed is identical, even in large repos. This commit was sponsored by an anonymous bitcoiner.
39 lines
1,007 B
Haskell
39 lines
1,007 B
Haskell
{- git-annex command
|
||
-
|
||
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
||
-
|
||
- Licensed under the GNU GPL version 3 or higher.
|
||
-}
|
||
|
||
module Command.GCryptSetup where
|
||
|
||
import Common.Annex
|
||
import Command
|
||
import Annex.UUID
|
||
import qualified Remote.GCrypt
|
||
import qualified Git
|
||
|
||
def :: [Command]
|
||
def = [dontCheck repoExists $ noCommit $
|
||
command "gcryptsetup" paramValue seek
|
||
SectionPlumbing "sets up gcrypt repository"]
|
||
|
||
seek :: CommandSeek
|
||
seek = withStrings start
|
||
|
||
start :: String -> CommandStart
|
||
start gcryptid = next $ next $ do
|
||
u <- getUUID
|
||
when (u /= NoUUID) $
|
||
error "gcryptsetup refusing to run; this repository already has a git-annex uuid!"
|
||
|
||
g <- gitRepo
|
||
gu <- Remote.GCrypt.getGCryptUUID True g
|
||
let newgu = genUUIDInNameSpace gCryptNameSpace gcryptid
|
||
if gu == Nothing || gu == Just newgu
|
||
then if Git.repoIsLocalBare g
|
||
then do
|
||
void $ Remote.GCrypt.setupRepo gcryptid g
|
||
return True
|
||
else error "cannot use gcrypt in a non-bare repository"
|
||
else error "gcryptsetup uuid mismatch"
|