10b5f79e2d
Fix behavior when importing a tree from a directory remote when the
directory does not exist. An empty tree was imported, rather than the
import failing. Merging that tree would delete every file in the
branch, if those files had been exported to the directory before.
The problem was that dirContentsRecursive returned [] when the directory
did not exist. Better for it to throw an exception. But in commit
74f0d67aa3 back in 2012, I made it never
theow exceptions, because exceptions throw inside unsafeInterleaveIO become
untrappable when the list is being traversed.
So, changed it to list the contents of the directory before entering
unsafeInterleaveIO. So exceptions are thrown for the directory. But still
not if it's unable to list the contents of a subdirectory. That's less of a
problem, because the subdirectory does exist (or if not, it got removed
after being listed, and it's ok to not include it in the list). A
subdirectory that has permissions that don't allow listing it will have its
contents omitted from the list still.
(Might be better to have it return a type that includes indications of
errors listing contents of subdirectories?)
The rest of the changes are making callers of dirContentsRecursive
use emptyWhenDoesNotExist when they relied on the behavior of it not
throwing an exception when the directory does not exist. Note that
it's possible some callers of dirContentsRecursive that used to ignore
permissions problems listing a directory will now start throwing exceptions
on them.
The fix to the directory special remote consisted of not making its
call in listImportableContentsM use emptyWhenDoesNotExist. So it will
throw an exception as desired.
Sponsored-by: Joshua Antonishen on Patreon
55 lines
1.6 KiB
Haskell
55 lines
1.6 KiB
Haskell
{- .git/objects
|
|
-
|
|
- Copyright 2013 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
module Git.Objects where
|
|
|
|
import Common
|
|
import Git
|
|
import Git.Sha
|
|
|
|
import qualified Data.ByteString as B
|
|
import qualified System.FilePath.ByteString as P
|
|
|
|
objectsDir :: Repo -> RawFilePath
|
|
objectsDir r = localGitDir r P.</> "objects"
|
|
|
|
packDir :: Repo -> RawFilePath
|
|
packDir r = objectsDir r P.</> "pack"
|
|
|
|
packIdxFile :: RawFilePath -> RawFilePath
|
|
packIdxFile = flip P.replaceExtension "idx"
|
|
|
|
listPackFiles :: Repo -> IO [FilePath]
|
|
listPackFiles r = filter (".pack" `isSuffixOf`)
|
|
<$> catchDefaultIO [] (dirContents $ fromRawFilePath $ packDir r)
|
|
|
|
listLooseObjectShas :: Repo -> IO [Sha]
|
|
listLooseObjectShas r = catchDefaultIO [] $
|
|
mapMaybe (extractSha . encodeBS . concat . reverse . take 2 . reverse . splitDirectories)
|
|
<$> emptyWhenDoesNotExist (dirContentsRecursiveSkipping (== "pack") True (fromRawFilePath (objectsDir r)))
|
|
|
|
looseObjectFile :: Repo -> Sha -> RawFilePath
|
|
looseObjectFile r sha = objectsDir r P.</> prefix P.</> rest
|
|
where
|
|
(prefix, rest) = B.splitAt 2 (fromRef' sha)
|
|
|
|
listAlternates :: Repo -> IO [FilePath]
|
|
listAlternates r = catchDefaultIO [] $
|
|
lines <$> readFile (fromRawFilePath alternatesfile)
|
|
where
|
|
alternatesfile = objectsDir r P.</> "info" P.</> "alternates"
|
|
|
|
{- A repository recently cloned with --shared will have one or more
|
|
- alternates listed, and contain no loose objects or packs. -}
|
|
isSharedClone :: Repo -> IO Bool
|
|
isSharedClone r = allM id
|
|
[ not . null <$> listAlternates r
|
|
, null <$> listLooseObjectShas r
|
|
, null <$> listPackFiles r
|
|
]
|