move a file location to Locations.hs
This commit is contained in:
parent
bf6a3b757a
commit
0ba4b1de18
2 changed files with 6 additions and 5 deletions
|
@ -43,10 +43,6 @@ fullname = Git.Ref $ "refs/heads/" ++ show name
|
||||||
originname :: Git.Ref
|
originname :: Git.Ref
|
||||||
originname = Git.Ref $ "origin/" ++ show name
|
originname = Git.Ref $ "origin/" ++ show name
|
||||||
|
|
||||||
{- A separate index file for the branch. -}
|
|
||||||
index :: Git.Repo -> FilePath
|
|
||||||
index g = gitAnnexDir g </> "index"
|
|
||||||
|
|
||||||
{- Populates the branch's index file with the current branch contents.
|
{- Populates the branch's index file with the current branch contents.
|
||||||
-
|
-
|
||||||
- Usually, this is only done when the index doesn't yet exist, and
|
- Usually, this is only done when the index doesn't yet exist, and
|
||||||
|
@ -62,7 +58,7 @@ withIndex :: Annex a -> Annex a
|
||||||
withIndex = withIndex' False
|
withIndex = withIndex' False
|
||||||
withIndex' :: Bool -> Annex a -> Annex a
|
withIndex' :: Bool -> Annex a -> Annex a
|
||||||
withIndex' bootstrapping a = do
|
withIndex' bootstrapping a = do
|
||||||
f <- fromRepo index
|
f <- fromRepo gitAnnexIndex
|
||||||
bracketIO (Git.useIndex f) id $ do
|
bracketIO (Git.useIndex f) id $ do
|
||||||
unlessM (liftIO $ doesFileExist f) $ do
|
unlessM (liftIO $ doesFileExist f) $ do
|
||||||
unless bootstrapping create
|
unless bootstrapping create
|
||||||
|
|
|
@ -20,6 +20,7 @@ module Locations (
|
||||||
gitAnnexUnusedLog,
|
gitAnnexUnusedLog,
|
||||||
gitAnnexJournalDir,
|
gitAnnexJournalDir,
|
||||||
gitAnnexJournalLock,
|
gitAnnexJournalLock,
|
||||||
|
gitAnnexIndex,
|
||||||
isLinkToAnnex,
|
isLinkToAnnex,
|
||||||
annexHashes,
|
annexHashes,
|
||||||
hashDirMixed,
|
hashDirMixed,
|
||||||
|
@ -131,6 +132,10 @@ gitAnnexJournalDir r = addTrailingPathSeparator $ gitAnnexDir r </> "journal"
|
||||||
gitAnnexJournalLock :: Git.Repo -> FilePath
|
gitAnnexJournalLock :: Git.Repo -> FilePath
|
||||||
gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck"
|
gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck"
|
||||||
|
|
||||||
|
{- .git/annex/index is used to stage changes to the git-annex branch -}
|
||||||
|
gitAnnexIndex :: Git.Repo -> FilePath
|
||||||
|
gitAnnexIndex r = gitAnnexDir r </> "index"
|
||||||
|
|
||||||
{- Checks a symlink target to see if it appears to point to annexed content. -}
|
{- Checks a symlink target to see if it appears to point to annexed content. -}
|
||||||
isLinkToAnnex :: FilePath -> Bool
|
isLinkToAnnex :: FilePath -> Bool
|
||||||
isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s
|
isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s
|
||||||
|
|
Loading…
Reference in a new issue