restage pointer file after unlock
This avoids a later git status or similar taking a long time to run as it runs git-annex smudge once per file. While v9 repositories do avoid that taking long when the files are small, large files can still make git status take a very long time. This does make unlock slower, because now git-annex smudge is being run once per file unlocked. However, the next commit should speed that up in many cases. Sponsored-by: Boyd Stephen Smith Jr. on Patreon
This commit is contained in:
parent
07215cfeb5
commit
c68f52c6a2
2 changed files with 31 additions and 5 deletions
|
@ -1,6 +1,6 @@
|
|||
{- git-annex command
|
||||
-
|
||||
- Copyright 2010-2016 Joey Hess <id@joeyh.name>
|
||||
- Copyright 2010-2022 Joey Hess <id@joeyh.name>
|
||||
-
|
||||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
@ -12,6 +12,8 @@ import Annex.Content
|
|||
import Annex.Perms
|
||||
import Annex.Link
|
||||
import Annex.ReplaceFile
|
||||
import Annex.InodeSentinal
|
||||
import Utility.InodeCache
|
||||
import Git.FilePath
|
||||
import qualified Database.Keys
|
||||
import qualified Utility.RawFilePath as R
|
||||
|
@ -47,7 +49,7 @@ start si file key = ifM (isJust <$> isAnnexLink file)
|
|||
perform :: RawFilePath -> Key -> CommandPerform
|
||||
perform dest key = do
|
||||
destmode <- liftIO $ catchMaybeIO $ fileMode <$> R.getFileStatus dest
|
||||
replaceWorkTreeFile (fromRawFilePath dest) $ \tmp ->
|
||||
destic <- replaceWorkTreeFile (fromRawFilePath dest) $ \tmp -> do
|
||||
ifM (inAnnex key)
|
||||
( do
|
||||
r <- linkFromAnnex' key (toRawFilePath tmp) destmode
|
||||
|
@ -57,10 +59,12 @@ perform dest key = do
|
|||
LinkAnnexFailed -> error "unlock failed"
|
||||
, liftIO $ writePointerFile (toRawFilePath tmp) key destmode
|
||||
)
|
||||
next $ cleanup dest key destmode
|
||||
withTSDelta (liftIO . genInodeCache (toRawFilePath tmp))
|
||||
next $ cleanup dest destic key destmode
|
||||
|
||||
cleanup :: RawFilePath -> Key -> Maybe FileMode -> CommandCleanup
|
||||
cleanup dest key destmode = do
|
||||
cleanup :: RawFilePath -> Maybe InodeCache -> Key -> Maybe FileMode -> CommandCleanup
|
||||
cleanup dest destic key destmode = do
|
||||
stagePointerFile dest destmode =<< hashPointerFile key
|
||||
maybe noop (restagePointerFile (Restage True) dest) destic
|
||||
Database.Keys.addAssociatedFile key =<< inRepo (toTopFilePath dest)
|
||||
return True
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue