diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/AddUrl.hs | 2 | ||||
| -rw-r--r-- | Command/InitRemote.hs | 2 | ||||
| -rw-r--r-- | Command/Migrate.hs | 3 | ||||
| -rw-r--r-- | Command/Status.hs | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index d9fcc17e2..2e9e04fd3 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -28,7 +28,7 @@ import Utility.Path import Utility.Conditional command :: [Command] -command = [repoCommand "addurl" (paramRepeating $ paramUrl) seek +command = [repoCommand "addurl" (paramRepeating paramUrl) seek "add urls to annex"] seek :: [CommandSeek] diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 671f945d2..c6d9f5200 100644 --- a/Command/InitRemote.hs +++ b/Command/InitRemote.hs @@ -35,7 +35,7 @@ start ws = do when (null ws) needname (u, c) <- findByName name - let fullconfig = M.union config c + let fullconfig = config `M.union` c t <- findType fullconfig showStart "initremote" name diff --git a/Command/Migrate.hs b/Command/Migrate.hs index 2be910851..054db6e27 100644 --- a/Command/Migrate.hs +++ b/Command/Migrate.hs @@ -12,6 +12,7 @@ import Control.Applicative import System.Posix.Files import System.Directory import System.FilePath +import Data.Maybe import Command import qualified Annex @@ -48,7 +49,7 @@ start (b, file) = isAnnexed file $ \(key, oldbackend) -> do {- Checks if a key is upgradable to a newer representation. -} {- Ideally, all keys have file size metadata. Old keys may not. -} upgradableKey :: Key -> Bool -upgradableKey key = Types.Key.keySize key == Nothing +upgradableKey key = isNothing $ Types.Key.keySize key perform :: FilePath -> Key -> Backend Annex -> CommandPerform perform file oldkey newbackend = do diff --git a/Command/Status.hs b/Command/Status.hs index fc306bbe5..6da8064f8 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -94,11 +94,11 @@ supported_remote_types = stat "supported remote types" $ local_annex_size :: Stat local_annex_size = stat "local annex size" $ - cachedKeysPresent >>= return . keySizeSum + keySizeSum <$> cachedKeysPresent total_annex_size :: Stat total_annex_size = stat "total annex size" $ - cachedKeysReferenced >>= return . keySizeSum + keySizeSum <$> cachedKeysReferenced local_annex_keys :: Stat local_annex_keys = stat "local annex keys" $ |