]> dgit.raspbian.org Git - git-annex.git/commitdiff
NoLiveExport for export and import
authorJoey Hess <joeyh@joeyh.name>
Sat, 24 Aug 2024 13:19:12 +0000 (09:19 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 24 Aug 2024 13:19:12 +0000 (09:19 -0400)
While these do check preferred content, it would not make sense to use
balanced preferred content with them.

Command/Export.hs
Command/Import.hs

index 3419dd1d8195d356487863e108590da3269500f3..ebbcb51ea8ab1c4916965c02186b8094cb1f9d81 100644 (file)
@@ -385,7 +385,7 @@ cleanupExport :: Remote -> ExportHandle -> Key -> ExportLocation -> Bool -> Comm
 cleanupExport r db ek loc sent = do
        liftIO $ addExportedLocation db ek loc
        when (sent && not (isGitShaKey ek)) $
-               logChange ek (uuid r) InfoPresent
+               logChange NoLiveUpdate ek (uuid r) InfoPresent
        return True
 
 startUnexport :: Remote -> ExportHandle -> TopFilePath -> [Git.Sha] -> CommandStart
@@ -436,9 +436,9 @@ cleanupUnexport r db eks loc = do
                                if annexObjects (Remote.config r)
                                        then tryNonAsync (checkPresent r ek) >>= \case
                                                Right False ->
-                                                       logChange ek (uuid r) InfoMissing
+                                                       logChange NoLiveUpdate ek (uuid r) InfoMissing
                                                _ -> noop
-                                       else logChange ek (uuid r) InfoMissing
+                                       else logChange NoLiveUpdate ek (uuid r) InfoMissing
        
        removeEmptyDirectories r db loc eks
 
@@ -618,7 +618,7 @@ filterExport r tree = logExportExcluded (uuid r) $ \logwriter -> do
                                , providedMimeEncoding = Nothing
                                , providedLinkType = Nothing
                                }
-                       ifM (checkMatcher' matcher mi mempty)
+                       ifM (checkMatcher' matcher mi NoLiveUpdate mempty)
                                ( return (Just ti)
                                , excluded
                                )
index 05dd07105b9398066daab6fcfff0fda34e625d96..c7496aeebf2d8aa6b11b16122fbfff6979ff0bb8 100644 (file)
@@ -256,7 +256,7 @@ startLocal o addunlockedmatcher largematcher mode (srcfile, destfile) =
                                , inodeCache = newcache
                                }
                        }
-               ifM (checkFileMatcher largematcher destfile)
+               ifM (checkFileMatcher NoLiveUpdate largematcher destfile)
                        ( ingestAdd' nullMeterUpdate (Just ld') (Just k)
                                >>= maybe
                                        stop