
* unannex, uninit: Avoid committing after every file is unannexed, for massive speedup. * --notify-finish switch will cause desktop notifications after each file upload/download/drop completes (using the dbus Desktop Notifications Specification) * --notify-start switch will show desktop notifications when each file upload/download starts. * webapp: Automatically install Nautilus integration scripts to get and drop files. * tahoe: Pass -d parameter before subcommand; putting it after the subcommand no longer works with tahoe-lafs version 1.10. (Thanks, Alberto Berti) * forget --drop-dead: Avoid removing the dead remote from the trust.log, so that if git remotes for it still exist anywhere, git annex info will still know it's dead and not show it. * git-annex-shell: Make configlist automatically initialize a remote git repository, as long as a git-annex branch has been pushed to it, to simplify setup of remote git repositories, including via gitolite. * add --include-dotfiles: New option, perhaps useful for backups. * Version 5.20140227 broke creation of glacier repositories, not including the datacenter and vault in their configuration. This bug is fixed, but glacier repositories set up with the broken version of git-annex need to have the datacenter and vault set in order to be usable. This can be done using git annex enableremote to add the missing settings. For details, see http://git-annex.branchable.com/bugs/problems_with_glacier/ * Added required content configuration. * assistant: Improve ssh authorized keys line generated in local pairing or for a remote ssh server to set environment variables in an alternative way that works with the non-POSIX fish shell, as well as POSIX shells. # imported from the archive
98 lines
2.7 KiB
Haskell
98 lines
2.7 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2011,2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.InitRemote where
|
|
|
|
import qualified Data.Map as M
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Remote
|
|
import qualified Logs.Remote
|
|
import qualified Types.Remote as R
|
|
import Logs.UUID
|
|
import Logs.Trust
|
|
|
|
import Data.Ord
|
|
|
|
def :: [Command]
|
|
def = [command "initremote"
|
|
(paramPair paramName $ paramOptional $ paramRepeating paramKeyValue)
|
|
seek SectionSetup "creates a special (non-git) remote"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withWords start
|
|
|
|
start :: [String] -> CommandStart
|
|
start [] = error "Specify a name for the remote."
|
|
start (name:ws) = ifM (isJust <$> findExisting name)
|
|
( error $ "There is already a special remote named \"" ++ name ++
|
|
"\". (Use enableremote to enable an existing special remote.)"
|
|
, do
|
|
let c = newConfig name
|
|
t <- findType config
|
|
|
|
showStart "initremote" name
|
|
next $ perform t name $ M.union config c
|
|
)
|
|
where
|
|
config = Logs.Remote.keyValToConfig ws
|
|
|
|
perform :: RemoteType -> String -> R.RemoteConfig -> CommandPerform
|
|
perform t name c = do
|
|
(c', u) <- R.setup t Nothing Nothing c
|
|
next $ cleanup u name c'
|
|
|
|
cleanup :: UUID -> String -> R.RemoteConfig -> CommandCleanup
|
|
cleanup u name c = do
|
|
describeUUID u name
|
|
Logs.Remote.configSet u c
|
|
return True
|
|
|
|
{- See if there's an existing special remote with this name. -}
|
|
findExisting :: String -> Annex (Maybe (UUID, R.RemoteConfig))
|
|
findExisting name = do
|
|
t <- trustMap
|
|
matches <- sortBy (comparing $ \(u, _c) -> M.lookup u t )
|
|
. findByName name
|
|
<$> Logs.Remote.readRemoteLog
|
|
return $ headMaybe matches
|
|
|
|
newConfig :: String -> R.RemoteConfig
|
|
newConfig name = M.singleton nameKey name
|
|
|
|
findByName :: String -> M.Map UUID R.RemoteConfig -> [(UUID, R.RemoteConfig)]
|
|
findByName n = filter (matching . snd) . M.toList
|
|
where
|
|
matching c = case M.lookup nameKey c of
|
|
Nothing -> False
|
|
Just n'
|
|
| n' == n -> True
|
|
| otherwise -> False
|
|
|
|
remoteNames :: Annex [String]
|
|
remoteNames = do
|
|
m <- Logs.Remote.readRemoteLog
|
|
return $ mapMaybe (M.lookup nameKey . snd) $ M.toList m
|
|
|
|
{- find the specified remote type -}
|
|
findType :: R.RemoteConfig -> Annex RemoteType
|
|
findType config = maybe unspecified specified $ M.lookup typeKey config
|
|
where
|
|
unspecified = error "Specify the type of remote with type="
|
|
specified s = case filter (findtype s) Remote.remoteTypes of
|
|
[] -> error $ "Unknown remote type " ++ s
|
|
(t:_) -> return t
|
|
findtype s i = R.typename i == s
|
|
|
|
{- The name of a configured remote is stored in its config using this key. -}
|
|
nameKey :: String
|
|
nameKey = "name"
|
|
|
|
{- The type of a remote is stored in its config using this key. -}
|
|
typeKey :: String
|
|
typeKey = "type"
|