0a4479b8ec
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.
49 lines
1.2 KiB
Haskell
49 lines
1.2 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.VPop where
|
|
|
|
import Command
|
|
import qualified Git
|
|
import qualified Git.Command
|
|
import qualified Git.Ref
|
|
import Types.View
|
|
import Logs.View
|
|
import Command.View (checkoutViewBranch)
|
|
|
|
cmd :: Command
|
|
cmd = notBareRepo $ notDirect $
|
|
command "vpop" SectionMetaData "switch back to previous view"
|
|
paramNumber (withParams seek)
|
|
|
|
seek :: CmdParams -> CommandSeek
|
|
seek = withWords start
|
|
|
|
start :: [String] -> CommandStart
|
|
start ps = go =<< currentView
|
|
where
|
|
go Nothing = giveup "Not in a view."
|
|
go (Just v) = do
|
|
showStart "vpop" (show num)
|
|
removeView v
|
|
(oldvs, vs) <- splitAt (num - 1) . filter (sameparentbranch v)
|
|
<$> recentViews
|
|
mapM_ removeView oldvs
|
|
case vs of
|
|
(oldv:_) -> next $ next $ do
|
|
showOutput
|
|
checkoutViewBranch oldv (return . branchView)
|
|
_ -> next $ next $ do
|
|
showOutput
|
|
inRepo $ Git.Command.runBool
|
|
[ Param "checkout"
|
|
, Param $ Git.fromRef $ Git.Ref.base $
|
|
viewParentBranch v
|
|
]
|
|
sameparentbranch a b = viewParentBranch a == viewParentBranch b
|
|
|
|
num = fromMaybe 1 $ readish =<< headMaybe ps
|