diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-08 15:34:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-08 16:27:20 -0400 |
| commit | bf460a0a98d7e4c7f4eac525fcf300629db582b6 (patch) | |
| tree | bff7cd09529c40fa8cb76fd92428cc41e24ad808 /Upgrade/V0.hs | |
| parent | 2ff8915365099501382183af9855e739fc234861 (diff) | |
reorder repo parameters last
Many functions took the repo as their first parameter. Changing it
consistently to be the last parameter allows doing some useful things with
currying, that reduce boilerplate.
In particular, g <- gitRepo is almost never needed now, instead
use inRepo to run an IO action in the repo, and fromRepo to get
a value from the repo.
This also provides more opportunities to use monadic and applicative
combinators.
Diffstat (limited to 'Upgrade/V0.hs')
| -rw-r--r-- | Upgrade/V0.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs index b1443fa46..eae5c87ce 100644 --- a/Upgrade/V0.hs +++ b/Upgrade/V0.hs @@ -16,10 +16,9 @@ import qualified Upgrade.V1 upgrade :: Annex Bool upgrade = do showAction "v0 to v1" - g <- gitRepo -- do the reorganisation of the key files - let olddir = gitAnnexDir g + olddir <- fromRepo gitAnnexDir keys <- getKeysPresent0 olddir forM_ keys $ \k -> moveAnnex k $ olddir </> keyFile0 k |