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

Safe HaskellNone
LanguageHaskell2010

Darcs.Repository

Contents

Synopsis

Documentation

data Repository (rt :: RepoType) (p :: * -> * -> *) wRecordedstate wUnrecordedstate wTentativestate Source #

A Repository is a token representing the state of a repository on disk. It is parameterized by the patch type in the repository, and witnesses for the recorded state of the repository (i.e. what darcs get would retrieve), the unrecorded state (what's in the working directory now), and the tentative state, which represents work in progress that will eventually become the new recorded state unless something goes wrong.

Instances

Show (Repository rt p wRecordedstate wUnrecordedstate wTentativestate) Source # 

Methods

showsPrec :: Int -> Repository rt p wRecordedstate wUnrecordedstate wTentativestate -> ShowS #

show :: Repository rt p wRecordedstate wUnrecordedstate wTentativestate -> String #

showList :: [Repository rt p wRecordedstate wUnrecordedstate wTentativestate] -> ShowS #

repoLocation :: Repository rt p wR wU wT -> String Source #

repoCache :: Repository rt p wR wU wT -> Cache Source #

newtype Cache Source #

Cache is an abstract type for hiding the underlying cache locations

Constructors

Ca [CacheLoc] 

Instances

data RepoJob a Source #

A RepoJob wraps up an action to be performed with a repository. Because repositories can contain different types of patches, such actions typically need to be polymorphic in the kind of patch they work on. RepoJob is used to wrap up the polymorphism, and the various functions that act on a RepoJob are responsible for instantiating the underlying action with the appropriate patch type.

Constructors

RepoJob (forall rt p wR wU. (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wR -> IO a)

The most common RepoJob; the underlying action can accept any patch type that a darcs repository may use.

V1Job (forall wR wU. Repository (RepoType NoRebase) (RepoPatchV1 Prim) wR wU wR -> IO a)

A job that only works on darcs 1 patches

V2Job (forall rt wR wU. IsRepoType rt => Repository rt (RepoPatchV2 Prim) wR wU wR -> IO a)

A job that only works on darcs 2 patches

PrimV1Job (forall rt p wR wU. (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree, IsPrimV1 (PrimOf p)) => Repository rt p wR wU wR -> IO a)

A job that works on any repository where the patch type p has PrimOf p = Prim.

This was added to support darcsden, which inspects the internals of V1 prim patches.

In future this should be replaced with a more abstract inspection API as part of PrimPatch.

RebaseAwareJob RebaseJobFlags (forall rt p wR wU. (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wR -> IO a) 
RebaseJob RebaseJobFlags (forall p wR wU. (RepoPatch p, ApplyState p ~ Tree) => Repository (RepoType IsRebase) p wR wU wR -> IO a) 
StartRebaseJob RebaseJobFlags (forall p wR wU. (RepoPatch p, ApplyState p ~ Tree) => Repository (RepoType IsRebase) p wR wU wR -> IO a) 

maybeIdentifyRepository :: UseCache -> String -> IO (IdentifyRepo rt p wR wU wT) Source #

Tries to identify the repository in a given directory

identifyRepositoryFor :: forall rt p wR wU wT vR vU vT. Repository rt p wR wU wT -> UseCache -> String -> IO (Repository rt p vR vU vT) Source #

identifyRepositoryFor repo url identifies (and returns) the repo at url, but fails if it is not compatible for reading from and writing to.

withRecorded :: Repository rt p wR wU wT -> ((AbsolutePath -> IO a) -> IO a) -> (AbsolutePath -> IO a) -> IO a Source #

withRepoLock :: DryRun -> UseCache -> UpdateWorking -> UMask -> RepoJob a -> IO a Source #

apply a given RepoJob to a repository in the current working directory, taking a lock

withRepoLockCanFail :: UseCache -> RepoJob () -> IO () Source #

Apply a given RepoJob to a repository in the current working directory, taking a lock. If lock not takeable, do nothing. If old-fashioned repository, do nothing. The job must not touch pending or pending.tentative, because there is no call to revertRepositoryChanges. This entry point is currently only used for attemptCreatePatchIndex.

withRepository :: UseCache -> RepoJob a -> IO a Source #

apply a given RepoJob to a repository in the current working directory

withRepositoryLocation :: UseCache -> String -> RepoJob a -> IO a Source #

apply a given RepoJob to a repository in a given url

writePatchSet :: (IsRepoType rt, RepoPatch p) => PatchSet rt p Origin wX -> UseCache -> IO (Repository rt p wR wU wT) Source #

writePatchSet is like patchSetToRepository, except that it doesn't touch the working directory or pristine cache.

replacePristine :: Repository rt p wR wU wT -> Tree IO -> IO () Source #

Replace the existing pristine with a new one (loaded up in a Tree object).

readRepo :: (IsRepoType rt, RepoPatch p) => Repository rt p wR wU wT -> IO (PatchSet rt p Origin wR) Source #

repoPatchType :: Repository rt p wR wU wT -> PatchType rt p Source #

addToPending :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> UpdateWorking -> FL (PrimOf p) wU wY -> IO () Source #

Add an FL of patches starting from the working state to the pending patch, including as much extra context as is necessary (context meaning dependencies), by commuting the patches to be added past as much of the changes between pending and working as is possible, and including anything that doesn't commute, and the patch itself in the new pending patch.

addPendingDiffToPending :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> UpdateWorking -> FreeLeft (FL (PrimOf p)) -> IO () Source #

Add an FL of patches started from the pending state to the pending patch. TODO: add witnesses for pending so we can make the types precise: currently the passed patch can be applied in any context, not just after pending.

tentativelyAddPatch :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> Compression -> Verbosity -> UpdateWorking -> PatchInfoAnd rt p wT wY -> IO (Repository rt p wR wU wY) Source #

tentativelyRemovePatches :: (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> Compression -> UpdateWorking -> FL (PatchInfoAnd rt p) wX wT -> IO (Repository rt p wR wU wX) Source #

tentativelyAddToPending :: forall rt p wR wU wT wX wY. RepoPatch p => Repository rt p wR wU wT -> UpdateWorking -> FL (PrimOf p) wX wY -> IO () Source #

tentativelyAddToPending repo NoDryRun YesUpdateWorking pend ps appends ps to the pending patch.

It has no effect with NoUpdateWorking.

This fuction is unsafe because it accepts a patch that works on the tentative pending and we don't currently track the state of the tentative pending.

readTentativeRepo :: (IsRepoType rt, RepoPatch p) => Repository rt p wR wU wT -> String -> IO (PatchSet rt p Origin wT) Source #

readRepo returns the tentative repo patchset.

data RebaseJobFlags Source #

Some common flags that are needed to run rebase jobs. Normally flags are captured directly by the implementation of the specific job's function, but the rebase infrastructure needs to do work on the repository directly that sometimes needs these options, so they have to be passed as part of the job definition.

withManualRebaseUpdate :: forall rt p x wR wU wT1 wT2. (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree) => RebaseJobFlags -> Repository rt p wR wU wT1 -> (Repository rt p wR wU wT1 -> IO (Repository rt p wR wU wT2, FL (RebaseFixup p) wT2 wT1, x)) -> IO (Repository rt p wR wU wT2, x) Source #

revertRepositoryChanges :: RepoPatch p => Repository rt p wR wU wT -> UpdateWorking -> IO () Source #

Slightly confusingly named: as well as throwing away any tentative changes, revertRepositoryChanges also re-initialises the tentative state. It's therefore used before makign any changes to the repo. So the type should rather be

... -> Repo rt p wR wU wT -> IO (Repo rt p wR wU wR)

unrevertUrl :: Repository rt p wR wU wT -> String Source #

applyToWorking :: (ApplyState p ~ Tree, RepoPatch p) => Repository rt p wR wU wT -> Verbosity -> FL (PrimOf p) wU wY -> IO (Repository rt p wR wY wT) Source #

createPristineDirectoryTree :: Repository rt p wR wU wT -> FilePath -> WithWorkingDir -> IO () Source #

grab the pristine hash of _darcs/hash_inventory, and retrieve whole pristine tree, possibly writing a clean working copy in the process.

createPartialsPristineDirectoryTree :: FilePathLike fp => Repository rt p wR wU wT -> [fp] -> FilePath -> IO () Source #

Used by the commands dist and diff

reorderInventory :: (IsRepoType rt, RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wR -> Compression -> UpdateWorking -> Verbosity -> IO () Source #

Writes out a fresh copy of the inventory that minimizes the amount of inventory that need be downloaded when people pull from the repository.

Specifically, it breaks up the inventory on the most recent tag. This speeds up most commands when run remotely, both because a smaller file needs to be transfered (only the most recent inventory). It also gives a guarantee that all the patches prior to a given tag are included in that tag, so less commutation and history traversal is needed. This latter issue can become very important in large repositories.

cleanRepository :: Repository rt p wR wU wT -> IO () Source #

data PatchSet rt p wStart wY Source #

The patches in a repository are stored in chunks broken up at "clean" tags. A tag is clean if the only patches before it in the current repository ordering are ones that the tag depends on (either directly or indirectly). Each chunk is stored in a separate inventory file on disk.

A PatchSet represents a repo's history as the list of patches since the last clean tag, and then a list of patch lists each delimited by clean tags.

Instances

Show2 p => Show2 (PatchSet rt p) Source # 

Methods

showDict2 :: ShowDict (PatchSet rt p wX wY) Source #

Show2 p => Show1 (PatchSet rt p wStart) Source # 

Methods

showDict1 :: ShowDict (PatchSet rt p wStart wX) Source #

Show2 p => Show (PatchSet rt p wStart wY) Source # 

Methods

showsPrec :: Int -> PatchSet rt p wStart wY -> ShowS #

show :: PatchSet rt p wStart wY -> String #

showList :: [PatchSet rt p wStart wY] -> ShowS #

type SealedPatchSet rt p wStart = Sealed (PatchSet rt p wStart) Source #

data PatchInfoAnd rt p wA wB Source #

PatchInfoAnd p wA wB represents a hope we have to get a patch through its info. We're not sure we have the patch, but we know its info.

Instances

PatchListFormat (PatchInfoAnd rt p) Source # 
Eq2 (PatchInfoAnd rt p) Source # 

Methods

unsafeCompare :: PatchInfoAnd rt p wA wB -> PatchInfoAnd rt p wC wD -> Bool Source #

(=\/=) :: PatchInfoAnd rt p wA wB -> PatchInfoAnd rt p wA wC -> EqCheck wB wC Source #

(=/\=) :: PatchInfoAnd rt p wA wC -> PatchInfoAnd rt p wB wC -> EqCheck wA wB Source #

Show2 p => Show2 (PatchInfoAnd rt p) Source # 

Methods

showDict2 :: ShowDict (PatchInfoAnd rt p wX wY) Source #

Invert p => Invert (PatchInfoAnd rt p) Source # 

Methods

invert :: PatchInfoAnd rt p wX wY -> PatchInfoAnd rt p wY wX Source #

PatchInspect p => PatchInspect (PatchInfoAnd rt p) Source # 

Methods

listTouchedFiles :: PatchInfoAnd rt p wX wY -> [FilePath] Source #

hunkMatches :: (ByteString -> Bool) -> PatchInfoAnd rt p wX wY -> Bool Source #

PatchDebug p => PatchDebug (PatchInfoAnd rt p) Source # 

Methods

patchDebugDummy :: PatchInfoAnd rt p wX wY -> () Source #

Commute p => Commute (PatchInfoAnd rt p) Source # 

Methods

commute :: (PatchInfoAnd rt p :> PatchInfoAnd rt p) wX wY -> Maybe ((PatchInfoAnd rt p :> PatchInfoAnd rt p) wX wY) Source #

Merge p => Merge (PatchInfoAnd rt p) Source # 

Methods

merge :: (PatchInfoAnd rt p :\/: PatchInfoAnd rt p) wX wY -> (PatchInfoAnd rt p :/\: PatchInfoAnd rt p) wX wY Source #

(ReadPatch p, PatchListFormat p, PrimPatchBase p, Effect p, FromPrim p, IsRepoType rt) => ReadPatch (PatchInfoAnd rt p) Source # 

Methods

readPatch' :: ParserM m => m (Sealed (PatchInfoAnd rt p wX)) Source #

Apply p => Apply (PatchInfoAnd rt p) Source # 

Associated Types

type ApplyState (PatchInfoAnd rt p :: * -> * -> *) :: (* -> *) -> * Source #

Methods

apply :: ApplyMonad (ApplyState (PatchInfoAnd rt p)) m => PatchInfoAnd rt p wX wY -> m () Source #

(Apply p, Conflict p, CommuteNoConflicts p, IsHunk p, PatchListFormat p, PrimPatchBase p, ShowPatch p, (~) ((* -> *) -> *) (ApplyState p) Tree) => ShowPatch (PatchInfoAnd rt p) Source # 

Methods

showNicely :: PatchInfoAnd rt p wX wY -> Doc Source #

description :: PatchInfoAnd rt p wX wY -> Doc Source #

summary :: PatchInfoAnd rt p wX wY -> Doc Source #

summaryFL :: FL (PatchInfoAnd rt p) wX wY -> Doc Source #

thing :: PatchInfoAnd rt p wX wY -> String Source #

things :: PatchInfoAnd rt p wX wY -> String Source #

(Apply p, IsHunk p, PatchListFormat p, PrimPatchBase p, ShowContextPatch p) => ShowContextPatch (PatchInfoAnd rt p) Source # 
(PatchListFormat p, ShowPatchBasic p) => ShowPatchBasic (PatchInfoAnd rt p) Source # 

Methods

showPatch :: ShowPatchFor -> PatchInfoAnd rt p wX wY -> Doc Source #

IsHunk (PatchInfoAnd rt p) Source # 

Methods

isHunk :: PatchInfoAnd rt p wX wY -> Maybe (FileHunk wX wY) Source #

RepairToFL p => Repair (PatchInfoAnd rt p) Source # 

Methods

applyAndTryToFix :: ApplyMonad (ApplyState (PatchInfoAnd rt p)) m => PatchInfoAnd rt p wX wY -> m (Maybe (String, PatchInfoAnd rt p wX wY)) Source #

PrimPatchBase p => PrimPatchBase (PatchInfoAnd rt p) Source # 

Associated Types

type PrimOf (PatchInfoAnd rt p :: * -> * -> *) :: * -> * -> * Source #

Effect p => Effect (PatchInfoAnd rt p) Source # 

Methods

effect :: PatchInfoAnd rt p wX wY -> FL (PrimOf (PatchInfoAnd rt p)) wX wY Source #

effectRL :: PatchInfoAnd rt p wX wY -> RL (PrimOf (PatchInfoAnd rt p)) wX wY Source #

Annotate p => Annotate (PatchInfoAnd rt p) Source # 

Methods

annotate :: PatchInfoAnd rt p wX wY -> AnnotatedM () Source #

Show2 p => Show1 (PatchInfoAnd rt p wX) Source # 

Methods

showDict1 :: ShowDict (PatchInfoAnd rt p wX wX) Source #

Show2 p => Show (PatchInfoAnd rt p wA wB) Source # 

Methods

showsPrec :: Int -> PatchInfoAnd rt p wA wB -> ShowS #

show :: PatchInfoAnd rt p wA wB -> String #

showList :: [PatchInfoAnd rt p wA wB] -> ShowS #

type ApplyState (PatchInfoAnd rt p) Source # 
type PrimOf (PatchInfoAnd rt p) Source # 
type PrimOf (PatchInfoAnd rt p) = PrimOf p

modifyCache :: forall rt p wR wU wT. Repository rt p wR wU wT -> (Cache -> Cache) -> Repository rt p wR wU wT Source #

modifyCache repository function modifies the cache of repository with function, remove duplicates and sort the results with compareByLocality.

reportBadSources :: IO () Source #

Prints an error message with a list of bad caches.

Recorded and unrecorded and pending.

readRecorded :: Repository rt p wR wU wT -> IO (Tree IO) Source #

Obtains a Tree corresponding to the "recorded" state of the repository: this is the same as the pristine cache, which is the same as the result of applying all the repository's patches to an empty directory.

readUnrecorded :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> Maybe [SubPath] -> IO (Tree IO) Source #

Obtains a Tree corresponding to the "unrecorded" state of the repository: the modified files of the working tree plus the "pending" patch. The optional list of paths allows to restrict the query to a subtree.

Limiting the query may be more efficient, since hashes on the uninteresting parts of the index do not need to go through an up-to-date check (which involves a relatively expensive lstat(2) per file.

unrecordedChanges :: (RepoPatch p, ApplyState p ~ Tree) => (UseIndex, ScanKnown, DiffAlgorithm) -> LookForMoves -> LookForReplaces -> Repository rt p wR wU wT -> Maybe [SubPath] -> IO (FL (PrimOf p) wT wU) Source #

For a repository and an optional list of paths (when Nothing, take everything) compute a (forward) list of prims (i.e. a patch) going from the recorded state of the repository (pristine) to the unrecorded state of the repository (the working copy + pending). When a list of paths is given, at least the files that live under any of these paths in either recorded or unrecorded will be included in the resulting patch. NB. More patches may be included in this list, eg. the full contents of the pending patch. This is usually not a problem, since selectChanges will properly filter the results anyway.

This also depends on the options given:

  • -look-for-moves: Detect pending file moves using the index. The resulting patches are added to pending and taken into consideration, when filtering the tree according to the given path list.
  • -look-for-adds: Include files in the working state that do not exist in the recorded + pending state.
  • -include-boring: Include even boring files.
  • -look-for-replaces: Detect pending replace patches. Like detected moves, these are added to the pending patch. Note that, like detected moves, these are mere proposals for the user to consider or reject.
  • -ignore-times: Disables index usage completely -- for each file, we read both the unrecorded and the recorded copy and run a diff on them. This is very inefficient, although in extremely rare cases, the index could go out of sync (file is modified, index is updated and file is modified again within a single second).

Note that use of the index is also disabled when we detect moves or replaces, since this implies that the index is out of date.

filterOutConflicts Source #

Arguments

:: (RepoPatch p, ApplyState p ~ Tree) 
=> RL (PatchInfoAnd rt p) wX wT

Recorded patches from repository, starting from same context as the patches to filter

-> Repository rt p wR wU wT

Repository itself, used for grabbing unrecorded changes

-> FL (PatchInfoAnd rt p) wX wZ

Patches to filter

-> IO (Bool, Sealed (FL (PatchInfoAnd rt p) wX))

True iff any patches were removed, possibly filtered patches

Remove any patches (+dependencies) from a sequence that conflict with the recorded or unrecorded changes in a repo

readPending :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> IO (Tree IO, Sealed (FL (PrimOf p) wT)) Source #

Obtains the recorded Tree with the pending patch applied, plus the pending patch itself. The pending patch should start at the recorded state (we even verify that it applies, and degrade to renaming pending and starting afresh if it doesn't), but we've set to say it starts at the tentative state.

Question (Eric Kow) Is this a bug? Darcs.Repository.Pending.readPending says it is

readRecordedAndPending :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> IO (Tree IO) Source #

Obtains the recorded Tree with the pending patch applied.

Index.

readIndex :: (RepoPatch p, ApplyState p ~ Tree) => Repository rt p wR wU wT -> IO Index Source #

invalidateIndex :: t -> IO () Source #

Mark the existing index as invalid. This has to be called whenever the listing of pristine changes and will cause darcs to update the index next time it tries to read it. (NB. This is about files added and removed from pristine: changes to file content in either pristine or working are handled transparently by the index reading code.)