diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-30 15:04:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-30 15:04:01 -0400 |
| commit | 4cd5738bb29278498b06b4f4d3edd4962c7a0eea (patch) | |
| tree | fba68b6e8f9c0ed1ae6575d015cd0d8e0014ec8e | |
| parent | 4a21f17d082d11d0301d314d49f8ffa5607c4713 (diff) | |
refactor
| -rw-r--r-- | Annex.hs | 9 | ||||
| -rw-r--r-- | CmdLine/Action.hs | 7 |
2 files changed, 9 insertions, 7 deletions
@@ -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' diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs index 57e1fa60b..a32abbbee 100644 --- a/CmdLine/Action.hs +++ b/CmdLine/Action.hs @@ -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 |