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

escape slashes in annex pointer files

Browse source 
The problem with having the slashes unescaped is, it broke parsing, since
the parser takes the filename to get the part containing the key.
That particularly affected URL keys.

This makes the format be the same as symlinks point to, which keeps things
simple.

Existing pointer files will continue to work ok.
This commit is contained in:
Joey Hess 2016-02-16 14:10:08 -04:00
parent 32dcc1303a
commit adc27f081a
Failed to extract signature
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/Link.hs
View file

@ -147,7 +147,7 @@ parseLinkOrPointer' :: String -> Maybe Key
parseLinkOrPointer' = go . fromInternalGitPath . takeWhile (not . lineend) parseLinkOrPointer' = go . fromInternalGitPath . takeWhile (not . lineend)
where where
go l go l
| isLinkToAnnex l = file2key $ takeFileName l | isLinkToAnnex l = fileKey $ takeFileName l
| otherwise = Nothing | otherwise = Nothing
lineend '\n' = True lineend '\n' = True
lineend '\r' = True lineend '\r' = True
@ -155,7 +155,7 @@ parseLinkOrPointer' = go . fromInternalGitPath . takeWhile (not . lineend)
formatPointer :: Key -> String formatPointer :: Key -> String
formatPointer k = formatPointer k =
toInternalGitPath (pathSeparator:objectDir </> key2file k) ++ "\n" toInternalGitPath (pathSeparator:objectDir </> keyFile k) ++ "\n"
{- Checks if a file is a pointer to a key. -} {- Checks if a file is a pointer to a key. -}
isPointerFile :: FilePath -> IO (Maybe Key) isPointerFile :: FilePath -> IO (Maybe Key)