e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
50 lines
1.4 KiB
Haskell
50 lines
1.4 KiB
Haskell
{- exception handling in the git-annex monad
|
|
-
|
|
- Note that when an Annex action fails and the exception is handled
|
|
- by these functions, any changes the action has made to the
|
|
- AnnexState are retained. This works because the Annex monad
|
|
- internally stores the AnnexState in a MVar.
|
|
-
|
|
- Copyright 2011-2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE PackageImports #-}
|
|
|
|
module Annex.Exception (
|
|
bracketIO,
|
|
bracketAnnex,
|
|
tryAnnex,
|
|
tryAnnexIO,
|
|
throwAnnex,
|
|
catchAnnex,
|
|
) where
|
|
|
|
import qualified Control.Monad.Catch as M
|
|
import Control.Exception
|
|
|
|
import Common.Annex
|
|
|
|
{- Runs an Annex action, with setup and cleanup both in the IO monad. -}
|
|
bracketIO :: IO v -> (v -> IO b) -> (v -> Annex a) -> Annex a
|
|
bracketIO setup cleanup = M.bracket (liftIO setup) (liftIO . cleanup)
|
|
|
|
bracketAnnex :: Annex v -> (v -> Annex b) -> (v -> Annex a) -> Annex a
|
|
bracketAnnex = M.bracket
|
|
|
|
{- try in the Annex monad -}
|
|
tryAnnex :: Annex a -> Annex (Either SomeException a)
|
|
tryAnnex = M.try
|
|
|
|
{- try in the Annex monad, but only catching IO exceptions -}
|
|
tryAnnexIO :: Annex a -> Annex (Either IOException a)
|
|
tryAnnexIO = M.try
|
|
|
|
{- throw in the Annex monad -}
|
|
throwAnnex :: Exception e => e -> Annex a
|
|
throwAnnex = M.throwM
|
|
|
|
{- catch in the Annex monad -}
|
|
catchAnnex :: Exception e => Annex a -> (e -> Annex a) -> Annex a
|
|
catchAnnex = M.catch
|