darcs-2.12.5: 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 :: PrimPatch prim => String -> RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wZ -> Sealed (RepoPatchV1 prim wY)
- unravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wX)]
- publicUnravel :: PrimPatch prim => RepoPatchV1 prim wX wY -> [Sealed (FL prim wY)]

# Documentation

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

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

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

# Orphan instances

MyEq prim => MyEq (RepoPatchV1 prim) # |
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 #
PrimPatch prim => Commute (RepoPatchV1 prim) # |
Methods commute :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) #
PrimPatch prim => PatchInspect (RepoPatchV1 prim) # |
Methods listTouchedFiles :: RepoPatchV1 prim wX wY -> [FilePath] # hunkMatches :: (ByteString -> Bool) -> RepoPatchV1 prim wX wY -> Bool #
Invert prim => Invert (RepoPatchV1 prim) # |
Methods invert :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wY wX #
PrimPatch prim => Merge (RepoPatchV1 prim) # |
Methods merge :: (RepoPatchV1 prim :\/: RepoPatchV1 prim) wX wY -> (RepoPatchV1 prim :/\: RepoPatchV1 prim) wX wY #
IsHunk prim => IsHunk (RepoPatchV1 prim) # |
Methods isHunk :: RepoPatchV1 prim wX wY -> Maybe (FileHunk wX wY) #
PrimPatch prim => Effect (RepoPatchV1 prim) # |
Methods effect :: RepoPatchV1 prim wX wY -> FL (PrimOf (RepoPatchV1 prim)) wX wY # effectRL :: RepoPatchV1 prim wX wY -> RL (PrimOf (RepoPatchV1 prim)) wX wY #
PrimPatch prim => CommuteNoConflicts (RepoPatchV1 prim) # |
Methods commuteNoConflicts :: (RepoPatchV1 prim :> RepoPatchV1 prim) wX wY -> Maybe ((RepoPatchV1 prim :> RepoPatchV1 prim) wX wY) #
PrimPatch prim => Conflict (RepoPatchV1 prim) # |
Methods resolveConflicts :: RepoPatchV1 prim wX wY -> [[Sealed (FL (PrimOf (RepoPatchV1 prim)) wY)]] # conflictedEffect :: RepoPatchV1 prim wX wY -> [IsConflictedPrim (PrimOf (RepoPatchV1 prim))] #
MyEq prim => Eq (RepoPatchV1 prim wX wY) # |
Methods (==) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool # (/=) :: RepoPatchV1 prim wX wY -> RepoPatchV1 prim wX wY -> Bool #