factor out a stopUnless
code melt for lunch
This commit is contained in:
parent
d64132a43a
commit
3f5f28b487
9 changed files with 69 additions and 107 deletions
|
@ -108,17 +108,11 @@ toPerform dest move key = moveLock move key $ do
|
|||
fromStart :: Remote.Remote Annex -> Bool -> FilePath -> Key -> CommandStart
|
||||
fromStart src move file key
|
||||
| move = go
|
||||
| otherwise = do
|
||||
ishere <- inAnnex key
|
||||
if ishere then stop else go
|
||||
| otherwise = stopUnless (inAnnex key) go
|
||||
where
|
||||
go = do
|
||||
ok <- fromOk src key
|
||||
if ok
|
||||
then do
|
||||
showMoveAction move file
|
||||
next $ fromPerform src move key
|
||||
else stop
|
||||
go = stopUnless (fromOk src key) $ do
|
||||
showMoveAction move file
|
||||
next $ fromPerform src move key
|
||||
fromOk :: Remote.Remote Annex -> Key -> Annex Bool
|
||||
fromOk src key = do
|
||||
u <- getUUID
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue