mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove now redundant function

Browse source
This commit is contained in:
Joey Hess 2021-04-20 12:42:57 -04:00
parent 752c389849
commit c30557594e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Journal.hs
View file

@ -106,7 +106,7 @@ journalDirty = do
- in the journal directory. - in the journal directory.
-} -}
journalFile :: RawFilePath -> Git.Repo -> RawFilePath journalFile :: RawFilePath -> Git.Repo -> RawFilePath
journalFile file repo = gitAnnexJournalDir' repo P.</> S.concatMap mangle file journalFile file repo = gitAnnexJournalDir repo P.</> S.concatMap mangle file
where where
mangle c mangle c
| P.isPathSeparator c = S.singleton underscore | P.isPathSeparator c = S.singleton underscore

5
Annex/Locations.hs
View file

@ -63,7 +63,6 @@ module Annex.Locations (
gitAnnexFeedState, gitAnnexFeedState,
gitAnnexMergeDir, gitAnnexMergeDir,
gitAnnexJournalDir, gitAnnexJournalDir,
gitAnnexJournalDir',
gitAnnexJournalLock, gitAnnexJournalLock,
gitAnnexGitQueueLock, gitAnnexGitQueueLock,
gitAnnexIndex, gitAnnexIndex,
@ -432,10 +431,6 @@ gitAnnexJournalDir :: Git.Repo -> RawFilePath
gitAnnexJournalDir r = gitAnnexJournalDir r =
P.addTrailingPathSeparator $ gitAnnexDir r P.</> "journal" P.addTrailingPathSeparator $ gitAnnexDir r P.</> "journal"
gitAnnexJournalDir' :: Git.Repo -> RawFilePath
gitAnnexJournalDir' r =
P.addTrailingPathSeparator $ gitAnnexDir r P.</> "journal"
{- Lock file for the journal. -} {- Lock file for the journal. -}
gitAnnexJournalLock :: Git.Repo -> RawFilePath gitAnnexJournalLock :: Git.Repo -> RawFilePath
gitAnnexJournalLock r = gitAnnexDir r P.</> "journal.lck" gitAnnexJournalLock r = gitAnnexDir r P.</> "journal.lck"