support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
{- directory manipulation
|
|
|
|
-
|
|
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Utility.Directory where
|
|
|
|
|
|
|
|
import System.IO.Error
|
|
|
|
import System.Posix.Files
|
|
|
|
import System.Directory
|
2012-06-12 15:32:06 +00:00
|
|
|
import Control.Exception (throw, bracket_)
|
2011-12-09 05:57:13 +00:00
|
|
|
import Control.Monad
|
2012-01-24 19:28:13 +00:00
|
|
|
import Control.Monad.IfElse
|
2012-03-11 22:12:36 +00:00
|
|
|
import System.FilePath
|
|
|
|
import Control.Applicative
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
import System.Posix.Directory
|
2012-05-31 23:25:33 +00:00
|
|
|
import System.IO.Unsafe (unsafeInterleaveIO)
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
|
|
|
|
import Utility.SafeCommand
|
|
|
|
import Utility.TempFile
|
2012-02-03 20:47:24 +00:00
|
|
|
import Utility.Exception
|
2012-04-22 03:32:33 +00:00
|
|
|
import Utility.Monad
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
import Utility.Path
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
|
2012-05-31 23:25:33 +00:00
|
|
|
dirCruft :: FilePath -> Bool
|
|
|
|
dirCruft "." = True
|
|
|
|
dirCruft ".." = True
|
|
|
|
dirCruft _ = False
|
|
|
|
|
2012-03-11 22:12:36 +00:00
|
|
|
{- Lists the contents of a directory.
|
|
|
|
- Unlike getDirectoryContents, paths are not relative to the directory. -}
|
|
|
|
dirContents :: FilePath -> IO [FilePath]
|
2012-05-31 23:25:33 +00:00
|
|
|
dirContents d = map (d </>) . filter (not . dirCruft) <$> getDirectoryContents d
|
|
|
|
|
2012-06-18 16:53:57 +00:00
|
|
|
{- Gets files in a directory, and then its subdirectories, recursively,
|
2012-07-02 14:56:26 +00:00
|
|
|
- and lazily. If the directory does not exist, no exception is thrown,
|
|
|
|
- instead, [] is returned. -}
|
2012-05-31 23:25:33 +00:00
|
|
|
dirContentsRecursive :: FilePath -> IO [FilePath]
|
|
|
|
dirContentsRecursive topdir = dirContentsRecursive' topdir [""]
|
|
|
|
|
|
|
|
dirContentsRecursive' :: FilePath -> [FilePath] -> IO [FilePath]
|
|
|
|
dirContentsRecursive' _ [] = return []
|
|
|
|
dirContentsRecursive' topdir (dir:dirs) = unsafeInterleaveIO $ do
|
2012-07-02 14:56:26 +00:00
|
|
|
(files, dirs') <- collect [] [] =<< catchDefaultIO (dirContents (topdir </> dir)) []
|
2012-05-31 23:25:33 +00:00
|
|
|
files' <- dirContentsRecursive' topdir (dirs' ++ dirs)
|
|
|
|
return (files ++ files')
|
2012-03-11 22:12:36 +00:00
|
|
|
where
|
2012-05-31 23:25:33 +00:00
|
|
|
collect files dirs' [] = return (reverse files, reverse dirs')
|
|
|
|
collect files dirs' (entry:entries)
|
|
|
|
| dirCruft entry = collect files dirs' entries
|
|
|
|
| otherwise = do
|
|
|
|
let dirEntry = dir </> entry
|
|
|
|
ifM (doesDirectoryExist $ topdir </> dirEntry)
|
|
|
|
( collect files (dirEntry:dirs') entries
|
|
|
|
, collect (dirEntry:files) dirs' entries
|
|
|
|
)
|
2012-03-11 22:12:36 +00:00
|
|
|
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
{- Moves one filename to another.
|
|
|
|
- First tries a rename, but falls back to moving across devices if needed. -}
|
|
|
|
moveFile :: FilePath -> FilePath -> IO ()
|
2012-02-03 20:47:24 +00:00
|
|
|
moveFile src dest = tryIO (rename src dest) >>= onrename
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
where
|
2012-04-22 03:32:33 +00:00
|
|
|
onrename (Right _) = noop
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
onrename (Left e)
|
|
|
|
| isPermissionError e = rethrow
|
|
|
|
| isDoesNotExistError e = rethrow
|
|
|
|
| otherwise = do
|
|
|
|
-- copyFile is likely not as optimised as
|
|
|
|
-- the mv command, so we'll use the latter.
|
|
|
|
-- But, mv will move into a directory if
|
|
|
|
-- dest is one, which is not desired.
|
|
|
|
whenM (isdir dest) rethrow
|
|
|
|
viaTmp mv dest undefined
|
|
|
|
where
|
|
|
|
rethrow = throw e
|
|
|
|
mv tmp _ = do
|
|
|
|
ok <- boolSystem "mv" [Param "-f",
|
|
|
|
Param src, Param tmp]
|
2011-12-09 05:57:13 +00:00
|
|
|
unless ok $ do
|
|
|
|
-- delete any partial
|
2012-02-03 20:47:24 +00:00
|
|
|
_ <- tryIO $ removeFile tmp
|
2011-12-09 05:57:13 +00:00
|
|
|
rethrow
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
isdir f = do
|
2012-02-03 20:47:24 +00:00
|
|
|
r <- tryIO $ getFileStatus f
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
case r of
|
|
|
|
(Left _) -> return False
|
|
|
|
(Right s) -> return $ isDirectory s
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
|
2012-06-06 17:13:13 +00:00
|
|
|
{- Removes a file, which may or may not exist.
|
|
|
|
-
|
|
|
|
- Note that an exception is thrown if the file exists but
|
|
|
|
- cannot be removed. -}
|
|
|
|
nukeFile :: FilePath -> IO ()
|
|
|
|
nukeFile file = whenM (doesFileExist file) $ removeFile file
|
|
|
|
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
{- Runs an action in another directory. -}
|
|
|
|
bracketCd :: FilePath -> IO a -> IO a
|
|
|
|
bracketCd dir a = go =<< getCurrentDirectory
|
|
|
|
where
|
|
|
|
go cwd
|
|
|
|
| dirContains dir cwd = a
|
|
|
|
| otherwise = bracket_
|
|
|
|
(changeWorkingDirectory dir)
|
|
|
|
(changeWorkingDirectory cwd)
|
|
|
|
a
|