mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

factor out a stopUnless

Browse source 
code melt for lunch
This commit is contained in:
Joey Hess 2011-12-09 12:23:45 -04:00
parent d64132a43a
commit 3f5f28b487
9 changed files with 69 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Command/Unannex.hs
View file

@ -25,21 +25,17 @@ seek = [withFilesInGit $ whenAnnexed start]
{- The unannex subcommand undoes an add. -}
start :: FilePath -> (Key, Backend Annex) -> CommandStart
start file (key, _) = do
ishere <- inAnnex key
if ishere
then do
force <- Annex.getState Annex.force
unless force $ do
top <- fromRepo Git.workTree
staged <- inRepo $ LsFiles.staged [top]
unless (null staged) $
error "This command cannot be run when there are already files staged for commit."
Annex.changeState $ \s -> s { Annex.force = True }
start file (key, _) = stopUnless (inAnnex key) $ do
force <- Annex.getState Annex.force
unless force $ do
top <- fromRepo Git.workTree
staged <- inRepo $ LsFiles.staged [top]
unless (null staged) $
error "This command cannot be run when there are already files staged for commit."
Annex.changeState $ \s -> s { Annex.force = True }
showStart "unannex" file
next $ perform file key
else stop
showStart "unannex" file
next $ perform file key
perform :: FilePath -> Key -> CommandPerform
perform file key = next $ cleanup file key