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

Merge branch 'master' into exportreeplus

Browse source
This commit is contained in:
Joey Hess 2024-08-02 18:45:44 -04:00
commit 9da2860812
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,6 +1,8 @@
git-annex (10.20240732) UNRELEASED; urgency=medium git-annex (10.20240732) UNRELEASED; urgency=medium
* Avoid loading cluster log at startup. * Avoid loading cluster log at startup.
* Remove debug output (to stderr) accidentially included in
last version.
* Remotes configured with exporttree=yes annexobjects=yes * Remotes configured with exporttree=yes annexobjects=yes
can store objects in .git/annex/objects, as well as an exported tree. can store objects in .git/annex/objects, as well as an exported tree.
* git-remote-annex: Store objects in exportree=yes special remotes * git-remote-annex: Store objects in exportree=yes special remotes

13
Types/GitConfig.hs
View file

@ -29,8 +29,6 @@ module Types.GitConfig (
mkRemoteConfigKey, mkRemoteConfigKey,
) where ) where
import Debug.Trace
import Common import Common
import qualified Git import qualified Git
import qualified Git.Config import qualified Git.Config
@ -495,12 +493,11 @@ extractRemoteGitConfig r remotename = do
, remoteAnnexClusterGateway = fromMaybe [] $ , remoteAnnexClusterGateway = fromMaybe [] $
(mapMaybe (mkClusterUUID . toUUID) . words) (mapMaybe (mkClusterUUID . toUUID) . words)
<$> getmaybe ClusterGatewayField <$> getmaybe ClusterGatewayField
, remoteUrl = traceShow (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) $ , remoteUrl = case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of
case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of Just (ConfigValue b)
Just (ConfigValue b) | B.null b -> Nothing
| B.null b -> Nothing | otherwise -> Just (decodeBS b)
| otherwise -> Just (decodeBS b) _ -> Nothing
_ -> Nothing
, remoteAnnexP2PHttpUrl = , remoteAnnexP2PHttpUrl =
case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey AnnexUrlField)) r of case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey AnnexUrlField)) r of
Just (ConfigValue b) -> Just (ConfigValue b) ->

4
doc/todo/exporttree_remotes_could_store_any_key.mdwn
View file

@ -77,3 +77,7 @@ exporttree=yes special remote R.
So, when calling removeExport, have to also check if the key is present in So, when calling removeExport, have to also check if the key is present in
the objects location. If so, either don't record the key as missing, or the objects location. If so, either don't record the key as missing, or
also remove from the objects location. also remove from the objects location.
---
Implementing in the "exportreeplus" branch --[[Joey]]

3
doc/todo/git-annex_proxies.mdwn
View file

@ -30,7 +30,8 @@ Planned schedule of work:
## work notes ## work notes
* release time * Working on `exportreeplus` branch which is groundwork for proxying to
exporttree=yes special remotes.
## items deferred until later for p2p protocol over http ## items deferred until later for p2p protocol over http