add annex-proxied
This makes git-annex sync and similar not treat proxied remotes as git syncable remotes. Also, display in git-annex info remote when the remote is proxied.
This commit is contained in:
parent
0c111fc96a
commit
b8016eeb65
7 changed files with 31 additions and 14 deletions
|
@ -388,6 +388,7 @@ data RemoteGitConfig = RemoteGitConfig
|
|||
, remoteAnnexMaxGitBundles :: Int
|
||||
, remoteAnnexAllowEncryptedGitRepo :: Bool
|
||||
, remoteAnnexProxy :: Bool
|
||||
, remoteAnnexProxied :: Bool
|
||||
, remoteAnnexClusterNode :: Maybe [RemoteName]
|
||||
, remoteUrl :: Maybe String
|
||||
|
||||
|
@ -474,6 +475,7 @@ extractRemoteGitConfig r remotename = do
|
|||
, remoteAnnexAllowEncryptedGitRepo =
|
||||
getbool AllowEncryptedGitRepoField False
|
||||
, remoteAnnexProxy = getbool ProxyField False
|
||||
, remoteAnnexProxied = getbool ProxiedField False
|
||||
, remoteAnnexClusterNode =
|
||||
(filter isLegalName . words)
|
||||
<$> getmaybe ClusterNodeField
|
||||
|
@ -554,6 +556,7 @@ data RemoteGitConfigField
|
|||
| MaxGitBundlesField
|
||||
| AllowEncryptedGitRepoField
|
||||
| ProxyField
|
||||
| ProxiedField
|
||||
| ClusterNodeField
|
||||
| UrlField
|
||||
| ShellField
|
||||
|
@ -619,6 +622,7 @@ remoteGitConfigField = \case
|
|||
AllowEncryptedGitRepoField -> inherited "allow-encrypted-gitrepo"
|
||||
-- Allow proxy chains.
|
||||
ProxyField -> inherited "proxy"
|
||||
ProxiedField -> uninherited "proxied"
|
||||
ClusterNodeField -> uninherited "cluster-node"
|
||||
UrlField -> uninherited "url"
|
||||
ShellField -> inherited "shell"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue