refactor
This commit is contained in:
parent
b45923e96a
commit
461b967966
2 changed files with 9 additions and 7 deletions
9
Annex.hs
9
Annex.hs
|
@ -5,7 +5,7 @@
|
|||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, PackageImports #-}
|
||||
{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, PackageImports, BangPatterns #-}
|
||||
|
||||
module Annex (
|
||||
Annex,
|
||||
|
@ -32,6 +32,7 @@ module Annex (
|
|||
getRemoteGitConfig,
|
||||
withCurrentState,
|
||||
changeDirectory,
|
||||
incError,
|
||||
) where
|
||||
|
||||
import Common
|
||||
|
@ -309,3 +310,9 @@ changeDirectory d = do
|
|||
liftIO $ setCurrentDirectory d
|
||||
r' <- liftIO $ Git.relPath r
|
||||
changeState $ \s -> s { repo = r' }
|
||||
|
||||
incError :: Annex ()
|
||||
incError = changeState $ \s ->
|
||||
let ! c = errcounter s + 1
|
||||
! s' = s { errcounter = c }
|
||||
in s'
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE BangPatterns #-}
|
||||
|
||||
module CmdLine.Action where
|
||||
|
||||
import Common.Annex
|
||||
|
@ -49,10 +47,7 @@ commandAction a = account =<< tryIO go
|
|||
showEndFail
|
||||
incerr
|
||||
incerr = do
|
||||
Annex.changeState $ \s ->
|
||||
let ! c = Annex.errcounter s + 1
|
||||
! s' = s { Annex.errcounter = c }
|
||||
in s'
|
||||
Annex.incError
|
||||
return False
|
||||
|
||||
{- Runs a single command action through the start, perform and cleanup
|
||||
|
|
Loading…
Reference in a new issue