2015-12-09 21:00:37 +00:00
|
|
|
{- Sqlite database of information about Keys
|
2015-12-07 17:42:03 +00:00
|
|
|
-
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
- Copyright 2015-2021 Joey Hess <id@joeyh.name>
|
2016-01-01 19:09:42 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2015-12-07 17:42:03 +00:00
|
|
|
-}
|
|
|
|
|
2016-01-12 17:31:13 +00:00
|
|
|
{-# LANGUAGE ScopedTypeVariables #-}
|
2020-04-07 17:27:11 +00:00
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
2015-12-07 17:42:03 +00:00
|
|
|
|
2015-12-09 21:00:37 +00:00
|
|
|
module Database.Keys (
|
2015-12-07 17:42:03 +00:00
|
|
|
DbHandle,
|
2016-05-16 18:49:12 +00:00
|
|
|
closeDb,
|
2015-12-09 21:00:37 +00:00
|
|
|
addAssociatedFile,
|
|
|
|
getAssociatedFiles,
|
2015-12-15 17:05:23 +00:00
|
|
|
getAssociatedKey,
|
2015-12-09 21:00:37 +00:00
|
|
|
removeAssociatedFile,
|
2015-12-09 21:47:05 +00:00
|
|
|
storeInodeCaches,
|
2018-08-22 19:28:57 +00:00
|
|
|
storeInodeCaches',
|
2015-12-09 21:47:05 +00:00
|
|
|
addInodeCaches,
|
|
|
|
getInodeCaches,
|
|
|
|
removeInodeCaches,
|
smudge: check for known annexed inodes before checking annex.largefiles
smudge: Fix a case where an unlocked annexed file that annex.largefiles
does not match could get its unchanged content checked into git, due to git
running the smudge filter unecessarily.
When the file has the same inodecache as an already annexed file,
we can assume that the user is not intending to change how it's stored in
git.
Note that checkunchangedgitfile already handled the inverse case, where the
file was added to git previously. That goes further and actually sha1
hashes the new file and checks if it's the same hash in the index.
It would be possible to generate a key for the file and see if it's the
same as the old key, however that could be considerably more expensive than
sha1 of a small file is, and it is not necessary for the case I have, at
least, where the file is not modified or touched, and so its inode will
match the cache.
git-annex add was changed, when adding a small file, to remove the inode
cache for it. This is necessary to keep the recipe in
doc/tips/largefiles.mdwn for converting from annex to git working.
It also avoids bugs/case_where_using_pathspec_with_git-commit_leaves_s.mdwn
which the earlier try at this change introduced.
2021-05-10 17:05:08 +00:00
|
|
|
removeInodeCache,
|
2019-10-23 18:06:11 +00:00
|
|
|
isInodeKnown,
|
2016-10-17 18:58:33 +00:00
|
|
|
runWriter,
|
2021-06-07 20:50:14 +00:00
|
|
|
runWriter',
|
2015-12-07 17:42:03 +00:00
|
|
|
) where
|
|
|
|
|
2016-01-11 19:52:11 +00:00
|
|
|
import qualified Database.Keys.SQL as SQL
|
2015-12-07 17:42:03 +00:00
|
|
|
import Database.Types
|
2015-12-23 22:34:51 +00:00
|
|
|
import Database.Keys.Handle
|
2015-12-23 18:59:58 +00:00
|
|
|
import qualified Database.Queue as H
|
2017-02-13 21:30:28 +00:00
|
|
|
import Database.Init
|
2016-01-20 20:36:33 +00:00
|
|
|
import Annex.Locations
|
|
|
|
import Annex.Common hiding (delete)
|
2016-01-01 19:50:59 +00:00
|
|
|
import qualified Annex
|
2015-12-07 17:42:03 +00:00
|
|
|
import Annex.LockFile
|
2018-08-22 19:28:57 +00:00
|
|
|
import Annex.Content.PointerFile
|
|
|
|
import Annex.Link
|
2015-12-09 21:00:37 +00:00
|
|
|
import Utility.InodeCache
|
2015-12-09 21:47:05 +00:00
|
|
|
import Annex.InodeSentinal
|
2018-08-21 20:48:20 +00:00
|
|
|
import Git
|
2016-01-01 19:09:42 +00:00
|
|
|
import Git.FilePath
|
2018-08-21 20:48:20 +00:00
|
|
|
import Git.Command
|
|
|
|
import Git.Types
|
2018-08-22 17:04:12 +00:00
|
|
|
import Git.Index
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
import Git.Sha
|
2021-06-07 18:51:38 +00:00
|
|
|
import Git.CatFile
|
2021-05-24 15:33:23 +00:00
|
|
|
import Git.Branch (writeTreeQuiet, update')
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
import qualified Git.Ref
|
2021-01-04 17:12:28 +00:00
|
|
|
import Config.Smudge
|
2020-11-05 22:45:37 +00:00
|
|
|
import qualified Utility.RawFilePath as R
|
2015-12-23 22:34:51 +00:00
|
|
|
|
2019-12-18 20:45:03 +00:00
|
|
|
import qualified Data.ByteString as S
|
2020-04-07 17:27:11 +00:00
|
|
|
import qualified Data.ByteString.Char8 as S8
|
2019-12-18 20:45:03 +00:00
|
|
|
import qualified System.FilePath.ByteString as P
|
2021-06-07 18:51:38 +00:00
|
|
|
import Control.Concurrent.Async
|
2019-12-18 20:45:03 +00:00
|
|
|
|
2015-12-23 22:34:51 +00:00
|
|
|
{- Runs an action that reads from the database.
|
|
|
|
-
|
|
|
|
- If the database is already open, any writes are flushed to it, to ensure
|
|
|
|
- consistency.
|
|
|
|
-
|
|
|
|
- Any queued writes will be flushed before the read.
|
|
|
|
-}
|
2016-01-11 19:52:11 +00:00
|
|
|
runReader :: Monoid v => (SQL.ReadHandle -> Annex v) -> Annex v
|
2016-07-19 18:02:49 +00:00
|
|
|
runReader a = do
|
2021-04-02 19:26:21 +00:00
|
|
|
h <- Annex.getRead Annex.keysdbhandle
|
2016-07-19 18:02:49 +00:00
|
|
|
withDbState h go
|
2015-12-23 22:34:51 +00:00
|
|
|
where
|
2016-02-12 18:15:28 +00:00
|
|
|
go DbUnavailable = return (mempty, DbUnavailable)
|
2015-12-23 22:34:51 +00:00
|
|
|
go st@(DbOpen qh) = do
|
|
|
|
liftIO $ H.flushDbQueue qh
|
2016-01-11 19:52:11 +00:00
|
|
|
v <- a (SQL.ReadHandle qh)
|
2015-12-23 22:34:51 +00:00
|
|
|
return (v, st)
|
|
|
|
go DbClosed = do
|
2021-06-07 20:50:14 +00:00
|
|
|
st' <- openDb True Nothing DbClosed
|
2015-12-23 22:34:51 +00:00
|
|
|
v <- case st' of
|
2016-01-11 19:52:11 +00:00
|
|
|
(DbOpen qh) -> a (SQL.ReadHandle qh)
|
2015-12-23 22:34:51 +00:00
|
|
|
_ -> return mempty
|
|
|
|
return (v, st')
|
|
|
|
|
2016-01-11 19:52:11 +00:00
|
|
|
runReaderIO :: Monoid v => (SQL.ReadHandle -> IO v) -> Annex v
|
|
|
|
runReaderIO a = runReader (liftIO . a)
|
2015-12-23 22:34:51 +00:00
|
|
|
|
|
|
|
{- Runs an action that writes to the database. Typically this is used to
|
|
|
|
- queue changes, which will be flushed at a later point.
|
|
|
|
-
|
|
|
|
- The database is created if it doesn't exist yet. -}
|
2016-01-11 19:52:11 +00:00
|
|
|
runWriter :: (SQL.WriteHandle -> Annex ()) -> Annex ()
|
2021-06-07 20:50:14 +00:00
|
|
|
runWriter = runWriter' Nothing
|
|
|
|
|
|
|
|
runWriterIO :: (SQL.WriteHandle -> IO ()) -> Annex ()
|
|
|
|
runWriterIO a = runWriter (liftIO . a)
|
|
|
|
|
|
|
|
{- When a reconcile action is passed, it is run by reconcileStaged instead
|
|
|
|
- of its usual scan, and must update the database in the same way. -}
|
|
|
|
runWriter' :: Maybe (SQL.WriteHandle -> Annex ()) -> (SQL.WriteHandle -> Annex ()) -> Annex ()
|
|
|
|
runWriter' reconciler a = do
|
2021-04-02 19:26:21 +00:00
|
|
|
h <- Annex.getRead Annex.keysdbhandle
|
2015-12-23 22:34:51 +00:00
|
|
|
withDbState h go
|
|
|
|
where
|
|
|
|
go st@(DbOpen qh) = do
|
2016-01-11 19:52:11 +00:00
|
|
|
v <- a (SQL.WriteHandle qh)
|
2015-12-23 22:34:51 +00:00
|
|
|
return (v, st)
|
|
|
|
go st = do
|
2021-06-07 20:50:14 +00:00
|
|
|
st' <- openDb False reconciler st
|
2015-12-23 22:34:51 +00:00
|
|
|
v <- case st' of
|
2016-01-11 19:52:11 +00:00
|
|
|
DbOpen qh -> a (SQL.WriteHandle qh)
|
2015-12-23 22:34:51 +00:00
|
|
|
_ -> error "internal"
|
2015-12-24 17:06:03 +00:00
|
|
|
return (v, st')
|
2015-12-23 22:34:51 +00:00
|
|
|
|
2021-05-24 18:46:59 +00:00
|
|
|
{- Opens the database, creating it if it doesn't exist yet.
|
2015-12-16 17:24:45 +00:00
|
|
|
-
|
|
|
|
- Multiple readers and writers can have the database open at the same
|
|
|
|
- time. Database.Handle deals with the concurrency issues.
|
|
|
|
- The lock is held while opening the database, so that when
|
|
|
|
- the database doesn't exist yet, one caller wins the lock and
|
|
|
|
- can create it undisturbed.
|
|
|
|
-}
|
2021-06-07 20:50:14 +00:00
|
|
|
openDb :: Bool -> (Maybe (SQL.WriteHandle -> Annex ())) -> DbState -> Annex DbState
|
|
|
|
openDb _ _ st@(DbOpen _) = return st
|
|
|
|
openDb False _ DbUnavailable = return DbUnavailable
|
|
|
|
openDb forwrite reconciler _ = catchPermissionDenied permerr $ withExclusiveLock gitAnnexKeysDbLock $ do
|
2015-12-09 21:00:37 +00:00
|
|
|
dbdir <- fromRepo gitAnnexKeysDb
|
2020-11-05 22:45:37 +00:00
|
|
|
let db = dbdir P.</> "db"
|
|
|
|
dbexists <- liftIO $ R.doesPathExist db
|
2021-05-24 18:46:59 +00:00
|
|
|
case dbexists of
|
|
|
|
True -> open db
|
|
|
|
False -> do
|
2017-02-13 21:30:28 +00:00
|
|
|
initDb db SQL.createTables
|
2015-12-23 22:34:51 +00:00
|
|
|
open db
|
|
|
|
where
|
2021-05-24 18:46:59 +00:00
|
|
|
-- If permissions don't allow opening the database, and it's being
|
|
|
|
-- opened for read, treat it as if it does not exist.
|
|
|
|
permerr e
|
|
|
|
| forwrite = throwM e
|
|
|
|
| otherwise = return DbUnavailable
|
2018-08-21 20:48:20 +00:00
|
|
|
|
|
|
|
open db = do
|
2018-08-22 19:28:57 +00:00
|
|
|
qh <- liftIO $ H.openDbQueue H.MultiWriter db SQL.containedTable
|
2021-06-07 20:50:14 +00:00
|
|
|
reconcileStaged qh reconciler
|
2018-08-22 19:28:57 +00:00
|
|
|
return $ DbOpen qh
|
2015-12-09 18:55:47 +00:00
|
|
|
|
2016-05-16 18:49:12 +00:00
|
|
|
{- Closes the database if it was open. Any writes will be flushed to it.
|
|
|
|
-
|
|
|
|
- This does not normally need to be called; the database will auto-close
|
|
|
|
- when the handle is garbage collected. However, this can be used to
|
|
|
|
- force a re-read of the database, in case another process has written
|
|
|
|
- data to it.
|
|
|
|
-}
|
|
|
|
closeDb :: Annex ()
|
2021-04-02 19:26:21 +00:00
|
|
|
closeDb = liftIO . closeDbHandle =<< Annex.getRead Annex.keysdbhandle
|
2016-05-16 18:49:12 +00:00
|
|
|
|
2016-01-05 21:22:19 +00:00
|
|
|
addAssociatedFile :: Key -> TopFilePath -> Annex ()
|
2019-10-29 16:28:01 +00:00
|
|
|
addAssociatedFile k f = runWriterIO $ SQL.addAssociatedFile k f
|
2015-12-07 17:42:03 +00:00
|
|
|
|
2015-12-09 21:00:37 +00:00
|
|
|
{- Note that the files returned were once associated with the key, but
|
2015-12-07 17:42:03 +00:00
|
|
|
- some of them may not be any longer. -}
|
2016-01-05 21:22:19 +00:00
|
|
|
getAssociatedFiles :: Key -> Annex [TopFilePath]
|
2019-10-29 16:28:01 +00:00
|
|
|
getAssociatedFiles = runReaderIO . SQL.getAssociatedFiles
|
2015-12-07 17:42:03 +00:00
|
|
|
|
2015-12-15 17:05:23 +00:00
|
|
|
{- Gets any keys that are on record as having a particular associated file.
|
|
|
|
- (Should be one or none but the database doesn't enforce that.) -}
|
2016-01-05 21:22:19 +00:00
|
|
|
getAssociatedKey :: TopFilePath -> Annex [Key]
|
2019-10-29 16:28:01 +00:00
|
|
|
getAssociatedKey = runReaderIO . SQL.getAssociatedKey
|
2015-12-15 17:05:23 +00:00
|
|
|
|
2016-01-05 21:22:19 +00:00
|
|
|
removeAssociatedFile :: Key -> TopFilePath -> Annex ()
|
2019-10-29 16:28:01 +00:00
|
|
|
removeAssociatedFile k = runWriterIO . SQL.removeAssociatedFile k
|
2015-12-23 22:34:51 +00:00
|
|
|
|
2015-12-09 21:47:05 +00:00
|
|
|
{- Stats the files, and stores their InodeCaches. -}
|
2019-12-11 18:12:22 +00:00
|
|
|
storeInodeCaches :: Key -> [RawFilePath] -> Annex ()
|
2018-08-22 19:28:57 +00:00
|
|
|
storeInodeCaches k fs = storeInodeCaches' k fs []
|
|
|
|
|
2019-12-11 18:12:22 +00:00
|
|
|
storeInodeCaches' :: Key -> [RawFilePath] -> [InodeCache] -> Annex ()
|
2018-08-22 19:28:57 +00:00
|
|
|
storeInodeCaches' k fs ics = withTSDelta $ \d ->
|
|
|
|
addInodeCaches k . (++ ics) . catMaybes
|
2019-12-11 18:12:22 +00:00
|
|
|
=<< liftIO (mapM (\f -> genInodeCache f d) fs)
|
2015-12-09 21:47:05 +00:00
|
|
|
|
|
|
|
addInodeCaches :: Key -> [InodeCache] -> Annex ()
|
2019-10-29 16:28:01 +00:00
|
|
|
addInodeCaches k is = runWriterIO $ SQL.addInodeCaches k is
|
2015-12-09 21:00:37 +00:00
|
|
|
|
2015-12-09 21:47:05 +00:00
|
|
|
{- A key may have multiple InodeCaches; one for the annex object, and one
|
|
|
|
- for each pointer file that is a copy of it. -}
|
|
|
|
getInodeCaches :: Key -> Annex [InodeCache]
|
2019-10-29 16:28:01 +00:00
|
|
|
getInodeCaches = runReaderIO . SQL.getInodeCaches
|
2015-12-09 21:47:05 +00:00
|
|
|
|
smudge: check for known annexed inodes before checking annex.largefiles
smudge: Fix a case where an unlocked annexed file that annex.largefiles
does not match could get its unchanged content checked into git, due to git
running the smudge filter unecessarily.
When the file has the same inodecache as an already annexed file,
we can assume that the user is not intending to change how it's stored in
git.
Note that checkunchangedgitfile already handled the inverse case, where the
file was added to git previously. That goes further and actually sha1
hashes the new file and checks if it's the same hash in the index.
It would be possible to generate a key for the file and see if it's the
same as the old key, however that could be considerably more expensive than
sha1 of a small file is, and it is not necessary for the case I have, at
least, where the file is not modified or touched, and so its inode will
match the cache.
git-annex add was changed, when adding a small file, to remove the inode
cache for it. This is necessary to keep the recipe in
doc/tips/largefiles.mdwn for converting from annex to git working.
It also avoids bugs/case_where_using_pathspec_with_git-commit_leaves_s.mdwn
which the earlier try at this change introduced.
2021-05-10 17:05:08 +00:00
|
|
|
{- Remove all inodes cached for a key. -}
|
2015-12-09 21:47:05 +00:00
|
|
|
removeInodeCaches :: Key -> Annex ()
|
2019-10-29 16:28:01 +00:00
|
|
|
removeInodeCaches = runWriterIO . SQL.removeInodeCaches
|
2018-08-21 20:48:20 +00:00
|
|
|
|
smudge: check for known annexed inodes before checking annex.largefiles
smudge: Fix a case where an unlocked annexed file that annex.largefiles
does not match could get its unchanged content checked into git, due to git
running the smudge filter unecessarily.
When the file has the same inodecache as an already annexed file,
we can assume that the user is not intending to change how it's stored in
git.
Note that checkunchangedgitfile already handled the inverse case, where the
file was added to git previously. That goes further and actually sha1
hashes the new file and checks if it's the same hash in the index.
It would be possible to generate a key for the file and see if it's the
same as the old key, however that could be considerably more expensive than
sha1 of a small file is, and it is not necessary for the case I have, at
least, where the file is not modified or touched, and so its inode will
match the cache.
git-annex add was changed, when adding a small file, to remove the inode
cache for it. This is necessary to keep the recipe in
doc/tips/largefiles.mdwn for converting from annex to git working.
It also avoids bugs/case_where_using_pathspec_with_git-commit_leaves_s.mdwn
which the earlier try at this change introduced.
2021-05-10 17:05:08 +00:00
|
|
|
{- Remove cached inodes, for any key. -}
|
|
|
|
removeInodeCache :: InodeCache -> Annex ()
|
|
|
|
removeInodeCache = runWriterIO . SQL.removeInodeCache
|
|
|
|
|
2019-10-23 18:06:11 +00:00
|
|
|
isInodeKnown :: InodeCache -> SentinalStatus -> Annex Bool
|
|
|
|
isInodeKnown i s = or <$> runReaderIO ((:[]) <$$> SQL.isInodeKnown i s)
|
|
|
|
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
{- Looks at staged changes to annexed files, and updates the keys database,
|
|
|
|
- so that its information is consistent with the state of the repository.
|
2018-08-21 20:48:20 +00:00
|
|
|
-
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
- This is run with a lock held, so only one process can be running this at
|
|
|
|
- a time.
|
2018-08-21 20:48:20 +00:00
|
|
|
-
|
2018-08-22 17:04:12 +00:00
|
|
|
- To avoid unncessary work, the index file is statted, and if it's not
|
2018-08-21 20:48:20 +00:00
|
|
|
- changed since last time this was run, nothing is done.
|
2018-08-22 17:04:12 +00:00
|
|
|
-
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
- A tree is generated from the index, and the diff between that tree
|
|
|
|
- and the last processed tree is examined for changes.
|
2018-08-22 19:28:57 +00:00
|
|
|
-
|
|
|
|
- This also cleans up after a race between eg a git mv and git-annex
|
|
|
|
- get/drop/similar. If git moves the file between this being run and the
|
|
|
|
- get/drop, the moved file won't be updated for the get/drop.
|
|
|
|
- The next time this runs, it will see the staged change. It then checks
|
|
|
|
- if the worktree file's content availability does not match the git-annex
|
|
|
|
- content availablity, and makes changes as necessary to reconcile them.
|
|
|
|
-
|
|
|
|
- Note that if a commit happens before this runs again, it won't see
|
|
|
|
- the staged change. Instead, during the commit, git will run the clean
|
|
|
|
- filter. If a drop missed the file then the file is added back into the
|
|
|
|
- annex. If a get missed the file then the clean filter populates the
|
|
|
|
- file.
|
2021-05-24 16:05:35 +00:00
|
|
|
-
|
|
|
|
- There is a situation where, after this has run, the database can still
|
|
|
|
- contain associated files that have been deleted from the index.
|
|
|
|
- That happens when addAssociatedFile is used to record a newly
|
|
|
|
- added file, but that file then gets removed from the index before
|
|
|
|
- this is run. Eg, "git-annex add foo; git rm foo"
|
|
|
|
- So when using getAssociatedFiles, have to make sure the file still
|
|
|
|
- is an associated file.
|
2018-08-21 20:48:20 +00:00
|
|
|
-}
|
2021-06-07 20:50:14 +00:00
|
|
|
reconcileStaged :: H.DbQueue -> Maybe (SQL.WriteHandle -> Annex ()) -> Annex ()
|
|
|
|
reconcileStaged qh mreconciler = do
|
2018-08-22 17:04:12 +00:00
|
|
|
gitindex <- inRepo currentIndexFile
|
2020-10-29 18:20:57 +00:00
|
|
|
indexcache <- fromRawFilePath <$> fromRepo gitAnnexKeysDbIndexCache
|
2020-11-05 22:45:37 +00:00
|
|
|
withTSDelta (liftIO . genInodeCache gitindex) >>= \case
|
2021-05-24 15:38:22 +00:00
|
|
|
Just cur -> readindexcache indexcache >>= \case
|
|
|
|
Nothing -> go cur indexcache =<< getindextree
|
|
|
|
Just prev -> ifM (compareInodeCaches prev cur)
|
|
|
|
( noop
|
|
|
|
, go cur indexcache =<< getindextree
|
|
|
|
)
|
2018-08-22 17:04:12 +00:00
|
|
|
Nothing -> noop
|
2018-08-21 20:48:20 +00:00
|
|
|
where
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
lastindexref = Ref "refs/annex/last-index"
|
|
|
|
|
2021-05-24 15:38:22 +00:00
|
|
|
readindexcache indexcache = liftIO $ maybe Nothing readInodeCache
|
|
|
|
<$> catchMaybeIO (readFile indexcache)
|
|
|
|
|
2021-05-24 15:33:23 +00:00
|
|
|
getoldtree = fromMaybe emptyTree <$> inRepo (Git.Ref.sha lastindexref)
|
2021-06-07 18:51:38 +00:00
|
|
|
|
2021-05-24 15:33:23 +00:00
|
|
|
go cur indexcache (Just newtree) = do
|
|
|
|
oldtree <- getoldtree
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
when (oldtree /= newtree) $ do
|
2021-06-07 20:50:14 +00:00
|
|
|
case mreconciler of
|
|
|
|
Just reconciler ->
|
|
|
|
reconciler (SQL.WriteHandle qh)
|
|
|
|
Nothing -> noop
|
2021-06-07 18:51:38 +00:00
|
|
|
g <- Annex.gitRepo
|
2021-06-07 20:50:14 +00:00
|
|
|
void $ catstream $ \mdfeeder -> do
|
|
|
|
case mreconciler of
|
|
|
|
Nothing -> void $ updatetodiff g
|
|
|
|
(Just (fromRef oldtree))
|
|
|
|
(fromRef newtree)
|
|
|
|
(procdiff mdfeeder)
|
|
|
|
Just _ -> void $ updatetodiff g
|
|
|
|
Nothing "--staged"
|
|
|
|
(procdiff mdfeeder)
|
|
|
|
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
liftIO $ writeFile indexcache $ showInodeCache cur
|
|
|
|
-- Storing the tree in a ref makes sure it does not
|
|
|
|
-- get garbage collected, and is available to diff
|
|
|
|
-- against next time.
|
|
|
|
inRepo $ update' lastindexref newtree
|
2021-05-24 15:33:23 +00:00
|
|
|
-- git write-tree will fail if the index is locked or when there is
|
|
|
|
-- a merge conflict. To get up-to-date with the current index,
|
2021-06-07 16:52:36 +00:00
|
|
|
-- diff --staged with the old index tree. The current index tree
|
2021-05-24 15:33:23 +00:00
|
|
|
-- is not known, so not recorded, and the inode cache is not updated,
|
|
|
|
-- so the next time git-annex runs, it will diff again, even
|
|
|
|
-- if the index is unchanged.
|
2021-06-07 16:52:36 +00:00
|
|
|
--
|
|
|
|
-- When there is a merge conflict, that will not see the new local
|
|
|
|
-- version of the files that are conflicted. So a second diff
|
|
|
|
-- is done, with --staged but no old tree.
|
2021-05-24 15:33:23 +00:00
|
|
|
go _ _ Nothing = do
|
|
|
|
oldtree <- getoldtree
|
2021-06-07 18:51:38 +00:00
|
|
|
g <- Annex.gitRepo
|
|
|
|
catstream $ \mdfeeder -> do
|
|
|
|
conflicted <- updatetodiff g
|
|
|
|
(Just (fromRef oldtree)) "--staged" (procdiff mdfeeder)
|
|
|
|
when conflicted $
|
|
|
|
void $ updatetodiff g Nothing "--staged"
|
|
|
|
(procmergeconflictdiff mdfeeder)
|
2021-06-07 16:52:36 +00:00
|
|
|
|
2021-06-07 18:51:38 +00:00
|
|
|
updatetodiff g old new processor = do
|
|
|
|
(l, cleanup) <- pipeNullSplit' (diff old new) g
|
|
|
|
processor l False
|
|
|
|
`finally` void cleanup
|
2018-08-22 17:04:12 +00:00
|
|
|
|
2021-05-24 19:31:06 +00:00
|
|
|
-- Avoid running smudge clean filter, which would block trying to
|
|
|
|
-- access the locked database. git write-tree sometimes calls it,
|
|
|
|
-- even though it is not adding work tree files to the index,
|
|
|
|
-- and so the filter cannot have an effect on the contents of the
|
|
|
|
-- index or on the tree that gets written from it.
|
|
|
|
getindextree = inRepo $ \r -> writeTreeQuiet $ r
|
|
|
|
{ gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
|
|
|
|
|
2021-05-24 15:33:23 +00:00
|
|
|
diff old new =
|
2021-05-24 19:31:06 +00:00
|
|
|
-- Avoid running smudge clean filter, since we want the
|
|
|
|
-- raw output, and it would block trying to access the
|
2018-09-13 17:55:25 +00:00
|
|
|
-- locked database. The --raw normally avoids git diff
|
|
|
|
-- running them, but older versions of git need this.
|
2021-01-04 17:12:28 +00:00
|
|
|
bypassSmudgeConfig ++
|
|
|
|
-- Avoid using external diff command, which would be slow.
|
|
|
|
-- (The -G option may make it be used otherwise.)
|
|
|
|
[ Param "-c", Param "diff.external="
|
2018-08-21 20:48:20 +00:00
|
|
|
, Param "diff"
|
2021-06-07 16:52:36 +00:00
|
|
|
] ++ maybeToList (Param <$> old) ++
|
|
|
|
[ Param new
|
2018-08-21 20:48:20 +00:00
|
|
|
, Param "--raw"
|
|
|
|
, Param "-z"
|
2020-01-07 16:29:37 +00:00
|
|
|
, Param "--no-abbrev"
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
-- Optimization: Limit to pointer files and annex symlinks.
|
|
|
|
-- This is not perfect. A file could contain with this and not
|
|
|
|
-- be a pointer file. And a pointer file that is replaced with
|
|
|
|
-- a non-pointer file will match this. This is only a
|
|
|
|
-- prefilter so that's ok.
|
|
|
|
, Param $ "-G" ++ fromRawFilePath (toInternalGitPath $
|
2019-12-18 20:45:03 +00:00
|
|
|
P.pathSeparator `S.cons` objectDir')
|
2018-08-21 20:48:20 +00:00
|
|
|
-- Disable rename detection.
|
|
|
|
, Param "--no-renames"
|
|
|
|
-- Avoid other complications.
|
|
|
|
, Param "--ignore-submodules=all"
|
|
|
|
, Param "--no-ext-diff"
|
|
|
|
]
|
|
|
|
|
2021-06-07 18:51:38 +00:00
|
|
|
procdiff mdfeeder (info:file:rest) conflicted
|
2020-04-07 17:27:11 +00:00
|
|
|
| ":" `S.isPrefixOf` info = case S8.words info of
|
2021-06-01 15:24:15 +00:00
|
|
|
(_colonsrcmode:dstmode:srcsha:dstsha:status:[]) -> do
|
2021-06-07 16:52:36 +00:00
|
|
|
let conflicted' = status == "U"
|
2021-06-01 15:24:15 +00:00
|
|
|
-- avoid removing associated file when
|
|
|
|
-- there is a merge conflict
|
2021-06-07 18:51:38 +00:00
|
|
|
unless conflicted' $
|
|
|
|
send mdfeeder (Ref srcsha) $ \case
|
2021-06-01 15:24:15 +00:00
|
|
|
Just oldkey -> do
|
|
|
|
liftIO $ SQL.removeAssociatedFile oldkey
|
|
|
|
(asTopFilePath file)
|
|
|
|
(SQL.WriteHandle qh)
|
|
|
|
return True
|
|
|
|
Nothing -> return False
|
2021-06-07 18:51:38 +00:00
|
|
|
send mdfeeder (Ref dstsha) $ \case
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
Just key -> do
|
|
|
|
liftIO $ SQL.addAssociatedFile key
|
|
|
|
(asTopFilePath file)
|
|
|
|
(SQL.WriteHandle qh)
|
|
|
|
when (dstmode /= fmtTreeItemType TreeSymlink) $
|
|
|
|
reconcilerace (asTopFilePath file) key
|
|
|
|
return True
|
|
|
|
Nothing -> return False
|
2021-06-07 18:51:38 +00:00
|
|
|
procdiff mdfeeder rest
|
2021-06-07 16:52:36 +00:00
|
|
|
(conflicted || conflicted')
|
2021-06-07 18:51:38 +00:00
|
|
|
_ -> return conflicted -- parse failed
|
|
|
|
procdiff _ _ conflicted = return conflicted
|
|
|
|
|
2021-06-07 16:52:36 +00:00
|
|
|
-- Processing a diff --index when there is a merge conflict.
|
|
|
|
-- This diff will have the new local version of a file as the
|
|
|
|
-- first sha, and a null sha as the second sha, and we only
|
|
|
|
-- care about files that are in conflict.
|
2021-06-07 18:51:38 +00:00
|
|
|
procmergeconflictdiff mdfeeder (info:file:rest) conflicted
|
2021-06-07 16:52:36 +00:00
|
|
|
| ":" `S.isPrefixOf` info = case S8.words info of
|
|
|
|
(_colonmode:_mode:sha:_sha:status:[]) -> do
|
2021-06-07 18:51:38 +00:00
|
|
|
send mdfeeder (Ref sha) $ \case
|
2021-06-07 16:52:36 +00:00
|
|
|
Just key -> do
|
|
|
|
liftIO $ SQL.addAssociatedFile key
|
|
|
|
(asTopFilePath file)
|
|
|
|
(SQL.WriteHandle qh)
|
|
|
|
return True
|
|
|
|
Nothing -> return False
|
2021-06-07 18:51:38 +00:00
|
|
|
let conflicted' = status == "U"
|
|
|
|
procmergeconflictdiff mdfeeder rest
|
2021-06-07 16:52:36 +00:00
|
|
|
(conflicted || conflicted')
|
2021-06-07 18:51:38 +00:00
|
|
|
_ -> return conflicted -- parse failed
|
|
|
|
procmergeconflictdiff _ _ conflicted = return conflicted
|
2018-08-21 20:48:20 +00:00
|
|
|
|
include locked files in the keys database associated files
Before only unlocked files were included.
The initial scan now scans for locked as well as unlocked files. This
does mean it gets a little bit slower, although I optimised it as well
as I think it can be.
reconcileStaged changed to diff from the current index to the tree of
the previous index. This lets it handle deletions as well, removing
associated files for both locked and unlocked files, which did not
always happen before.
On upgrade, there will be no recorded previous tree, so it will diff
from the empty tree to current index, and so will fully populate the
associated files, as well as removing any stale associated files
that were present due to them not being removed before.
reconcileStaged now does a bit more work. Most of the time, this will
just be due to running more often, after some change is made to the
index, and since there will be few changes since the last time, it will
not be a noticable overhead. What may turn out to be a noticable
slowdown is after changing to a branch, it has to go through the diff
from the previous index to the new one, and if there are lots of
changes, that could take a long time. Also, after adding a lot of files,
or deleting a lot of files, or moving a large subdirectory, etc.
Command.Lock used removeAssociatedFile, but now that's wrong because a
newly locked file still needs to have its associated file tracked.
Command.Rekey used removeAssociatedFile when the file was unlocked.
It could remove it also when it's locked, but it is not really
necessary, because it changes the index, and so the next time git-annex
run and accesses the keys db, reconcileStaged will run and update it.
There are probably several other places that use addAssociatedFile and
don't need to any more for similar reasons. But there's no harm in
keeping them, and it probably is a good idea to, if only to support
mixing this with older versions of git-annex.
However, mixing this and older versions does risk reconcileStaged not
running, if the older version already ran it on a given index state. So
it's not a good idea to mix versions. This problem could be dealt with
by changing the name of the gitAnnexKeysDbIndexCache, but that would
leave the old file dangling, or it would need to keep trying to remove
it.
2021-05-21 19:47:37 +00:00
|
|
|
reconcilerace file key = do
|
2019-10-29 16:28:01 +00:00
|
|
|
caches <- liftIO $ SQL.getInodeCaches key (SQL.ReadHandle qh)
|
2018-08-22 19:28:57 +00:00
|
|
|
keyloc <- calcRepo (gitAnnexLocation key)
|
|
|
|
keypopulated <- sameInodeCache keyloc caches
|
2019-12-09 17:49:05 +00:00
|
|
|
p <- fromRepo $ fromTopFilePath file
|
2019-12-11 18:12:22 +00:00
|
|
|
filepopulated <- sameInodeCache p caches
|
2018-08-22 19:28:57 +00:00
|
|
|
case (keypopulated, filepopulated) of
|
|
|
|
(True, False) ->
|
2019-12-11 18:12:22 +00:00
|
|
|
populatePointerFile (Restage True) key keyloc p >>= \case
|
2018-08-22 19:28:57 +00:00
|
|
|
Nothing -> return ()
|
|
|
|
Just ic -> liftIO $
|
2019-10-29 16:28:01 +00:00
|
|
|
SQL.addInodeCaches key [ic] (SQL.WriteHandle qh)
|
2018-08-22 19:28:57 +00:00
|
|
|
(False, True) -> depopulatePointerFile key p
|
|
|
|
_ -> return ()
|
2021-06-07 18:51:38 +00:00
|
|
|
|
|
|
|
send :: ((Maybe Key -> Annex a, Ref) -> IO ()) -> Ref -> (Maybe Key -> Annex a) -> IO ()
|
|
|
|
send feeder r withk = feeder (withk, r)
|
|
|
|
|
|
|
|
-- Streaming through git cat-file like this is significantly
|
|
|
|
-- faster than using catKey.
|
|
|
|
catstream a = do
|
|
|
|
g <- Annex.gitRepo
|
|
|
|
catObjectMetaDataStream g $ \mdfeeder mdcloser mdreader ->
|
|
|
|
catObjectStream g $ \catfeeder catcloser catreader -> do
|
|
|
|
feedt <- liftIO $ async $
|
|
|
|
a mdfeeder
|
|
|
|
`finally` void mdcloser
|
|
|
|
proct <- liftIO $ async $
|
|
|
|
procthread mdreader catfeeder
|
|
|
|
`finally` void catcloser
|
|
|
|
dbchanged <- dbwriter False catreader
|
|
|
|
-- Flush database changes now
|
|
|
|
-- so other processes can see them.
|
|
|
|
when dbchanged $
|
|
|
|
liftIO $ H.flushDbQueue qh
|
|
|
|
() <- liftIO $ wait feedt
|
|
|
|
liftIO $ wait proct
|
|
|
|
return ()
|
|
|
|
where
|
|
|
|
procthread mdreader catfeeder = mdreader >>= \case
|
|
|
|
Just (ka, Just (sha, size, _type))
|
|
|
|
| size < maxPointerSz -> do
|
|
|
|
() <- catfeeder (ka, sha)
|
|
|
|
procthread mdreader catfeeder
|
|
|
|
Just _ -> procthread mdreader catfeeder
|
|
|
|
Nothing -> return ()
|
|
|
|
|
|
|
|
dbwriter dbchanged catreader = liftIO catreader >>= \case
|
|
|
|
Just (ka, content) -> do
|
|
|
|
changed <- ka (parseLinkTargetOrPointerLazy =<< content)
|
|
|
|
dbwriter (dbchanged || changed) catreader
|
|
|
|
Nothing -> return dbchanged
|