unison-merge-0.0.0
Safe HaskellNone
LanguageHaskell2010

Unison.Merge.CombineDiffs

Description

Combine two diffs together.

Synopsis

Documentation

data CombinedDiffOp a Source #

The combined result of two diffs on the same thing.

Constructors

CombinedDiffOp'Add !(EitherWayI a) 
CombinedDiffOp'Delete !(EitherWayI a) 
CombinedDiffOp'Update !(EitherWayI (Updated a)) 
CombinedDiffOp'Conflict !(TwoWay a) 

Instances

Instances details
NFData a => NFData (CombinedDiffOp a) Source # 
Instance details

Defined in Unison.Merge.CombineDiffs

Methods

rnf :: CombinedDiffOp a -> () #

Generic (CombinedDiffOp a) Source # 
Instance details

Defined in Unison.Merge.CombineDiffs

Associated Types

type Rep (CombinedDiffOp a) 
Instance details

Defined in Unison.Merge.CombineDiffs

type Rep (CombinedDiffOp a) = D1 ('MetaData "CombinedDiffOp" "Unison.Merge.CombineDiffs" "unison-merge-0.0.0-GSvoCsyhOYv85493H4kvpC" 'False) ((C1 ('MetaCons "CombinedDiffOp'Add" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI a))) :+: C1 ('MetaCons "CombinedDiffOp'Delete" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI a)))) :+: (C1 ('MetaCons "CombinedDiffOp'Update" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI (Updated a)))) :+: C1 ('MetaCons "CombinedDiffOp'Conflict" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (TwoWay a)))))

Methods

from :: CombinedDiffOp a -> Rep (CombinedDiffOp a) x #

to :: Rep (CombinedDiffOp a) x -> CombinedDiffOp a #

Show a => Show (CombinedDiffOp a) Source # 
Instance details

Defined in Unison.Merge.CombineDiffs

Methods

showsPrec :: Int -> CombinedDiffOp a -> ShowS #

show :: CombinedDiffOp a -> String #

showList :: [CombinedDiffOp a] -> ShowS #

type Rep (CombinedDiffOp a) Source # 
Instance details

Defined in Unison.Merge.CombineDiffs

type Rep (CombinedDiffOp a) = D1 ('MetaData "CombinedDiffOp" "Unison.Merge.CombineDiffs" "unison-merge-0.0.0-GSvoCsyhOYv85493H4kvpC" 'False) ((C1 ('MetaCons "CombinedDiffOp'Add" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI a))) :+: C1 ('MetaCons "CombinedDiffOp'Delete" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI a)))) :+: (C1 ('MetaCons "CombinedDiffOp'Update" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (EitherWayI (Updated a)))) :+: C1 ('MetaCons "CombinedDiffOp'Conflict" 'PrefixI 'False) (S1 ('MetaSel ('Nothing :: Maybe Symbol) 'NoSourceUnpackedness 'SourceStrict 'DecidedStrict) (Rec0 (TwoWay a)))))

combineDiffs :: TwoWay (DefnsF3 (Map Name) DiffOp Synhashed Referent TypeReference) -> DefnsF2 (Map Name) CombinedDiffOp Referent TypeReference Source #

Combine LCA->Alice diff and LCA->Bob diff.