From 381766efcdddb4c8706408a90c515470a6aa43a7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Nov 2016 21:29:54 -0400 Subject: Avoid backtraces on expected failures when built with ghc 8; only use backtraces for unexpected errors. ghc 8 added backtraces on uncaught errors. This is great, but git-annex was using error in many places for a error message targeted at the user, in some known problem case. A backtrace only confuses such a message, so omit it. Notably, commands like git annex drop that failed due to eg, numcopies, used to use error, so had a backtrace. This commit was sponsored by Ethan Aubin. --- Command/Reinject.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Command/Reinject.hs') diff --git a/Command/Reinject.hs b/Command/Reinject.hs index fa2459e22..97aa602e7 100644 --- a/Command/Reinject.hs +++ b/Command/Reinject.hs @@ -47,7 +47,7 @@ startSrcDest (src:dest:[]) next $ ifAnnexed dest (\key -> perform src key (verifyKeyContent DefaultVerify UnVerified key src)) stop -startSrcDest _ = error "specify a src file and a dest file" +startSrcDest _ = giveup "specify a src file and a dest file" startKnown :: FilePath -> CommandStart startKnown src = notAnnexed src $ do @@ -63,7 +63,8 @@ startKnown src = notAnnexed src $ do ) notAnnexed :: FilePath -> CommandStart -> CommandStart -notAnnexed src = ifAnnexed src (error $ "cannot used annexed file as src: " ++ src) +notAnnexed src = ifAnnexed src $ + giveup $ "cannot used annexed file as src: " ++ src perform :: FilePath -> Key -> Annex Bool -> CommandPerform perform src key verify = ifM move -- cgit v1.2.3 From 36e8c675c9073e8bee1856c7150a129e6a61215c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2016 14:16:57 -0400 Subject: avoid too-long command synopsis It was making git-annex usage output columns far too wide --- Command/Reinject.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Command/Reinject.hs') diff --git a/Command/Reinject.hs b/Command/Reinject.hs index 97aa602e7..7d2da9420 100644 --- a/Command/Reinject.hs +++ b/Command/Reinject.hs @@ -16,8 +16,7 @@ import Types.KeySource cmd :: Command cmd = command "reinject" SectionUtility "inject content of file back into annex" - (paramRepeating (paramPair "SRC" "DEST") - `paramOr` "--known " ++ paramRepeating "SRC") + (paramRepeating (paramPair "SRC" "DEST")) (seek <$$> optParser) data ReinjectOptions = ReinjectOptions -- cgit v1.2.3