From 838b984797ea875109de9cadaae2149cee210bcc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 May 2013 15:37:32 -0500 Subject: [PATCH] deal with dos path separators --- Annex/Journal.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 Annex/Journal.hs diff --git a/Annex/Journal.hs b/Annex/Journal.hs old mode 100644 new mode 100755 index f86d03cf6d..9f4d295996 --- a/Annex/Journal.hs +++ b/Annex/Journal.hs @@ -66,14 +66,16 @@ journalDirty = not . null <$> getJournalFiles journalFile :: FilePath -> Git.Repo -> FilePath journalFile file repo = gitAnnexJournalDir repo concatMap mangle file where - mangle '/' = "_" - mangle '_' = "__" - mangle c = [c] + mangle c + | c == pathSeparator = "_" + | c == '_' = '__' + | otherwise = c {- Converts a journal file (relative to the journal dir) back to the - filename on the branch. -} fileJournal :: FilePath -> FilePath -fileJournal = replace "//" "_" . replace "_" "/" +fileJournal = replace [pathSeparator, pathSeparator] "_" . + replace "_" [pathSeparator] {- Runs an action that modifies the journal, using locking to avoid - contention with other git-annex processes. -}