unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 02:25:39 +03:00
Code Issues Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Mitchell Rosen 2024-05-06 13:03:41 -04:00
parent 9afdce5e3a
commit d7b48dcb5c
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parser-typechecker/src/Unison/Syntax/FileParser.hs
View File

@ -116,12 +116,6 @@ file = do
watches <- case List.validate (traverseOf (traversed . _3) bindNames) watches of
Left es -> resolutionFailures (toList es)
Right ws -> pure ws
-- let uf =
-- UnisonFileId
-- (UF.datasId env)
-- (UF.effectsId env)
-- (List.foldl' (\acc (a, b, c) -> Map.insert a (b, c) acc) Map.empty (terms <> join accessors))
-- (List.multimap watches)
validateUnisonFile
(UF.datasId env)
(UF.effectsId env)

3
unison-cli/src/Unison/Codebase/Editor/HandleInput.hs
View File

@ -1197,8 +1197,6 @@ inputDescription input =
src <- either (pure . Text.pack . show) brp src0
dest <- brp dest0
pure ("fork " <> src <> " " <> dest)
MergeI _tgt -> do
pure "todo"
MergeLocalBranchI src0 dest0 mode -> do
src <- looseCodeOrProjectToText src0
dest <- looseCodeOrProjectToText dest0
@ -1378,6 +1376,7 @@ inputDescription input =
ListDependentsI {} -> wat
ListEditsI {} -> wat
LoadI {} -> wat
MergeI {} -> wat
NamesI {} -> wat
NamespaceDependenciesI {} -> wat
PopBranchI {} -> wat

6
unison-merge/src/Unison/Merge.hs
View File

@ -1,6 +0,0 @@
module Unison.Merge
(
)
where

2
unison-merge/src/Unison/Merge/TwoDiffOps.hs
View File

@ -26,7 +26,7 @@ make = \case
This alice -> one Alice alice
That bob -> one Bob bob
These (DiffOp'Add alice) (DiffOp'Add bob) -> TwoDiffOps'AddAdd TwoWay {alice, bob}
These (DiffOp'Delete alice) (DiffOp'Delete _bob) -> TwoDiffOps'DeleteDelete alice
These (DiffOp'Delete alice) (DiffOp'Delete _) -> TwoDiffOps'DeleteDelete alice
These (DiffOp'Delete _) (DiffOp'Update bob) -> TwoDiffOps'DeleteUpdate bob
These (DiffOp'Update alice) (DiffOp'Delete _) -> TwoDiffOps'UpdateDelete alice
These (DiffOp'Update alice) (DiffOp'Update bob) ->

1
unison-merge/unison-merge.cabal
View File

@ -17,7 +17,6 @@ source-repository head
library
exposed-modules:
Unison.Merge
Unison.Merge.CombineDiffs
Unison.Merge.Database
Unison.Merge.DeclCoherencyCheck

16
unison-src/transcripts/merge.output.md
View File

@ -77,7 +77,7 @@ project/bob> add
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar
@ -166,7 +166,7 @@ project/bob> add
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar
@ -278,7 +278,7 @@ project/bob> add
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar
@ -415,7 +415,7 @@ project/bob> update
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar baz
@ -553,7 +553,7 @@ project/bob> update
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar baz
@ -648,7 +648,7 @@ project/bob> delete.term foo
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo
@ -750,7 +750,7 @@ project/bob> add
project/alice> merge bob
I merged bob into alice.
I merged /bob into /alice.
project/alice> view foo bar baz
@ -895,7 +895,7 @@ project/bob> add
project/alice> merge /bob
I merged bob into alice.
I merged /bob into /alice.
```
## Merge failure: someone deleted something