minor syntax changes

This commit is contained in:
Joey Hess 2011-10-11 14:43:45 -04:00
parent 025ded4a2d
commit b505ba83e8
19 changed files with 78 additions and 95 deletions

View file

@ -20,7 +20,6 @@ seek = [withNothing start]
start :: CommandStart
start = do
g <- gitRepo
u <- getUUID g
u <- getUUID
liftIO $ putStrLn $ "annex.uuid=" ++ u
stop

View file

@ -55,7 +55,7 @@ verifyLocationLog key file = do
preventWrite f
preventWrite (parentDir f)
u <- getUUID g
u <- getUUID
uuids <- keyLocations key
case (present, u `elem` uuids) of

View file

@ -29,7 +29,6 @@ start ws = do
perform :: String -> CommandPerform
perform description = do
initialize
g <- gitRepo
u <- getUUID g
u <- getUUID
describeUUID u description
next $ return True

View file

@ -72,8 +72,7 @@ remoteHasKey remote key present = do
-}
toStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart
toStart dest move file = isAnnexed file $ \(key, _) -> do
g <- gitRepo
u <- getUUID g
u <- getUUID
ishere <- inAnnex key
if not ishere || u == Remote.uuid dest
then stop -- not here, so nothing to do
@ -122,8 +121,7 @@ toCleanup dest move key = do
-}
fromStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart
fromStart src move file = isAnnexed file $ \(key, _) -> do
g <- gitRepo
u <- getUUID g
u <- getUUID
remotes <- Remote.keyPossibilities key
if u == Remote.uuid src || not (any (== src) remotes)
then stop