diff --git a/Annex/Cluster.hs b/Annex/Cluster.hs index 2faa7c5056..f3283094d3 100644 --- a/Annex/Cluster.hs +++ b/Annex/Cluster.hs @@ -18,6 +18,7 @@ import P2P.Protocol import P2P.IO import Annex.Proxy import Annex.UUID +import Annex.BranchState import Logs.Location import Logs.PreferredContent import Types.Command @@ -38,6 +39,7 @@ proxyCluster -> (forall a. Annex () -> ((a -> CommandPerform) -> Annex (Either ProtoFailure a) -> CommandPerform)) -> CommandPerform proxyCluster clusteruuid proxydone servermode clientside protoerrhandler = do + enableInteractiveBranchAccess getClientProtocolVersion (fromClusterUUID clusteruuid) clientside withclientversion (protoerrhandler noop) where diff --git a/P2P/Http/State.hs b/P2P/Http/State.hs index 899584a52b..6877cea7d3 100644 --- a/P2P/Http/State.hs +++ b/P2P/Http/State.hs @@ -25,6 +25,7 @@ import Annex.UUID import Types.NumCopies import Types.WorkerPool import Annex.WorkerPool +import Annex.BranchState import Types.Cluster import CmdLine.Action (startConcurrency) import Utility.ThreadScheduler @@ -185,6 +186,7 @@ withP2PConnections -> (AcquireP2PConnection -> Annex a) -> Annex a withP2PConnections workerpool proxyconnectionpoolsize clusterconcurrency a = do + enableInteractiveBranchAccess myuuid <- getUUID reqv <- liftIO newEmptyTMVarIO relv <- liftIO newEmptyTMVarIO