diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-17 18:03:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 18:03:39 -0400 |
| commit | e9b6c350b15a93d82affadfabca18b3e95840cb1 (patch) | |
| tree | 48230725260d92997b1fe58a698f57568f398475 /Command.hs | |
| parent | c7c12e735b806eecd62048b822af2d8802671d3f (diff) | |
replace (Key, Backend) with Key
Only fsck and reinject and the test suite used the Backend, and they can
look it up as needed from the Key. This simplifies the code and also speeds
it up.
There is a small behavior change here. Before, all commands would warn when
acting on an annexed file with an unknown backend. Now, only fsck and
reinject show that warning.
Diffstat (limited to 'Command.hs')
| -rw-r--r-- | Command.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command.hs b/Command.hs index 3faa4053c..fc440f291 100644 --- a/Command.hs +++ b/Command.hs @@ -70,11 +70,11 @@ stopUnless :: Annex Bool -> Annex (Maybe a) -> Annex (Maybe a) stopUnless c a = ifM c ( a , stop ) {- Modifies an action to only act on files that are already annexed, - - and passes the key and backend on to it. -} -whenAnnexed :: (FilePath -> (Key, Backend) -> Annex (Maybe a)) -> FilePath -> Annex (Maybe a) + - and passes the key on to it. -} +whenAnnexed :: (FilePath -> Key -> Annex (Maybe a)) -> FilePath -> Annex (Maybe a) whenAnnexed a file = ifAnnexed file (a file) (return Nothing) -ifAnnexed :: FilePath -> ((Key, Backend) -> Annex a) -> Annex a -> Annex a +ifAnnexed :: FilePath -> (Key -> Annex a) -> Annex a -> Annex a ifAnnexed file yes no = maybe no yes =<< Backend.lookupFile file isBareRepo :: Annex Bool |