darcs-2.18.2: a distributed, interactive, smart revision control system

Safe Haskell | None
Language | Haskell2010

Darcs.Patch.V1.Commute

Contents

- Orphan instances

Synopsis

- merge :: Merge p => (p :\/: p) wX wY -> (p :/\: p) wX wY
- merger :: forall (prim :: Type -> Type -> Type) wX wY wZ. PrimPatch prim => String -> RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wZ -> Sealed (RepoPatchV1 prim wY)
- unravel :: forall (prim :: Type -> Type -> Type) wX wY. PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wX)]
- publicUnravel :: forall (prim :: Type -> Type -> Type) wX wY. PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wY)]

# Documentation

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

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

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 :: forall (prim :: Type -> Type -> Type) wX wY. PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wX)] #

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

# Orphan instances

PrimPatch prim => Commute (RepoPatchV1 prim) # |
Instance details Methods commute :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) #
PrimPatch prim => CommuteNoConflicts (RepoPatchV1 prim) # |
Instance details Methods commuteNoConflicts :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) #
PrimPatch prim => Conflict (RepoPatchV1 prim) # |
Instance details Methods isConflicted :: RepoPatchV1 prim wX wY -> Bool # resolveConflicts :: RL (RepoPatchV1 prim) wO wX -> RL (RepoPatchV1 prim) wX wY -> [ConflictDetails (PrimOf (RepoPatchV1 prim)) wY] #
PrimPatch prim => Effect (RepoPatchV1 prim) # |
Instance details Methods effect :: RepoPatchV1 prim wX wY -> FL (PrimOf (RepoPatchV1 prim)) wX wY #
(PrimPatch prim, ApplyState prim ~ ApplyState (RepoPatchV1 prim)) => IsHunk (RepoPatchV1 prim) # |
Instance details Methods isHunk :: RepoPatchV1 prim wX wY -> Maybe (FileHunk (ObjectIdOfPatch (RepoPatchV1 prim)) wX wY) #
PrimPatch prim => PatchInspect (RepoPatchV1 prim) # |
Instance details Methods listTouchedFiles :: RepoPatchV1 prim wX wY -> [AnchoredPath] # hunkMatches :: (ByteString -> Bool) -> RepoPatchV1 prim wX wY -> Bool #
Invert prim => Invert (RepoPatchV1 prim) # |
Instance details Methods invert :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wY wX #
PrimPatch prim => CleanMerge (RepoPatchV1 prim) # |
Instance details Methods cleanMerge :: (RepoPatchV1 prim :\/: RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :/\: RepoPatchV1 prim) wX wY) #
PrimPatch prim => Merge (RepoPatchV1 prim) # |
Instance details Methods merge :: (RepoPatchV1 prim :\/: RepoPatchV1 prim) wX wY -> (RepoPatchV1 prim :/\: RepoPatchV1 prim) wX wY #
PrimPatch prim => Summary (RepoPatchV1 prim) # |
Instance details Methods conflictedEffect :: RepoPatchV1 prim wX wY -> [IsConflictedPrim (PrimOf (RepoPatchV1 prim))] #
PrimPatch prim => Unwind (RepoPatchV1 prim) # |
Instance details Methods fullUnwind :: RepoPatchV1 prim wX wY -> Unwound (PrimOf (RepoPatchV1 prim)) wX wY #
Eq2 prim => Eq2 (RepoPatchV1 prim) # |
Instance details Methods unsafeCompare :: RepoPatchV1 prim wA wB -> RepoPatchV1 prim wC wD -> Bool # (=\/=) :: RepoPatchV1 prim wA wB -> RepoPatchV1 prim wA wC -> EqCheck wB wC # (=/\=) :: RepoPatchV1 prim wA wC -> RepoPatchV1 prim wB wC -> EqCheck wA wB #
Eq2 prim => Eq (RepoPatchV1 prim wX wY) # |
Instance details Methods (==) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool # (/=) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool #