Darcs.Patch.Rebase.Change

Documentation

data RebaseChange prim wX wY where

Constructors

RC :: FL (RebaseFixup prim) wX wY -> Named prim wY wZ -> RebaseChange prim wX wZ

Instances

PatchListFormat (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

patchListFormat :: ListFormat (RebaseChange prim)

Show2 prim => Show2 (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

showDict2 :: ShowDict (RebaseChange prim wX wY)

PatchDebug prim => PatchDebug (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

patchDebugDummy :: RebaseChange prim wX wY -> ()

Commute prim => Commute (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

commute :: (RebaseChange prim :> RebaseChange prim) wX wY -> Maybe ((RebaseChange prim :> RebaseChange prim) wX wY)

PatchInspect prim => PatchInspect (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

listTouchedFiles :: RebaseChange prim wX wY -> [AnchoredPath]

hunkMatches :: (ByteString -> Bool) -> RebaseChange prim wX wY -> Bool

Apply prim => Apply (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Associated Types

type ApplyState (RebaseChange prim) :: (Type -> Type) -> Type

Methods

apply :: ApplyMonad (ApplyState (RebaseChange prim)) m => RebaseChange prim wX wY -> m ()

unapply :: ApplyMonad (ApplyState (RebaseChange prim)) m => RebaseChange prim wX wY -> m ()

PrimPatch prim => ShowPatch (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

content :: RebaseChange prim wX wY -> Doc

description :: RebaseChange prim wX wY -> Doc

summary :: RebaseChange prim wX wY -> Doc

summaryFL :: FL (RebaseChange prim) wX wY -> Doc

thing :: RebaseChange prim wX wY -> String

things :: RebaseChange prim wX wY -> String

(ShowPatchBasic prim, Invert prim, PatchListFormat prim) => ShowContextPatch (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

showContextPatch :: ApplyMonad (ApplyState (RebaseChange prim)) m => ShowPatchFor -> RebaseChange prim wX wY -> m Doc

(ShowPatchBasic prim, Invert prim, PatchListFormat prim) => ShowPatchBasic (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

showPatch :: ShowPatchFor -> RebaseChange prim wX wY -> Doc

Ident (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

ident :: RebaseChange prim wX wY -> PatchId (RebaseChange prim)

IsHunk (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

isHunk :: RebaseChange prim wX wY -> Maybe (FileHunk wX wY)

(ReadPatch prim, PatchListFormat prim) => ReadPatch (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

readPatch' :: Parser (Sealed (RebaseChange prim wX))

PrimPatch prim => PrimPatchBase (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Associated Types

type PrimOf (RebaseChange prim) :: Type -> Type -> Type

Commute prim => Summary (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

conflictedEffect :: RebaseChange prim wX wY -> [IsConflictedPrim (PrimOf (RebaseChange prim))]

HasDeps (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

Methods

getdeps :: RebaseChange prim wX wY -> [PatchInfo]

Show2 prim => Show1 (RebaseChange prim wX)

Defined in Darcs.Patch.Rebase.Change

Methods

showDict1 :: Dict (Show (RebaseChange prim wX wX0))

Show2 prim => Show (RebaseChange prim wX wY)

Defined in Darcs.Patch.Rebase.Change

Methods

showsPrec :: Int -> RebaseChange prim wX wY -> ShowS

show :: RebaseChange prim wX wY -> String

showList :: [RebaseChange prim wX wY] -> ShowS

type ApplyState (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

type ApplyState (RebaseChange prim) = ApplyState prim

type PatchId (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

type PatchId (RebaseChange prim) = PatchInfo

type PrimOf (RebaseChange prim)

Defined in Darcs.Patch.Rebase.Change

type PrimOf (RebaseChange prim) = prim

toRebaseChanges :: FL (RebaseChange prim) wX wY -> FL (PatchInfoAndG ('RepoType 'IsRebase) (RebaseChange prim)) wX wY

extractRebaseChange :: forall p wX wY. RepoPatch p => DiffAlgorithm -> FL (RebaseChange (PrimOf p)) wX wY -> (FL (WDDNamed p) :> FL (RebaseFixup (PrimOf p))) wX wY

Turn a selected rebase patch back into a patch we can apply to the main repository, together with residual fixups that need to go back into the rebase state (unless the rebase is now finished). Any fixups associated with the patch will turn into conflicts.

reifyRebaseChange :: FromPrim p => String -> FL (RebaseChange (PrimOf p)) wX wY -> IO ((FL (WDDNamed p) :> FL (RebaseFixup (PrimOf p))) wX wY)

Like extractRebaseChange, but any fixups are "reified" into a separate patch.

partitionUnconflicted :: Commute prim => FL (RebaseChange prim) wX wY -> (FL (RebaseChange prim) :> RL (RebaseChange prim)) wX wY

Split a list of rebase patches into those that will have conflicts if unsuspended and those that won't.

rcToPia :: RebaseChange prim wX wY -> Sealed2 (PatchInfoAnd ('RepoType 'NoRebase) prim)

Get hold of the Named patch inside a RebaseChange and wrap it in a PatchInfoAnd.

data WithDroppedDeps p wX wY

A patch, together with a list of patch names that it used to depend on, but were lost during the rebasing process. The UI can use this information to report them to the user.

Constructors

WithDroppedDeps

Fields

• wddPatch :: p wX wY
• wddDependedOn :: [PatchInfo]

Instances

PrimPatchBase p => PrimPatchBase (WithDroppedDeps p)

Defined in Darcs.Patch.Rebase.Change

Associated Types

type PrimOf (WithDroppedDeps p) :: Type -> Type -> Type

Effect p => Effect (WithDroppedDeps p)

Defined in Darcs.Patch.Rebase.Change

Methods

effect :: WithDroppedDeps p wX wY -> FL (PrimOf (WithDroppedDeps p)) wX wY

type PrimOf (WithDroppedDeps p)

Defined in Darcs.Patch.Rebase.Change

type PrimOf (WithDroppedDeps p) = PrimOf p

type WDDNamed p = WithDroppedDeps (Named p)

commuterIdWDD :: CommuteFn p q -> CommuteFn p (WithDroppedDeps q)

simplifyPush :: PrimPatch prim => DiffAlgorithm -> RebaseFixup prim wX wY -> FL (RebaseChange prim) wY wZ -> Sealed (FL (RebaseChange prim) wX)

Given a list of rebase items, try to push a new fixup as far as possible into the list as possible, using both commutation and coalescing. If the fixup commutes past all the ToEdit patches then it is dropped entirely.

simplifyPushes :: PrimPatch prim => DiffAlgorithm -> FL (RebaseFixup prim) wX wY -> FL (RebaseChange prim) wY wZ -> Sealed (FL (RebaseChange prim) wX)

Like simplifyPush but for a list of fixups.

addNamedToRebase :: RepoPatch p => DiffAlgorithm -> Named p wX wY -> FL (RebaseChange (PrimOf p)) wY wZ -> Sealed (FL (RebaseChange (PrimOf p)) wX)