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

deal with dos path separators

Browse source
This commit is contained in:
Joey Hess 2013-05-12 15:37:32 -05:00
commit 838b984797
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Annex/Journal.hs Normal file → Executable file
View file

@ -66,14 +66,16 @@ journalDirty = not . null <$> getJournalFiles
journalFile :: FilePath -> Git.Repo -> FilePath journalFile :: FilePath -> Git.Repo -> FilePath
journalFile file repo = gitAnnexJournalDir repo </> concatMap mangle file journalFile file repo = gitAnnexJournalDir repo </> concatMap mangle file
where where
mangle '/' = "_" mangle c
mangle '_' = "__" | c == pathSeparator = "_"
mangle c = [c] | c == '_' = '__'
| otherwise = c
{- Converts a journal file (relative to the journal dir) back to the {- Converts a journal file (relative to the journal dir) back to the
- filename on the branch. -} - filename on the branch. -}
fileJournal :: FilePath -> FilePath fileJournal :: FilePath -> FilePath
fileJournal = replace "//" "_" . replace "_" "/" fileJournal = replace [pathSeparator, pathSeparator] "_" .
replace "_" [pathSeparator]
{- Runs an action that modifies the journal, using locking to avoid {- Runs an action that modifies the journal, using locking to avoid
- contention with other git-annex processes. -} - contention with other git-annex processes. -}