Safe Haskell	None
Language	Haskell2010

Darcs.Patch.V1.Commute

Contents

Orphan instances

Synopsis

Documentation

merge :: Merge p => (p :\/: p) wX wY -> (p :/\: p) wX wY Source #

merger :: PrimPatch prim => String -> RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wZ -> Sealed (RepoPatchV1 prim wY) Source #

merger takes two patches, (which have been determined to conflict) and constructs a Merger patch to represent the conflict. p1 is considered to be conflicting with p2 (p1 is the "first" patch in the repo ordering), the resulting Merger is therefore a representation of p2.

unravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wX)] Source #

publicUnravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wY)] Source #

Orphan instances

Eq2 prim => Eq2 (RepoPatchV1 prim) Source #
Methods unsafeCompare :: RepoPatchV1 prim wA wB -> RepoPatchV1 prim wC wD -> Bool Source # (=\/=) :: RepoPatchV1 prim wA wB -> RepoPatchV1 prim wA wC -> EqCheck wB wC Source # (=/\=) :: RepoPatchV1 prim wA wC -> RepoPatchV1 prim wB wC -> EqCheck wA wB Source #
Invert prim => Invert (RepoPatchV1 prim) Source #
Methods invert :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wY wX Source #
PrimPatch prim => PatchInspect (RepoPatchV1 prim) Source #
Methods listTouchedFiles :: RepoPatchV1 prim wX wY -> [FilePath] Source # hunkMatches :: (ByteString -> Bool) -> RepoPatchV1 prim wX wY -> Bool Source #
PrimPatch prim => Commute (RepoPatchV1 prim) Source #
Methods commute :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) Source #
PrimPatch prim => Merge (RepoPatchV1 prim) Source #
Methods merge :: (RepoPatchV1 prim :\/: RepoPatchV1 prim) wX wY -> (RepoPatchV1 prim :/\: RepoPatchV1 prim) wX wY Source #
IsHunk prim => IsHunk (RepoPatchV1 prim) Source #
Methods isHunk :: RepoPatchV1 prim wX wY -> Maybe (FileHunk wX wY) Source #
PrimPatch prim => Effect (RepoPatchV1 prim) Source #
Methods effect :: RepoPatchV1 prim wX wY -> FL (PrimOf (RepoPatchV1 prim)) wX wY Source # effectRL :: RepoPatchV1 prim wX wY -> RL (PrimOf (RepoPatchV1 prim)) wX wY Source #
PrimPatch prim => CommuteNoConflicts (RepoPatchV1 prim) Source #
Methods commuteNoConflicts :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) Source #
PrimPatch prim => Conflict (RepoPatchV1 prim) Source #
Methods resolveConflicts :: RepoPatchV1 prim wX wY -> [[Sealed (FL (PrimOf (RepoPatchV1 prim)) wY)]] Source # conflictedEffect :: RepoPatchV1 prim wX wY -> [IsConflictedPrim (PrimOf (RepoPatchV1 prim))] Source #
Eq2 prim => Eq (RepoPatchV1 prim wX wY) Source #
Methods (==) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool # (/=) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool #