mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-24 08:47:19 +03:00
Merge remote-tracking branch 'origin/master' into topic/bytes
This commit is contained in:
commit
174d08a2af
@ -199,6 +199,8 @@ type ListDetailed = Bool
|
||||
|
||||
data Output v
|
||||
= Success Input
|
||||
| CreatedBranch BranchName
|
||||
| SwitchedBranch BranchName
|
||||
| NoUnisonFile
|
||||
| UnknownBranch BranchName
|
||||
| RenameOutput Name Name NameChangeResult
|
||||
|
@ -289,9 +289,11 @@ loop = do
|
||||
_ <- eval $ NewBranch newBranch branchName
|
||||
currentBranch .= newBranch
|
||||
currentBranchName .= branchName
|
||||
respond $ CreatedBranch $ branchName
|
||||
Just branch -> do
|
||||
currentBranch .= branch
|
||||
currentBranchName .= branchName
|
||||
respond $ SwitchedBranch $ branchName
|
||||
quit = MaybeT $ pure Nothing
|
||||
|
||||
eval :: Command i v a -> Action i v a
|
||||
|
@ -93,6 +93,9 @@ notifyUser dir o = case o of
|
||||
$ "I don't know of a branch named "
|
||||
<> P.red (P.text branchName)
|
||||
<> "."
|
||||
CreatedBranch branchName ->
|
||||
putPrettyLn $ "Created the new branch " <> backtickEOS (P.text branchName)
|
||||
SwitchedBranch _branchName -> pure () -- putPrettyLn "Switched."
|
||||
RenameOutput oldName newName r -> do
|
||||
nameChange "rename" "renamed" oldName newName r
|
||||
AliasOutput existingName newName r -> do
|
||||
|
Loading…
Reference in New Issue
Block a user