mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid recomputing every time on git inputs

Browse source
This commit is contained in:
Joey Hess 2025-03-03 14:56:49 -04:00
parent a0d6a6ea2a
commit b01a0d2323
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Command/Recompute.hs
View file

@ -13,8 +13,10 @@ import Command
import qualified Remote.Compute import qualified Remote.Compute
import qualified Remote import qualified Remote
import qualified Types.Remote as Remote import qualified Types.Remote as Remote
import qualified Git.Ref as Git
import Annex.Content import Annex.Content
import Annex.CatFile import Annex.CatFile
import Annex.GitShaKey
import Git.FilePath import Git.FilePath
import Logs.Location import Logs.Location
import Command.AddComputed (Reproducible(..), parseReproducible, getInputContent, getInputContent', addComputed) import Command.AddComputed (Reproducible(..), parseReproducible, getInputContent, getInputContent', addComputed)
@ -93,17 +95,25 @@ start' o r si file key =
inputchanged state (inputfile, inputkey) = do inputchanged state (inputfile, inputkey) = do
-- Note that the paths from the remote state are not to be -- Note that the paths from the remote state are not to be
-- trusted to point to a file in the repository, but using -- trusted to point to a file in the repository, but using
-- the path with catKeyFile will only succeed if it -- the path with git cat-file will only succeed if it
-- is checked into the repository. -- is checked into the repository.
p <- fromRepo $ fromTopFilePath $ asTopFilePath $ p <- fromRepo $ fromTopFilePath $ asTopFilePath $
Remote.Compute.computeSubdir state </> inputfile Remote.Compute.computeSubdir state </> inputfile
catKeyFile p >>= return . \case case keyGitSha inputkey of
Just k -> k /= inputkey Nothing ->
-- When an input file is missing, go ahead and catKeyFile p >>= return . \case
-- recompute. This way, the user will see the Just k -> k /= inputkey
-- computation fail, with an error message that Nothing -> inputfilemissing
-- explains the problem. Just inputgitsha -> inRepo (Git.fileRef p) >>= \case
Nothing -> True Just fileref -> catObjectMetaData fileref >>= return . \case
Just (sha, _, _) -> sha /= inputgitsha
Nothing -> inputfilemissing
Nothing -> return inputfilemissing
-- When an input file is missing, go ahead and recompute. This way,
-- the user will see the computation fail, with an error message that
-- explains the problem.
inputfilemissing = True
perform :: RecomputeOptions -> Remote -> OsPath -> Key -> Remote.Compute.ComputeState -> CommandPerform perform :: RecomputeOptions -> Remote -> OsPath -> Key -> Remote.Compute.ComputeState -> CommandPerform
perform o r file origkey origstate = do perform o r file origkey origstate = do