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

NoLiveExport for export and import

Browse source 
While these do check preferred content, it would not make sense to use
balanced preferred content with them.
This commit is contained in:
Joey Hess 2024-08-24 09:19:12 -04:00
parent c3d40b9ec3
commit 418fbf3f2f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Command/Export.hs
View file

@ -385,7 +385,7 @@ cleanupExport :: Remote -> ExportHandle -> Key -> ExportLocation -> Bool -> Comm
cleanupExport r db ek loc sent = do cleanupExport r db ek loc sent = do
liftIO $ addExportedLocation db ek loc liftIO $ addExportedLocation db ek loc
when (sent && not (isGitShaKey ek)) $ when (sent && not (isGitShaKey ek)) $
logChange ek (uuid r) InfoPresent logChange NoLiveUpdate ek (uuid r) InfoPresent
return True return True
startUnexport :: Remote -> ExportHandle -> TopFilePath -> [Git.Sha] -> CommandStart startUnexport :: Remote -> ExportHandle -> TopFilePath -> [Git.Sha] -> CommandStart
@ -436,9 +436,9 @@ cleanupUnexport r db eks loc = do
if annexObjects (Remote.config r) if annexObjects (Remote.config r)
then tryNonAsync (checkPresent r ek) >>= \case then tryNonAsync (checkPresent r ek) >>= \case
Right False -> Right False ->
logChange ek (uuid r) InfoMissing logChange NoLiveUpdate ek (uuid r) InfoMissing
_ -> noop _ -> noop
else logChange ek (uuid r) InfoMissing else logChange NoLiveUpdate ek (uuid r) InfoMissing
removeEmptyDirectories r db loc eks removeEmptyDirectories r db loc eks
@ -618,7 +618,7 @@ filterExport r tree = logExportExcluded (uuid r) $ \logwriter -> do
, providedMimeEncoding = Nothing , providedMimeEncoding = Nothing
, providedLinkType = Nothing , providedLinkType = Nothing
} }
ifM (checkMatcher' matcher mi mempty) ifM (checkMatcher' matcher mi NoLiveUpdate mempty)
( return (Just ti) ( return (Just ti)
, excluded , excluded
) )

2
Command/Import.hs
View file

@ -256,7 +256,7 @@ startLocal o addunlockedmatcher largematcher mode (srcfile, destfile) =
, inodeCache = newcache , inodeCache = newcache
} }
} }
ifM (checkFileMatcher largematcher destfile) ifM (checkFileMatcher NoLiveUpdate largematcher destfile)
( ingestAdd' nullMeterUpdate (Just ld') (Just k) ( ingestAdd' nullMeterUpdate (Just ld') (Just k)
>>= maybe >>= maybe
stop stop