diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-27 11:45:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-27 11:45:13 -0400 |
| commit | d76362a5986f004a61ed5484f95a592e33ef5e43 (patch) | |
| tree | b1b55e8a13efddf3aa1d24c3002071c4ced857c6 /Logs/SingleValue.hs | |
| parent | e184360d5d2225b50117b0deddb28c0537dfb181 (diff) | |
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.
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.
Diffstat (limited to 'Logs/SingleValue.hs')
| -rw-r--r-- | Logs/SingleValue.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Logs/SingleValue.hs b/Logs/SingleValue.hs index 9b1306c98..201e205eb 100644 --- a/Logs/SingleValue.hs +++ b/Logs/SingleValue.hs @@ -16,6 +16,7 @@ module Logs.SingleValue where import Annex.Common import qualified Annex.Branch import Logs.TimeStamp +import Logs.Line import qualified Data.Set as S import Data.Time.Clock.POSIX @@ -37,7 +38,7 @@ showLog = unlines . map showline . S.toList showline (LogEntry t v) = unwords [show t, serialize v] parseLog :: (Ord v, SingleValueSerializable v) => String -> Log v -parseLog = S.fromList . mapMaybe parse . lines +parseLog = S.fromList . mapMaybe parse . splitLines where parse line = do let (ts, s) = splitword line |