diff options
Diffstat (limited to 'Annex/CatFile.hs')
| -rw-r--r-- | Annex/CatFile.hs | 75 |
1 files changed, 61 insertions, 14 deletions
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index f90e74509..812d032c6 100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs @@ -8,14 +8,17 @@ module Annex.CatFile ( catFile, catObject, + catTree, catObjectDetails, catFileHandle, catKey, catKeyFile, + catKeyFileHEAD, ) where import qualified Data.ByteString.Lazy as L import qualified Data.Map as M +import System.PosixCompat.Types import Common.Annex import qualified Git @@ -23,6 +26,8 @@ import qualified Git.CatFile import qualified Annex import Git.Types import Git.FilePath +import Git.FileMode +import qualified Git.Ref catFile :: Git.Branch -> FilePath -> Annex L.ByteString catFile branch file = do @@ -34,7 +39,12 @@ catObject ref = do h <- catFileHandle liftIO $ Git.CatFile.catObject h ref -catObjectDetails :: Git.Ref -> Annex (Maybe (L.ByteString, Sha)) +catTree :: Git.Ref -> Annex [(FilePath, FileMode)] +catTree ref = do + h <- catFileHandle + liftIO $ Git.CatFile.catTree h ref + +catObjectDetails :: Git.Ref -> Annex (Maybe (L.ByteString, Sha, ObjectType)) catObjectDetails ref = do h <- catFileHandle liftIO $ Git.CatFile.catObjectDetails h ref @@ -54,18 +64,51 @@ catFileHandle = do Annex.changeState $ \s -> s { Annex.catfilehandles = m' } return h -{- From the Sha or Ref of a symlink back to the key. -} -catKey :: Ref -> Annex (Maybe Key) -catKey ref = do - l <- fromInternalGitPath . encodeW8 . L.unpack <$> catObject ref - return $ if isLinkToAnnex l - then fileKey $ takeFileName l - else Nothing +{- From the Sha or Ref of a symlink back to the key. + - + - Requires a mode witness, to guarantee that the file is a symlink. + -} +catKey :: Ref -> FileMode -> Annex (Maybe Key) +catKey = catKey' True -{- From a file in the repository back to the key. +catKey' :: Bool -> Ref -> FileMode -> Annex (Maybe Key) +catKey' modeguaranteed ref mode + | isSymLink mode = do + l <- fromInternalGitPath . encodeW8 . L.unpack <$> get + return $ if isLinkToAnnex l + then fileKey $ takeFileName l + else Nothing + | otherwise = return Nothing + where + -- If the mode is not guaranteed to be correct, avoid + -- buffering the whole file content, which might be large. + -- 8192 is enough if it really is a symlink. + get + | modeguaranteed = catObject ref + | otherwise = L.take 8192 <$> catObject ref + +{- Looks up the file mode corresponding to the Ref using the running + - cat-file. - - - Prefixing the file with ./ makes this work even if in a subdirectory - - of a repo. + - Currently this always has to look in HEAD, because cat-file --batch + - does not offer a way to specify that we want to look up a tree object + - in the index. So if the index has a file staged not as a symlink, + - and it is a symlink in head, the wrong mode is gotten. + - Also, we have to assume the file is a symlink if it's not yet committed + - to HEAD. For these reasons, modeguaranteed is not set. + -} +catKeyChecked :: Bool -> Ref -> Annex (Maybe Key) +catKeyChecked needhead ref@(Ref r) = + catKey' False ref =<< findmode <$> catTree treeref + where + pathparts = split "/" r + dir = intercalate "/" $ take (length pathparts - 1) pathparts + file = fromMaybe "" $ lastMaybe pathparts + treeref = Ref $ if needhead then "HEAD" ++ dir ++ "/" else dir ++ "/" + findmode = fromMaybe symLinkMode . headMaybe . + map snd . filter (\p -> fst p == file) + +{- From a file in the repository back to the key. - - Ideally, this should reflect the key that's staged in the index, - not the key that's committed to HEAD. Unfortunately, git cat-file @@ -75,7 +118,8 @@ catKey ref = do - - For command-line git-annex use, that doesn't matter. It's perfectly - reasonable for things staged in the index after the currently running - - git-annex process to not be noticed by it. + - git-annex process to not be noticed by it. However, we do want to see + - what's in the index, since it may have uncommitted changes not in HEAD> - - For the assistant, this is much more of a problem, since it commits - files and then needs to be able to immediately look up their keys. @@ -87,6 +131,9 @@ catKey ref = do -} catKeyFile :: FilePath -> Annex (Maybe Key) catKeyFile f = ifM (Annex.getState Annex.daemon) - ( catKey $ Ref $ "HEAD:./" ++ f - , catKey $ Ref $ ":./" ++ f + ( catKeyFileHEAD f + , catKeyChecked True $ Git.Ref.fileRef f ) + +catKeyFileHEAD :: FilePath -> Annex (Maybe Key) +catKeyFileHEAD f = catKeyChecked False $ Git.Ref.fileFromRef Git.Ref.headRef f |