05989556a2
This adds a separate journal, which does not currently get committed to an index, but is planned to be committed to .git/annex/index-private. Changes that are regarding a UUID that is private will get written to this journal, and so will not be published into the git-annex branch. All log writing should have been made to indicate the UUID it's regarding, though I've not verified this yet. Currently, no UUIDs are treated as private yet, a way to configure that is needed. The implementation is careful to not add any additional IO work when privateUUIDsKnown is False. It will skip looking at the private journal at all. So this should be free, or nearly so, unless the feature is used. When it is used, all branch reads will be about twice as expensive. It is very lucky -- or very prudent design -- that Annex.Branch.change and maybeChange are the only ways to change a file on the branch, and Annex.Branch.set is only internal use. That let Annex.Branch.get always yield any private information that has been recorded, without the risk that Annex.Branch.set might be called, with a non-private UUID, and end up leaking the private information into the git-annex branch. And, this relies on the way git-annex union merges the git-annex branch. When reading a file, there can be a public and a private version, and they are just concacenated together. That will be handled the same as if there were two diverged git-annex branches that got union merged.
56 lines
1.4 KiB
Haskell
56 lines
1.4 KiB
Haskell
{- git-annex remote log
|
|
-
|
|
- Copyright 2011-2020 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Logs.Remote (
|
|
remoteLog,
|
|
remoteConfigMap,
|
|
readRemoteLog,
|
|
configSet,
|
|
keyValToConfig,
|
|
configToKeyVal,
|
|
showConfig,
|
|
|
|
prop_isomorphic_configEscape,
|
|
prop_parse_show_Config,
|
|
) where
|
|
|
|
import Annex.Common
|
|
import qualified Annex
|
|
import qualified Annex.Branch
|
|
import Types.Remote
|
|
import Logs
|
|
import Logs.UUIDBased
|
|
import Logs.Remote.Pure
|
|
import Annex.SpecialRemote.Config
|
|
|
|
import qualified Data.Map as M
|
|
|
|
{- Adds or updates a remote's config in the log. -}
|
|
configSet :: UUID -> RemoteConfig -> Annex ()
|
|
configSet u cfg = do
|
|
c <- currentVectorClock
|
|
Annex.Branch.change (Annex.Branch.RegardingUUID [u]) remoteLog $
|
|
buildRemoteConfigLog
|
|
. changeLog c u (removeSameasInherited cfg)
|
|
. parseRemoteConfigLog
|
|
Annex.changeState $ \s -> s { Annex.remoteconfigmap = Nothing }
|
|
|
|
{- Map of remotes by uuid containing key/value config maps.
|
|
- Cached for speed. -}
|
|
remoteConfigMap :: Annex (M.Map UUID RemoteConfig)
|
|
remoteConfigMap = maybe remoteConfigMapLoad return
|
|
=<< Annex.getState Annex.remoteconfigmap
|
|
|
|
remoteConfigMapLoad :: Annex (M.Map UUID RemoteConfig)
|
|
remoteConfigMapLoad = do
|
|
m <- readRemoteLog
|
|
Annex.changeState $ \s -> s { Annex.remoteconfigmap = Just m }
|
|
return m
|
|
|
|
readRemoteLog :: Annex (M.Map UUID RemoteConfig)
|
|
readRemoteLog = calcRemoteConfigMap
|
|
<$> Annex.Branch.get remoteLog
|