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

Split lines in the git-annex branch on \r as well as \n, to deal with \r\n terminated lines written by some versions of git-annex on Windows.

Browse source 
This fixes strange displays in some cases, including whereis showing
many duplicate locations, and showing more total copies than actually
exist.

It's unknown if that lead to data loss when eg, dropping. At the moment,
it seems unlikely it could, since the UUID with \r's appended is not the
same as a UUID without, and so no remote matches it.

It's also unknown if \r's can leak in on windows, perhaps when merging the
git-annex branch.
This commit is contained in:
Joey Hess 2016-05-27 11:45:13 -04:00
parent f4db181d9b
commit eba68572dc
Failed to extract signature
9 changed files with 106 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Logs/MapLog.hs
View file

@ -18,6 +18,7 @@ import Data.Time.Clock.POSIX
import Common
import Logs.TimeStamp
import Logs.Line
data TimeStamp = Unknown | Date POSIXTime
deriving (Eq, Ord, Show)
@ -38,7 +39,7 @@ showMapLog fieldshower valueshower = unlines . map showpair . M.toList
unwords ["0", fieldshower f, valueshower v]
parseMapLog :: Ord f => (String -> Maybe f) -> (String -> Maybe v) -> String -> MapLog f v
parseMapLog fieldparser valueparser = M.fromListWith best . mapMaybe parse . lines
parseMapLog fieldparser valueparser = M.fromListWith best . mapMaybe parse . splitLines
where
parse line = do
let (ts, rest) = splitword line