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

move global options handling closer to Command definitions

Browse source
This commit is contained in:
Joey Hess 2021-02-02 15:55:45 -04:00
parent 4cc65d97fc
commit e78d2c9642
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CmdLine/GitAnnex.hs
View file

@ -126,7 +126,7 @@ import qualified Command.TestRemote
import qualified Command.Benchmark
cmds :: Parser TestOptions -> TestRunner -> MkBenchmarkGenerator -> [Command]
cmds testoptparser testrunner mkbenchmarkgenerator =
cmds testoptparser testrunner mkbenchmarkgenerator = map addGitAnnexGlobalOptions $
[ Command.Help.cmd
, Command.Add.cmd
, Command.Get.cmd
@ -237,12 +237,15 @@ cmds testoptparser testrunner mkbenchmarkgenerator =
mkbenchmarkgenerator $ cmds testoptparser testrunner (\_ _ -> return noop)
]
addGitAnnexGlobalOptions :: Command -> Command
addGitAnnexGlobalOptions c = c { cmdglobaloptions = gitAnnexGlobalOptions ++ cmdglobaloptions c }
run :: Parser TestOptions -> TestRunner -> MkBenchmarkGenerator -> [String] -> IO ()
run testoptparser testrunner mkbenchmarkgenerator args = go envmodes
where
go [] = dispatch True args
(cmds testoptparser testrunner mkbenchmarkgenerator)
gitAnnexGlobalOptions [] Git.CurrentRepo.get
[] Git.CurrentRepo.get
"git-annex"
"manage files with git, without checking their contents in"
go ((v, a):rest) = maybe (go rest) a =<< getEnv v

11
CmdLine/GitAnnexShell.hs
View file

@ -40,7 +40,7 @@ cmdsMap = M.fromList $ map mk
, (ServeReadWrite, allcmds)
]
where
readonlycmds =
readonlycmds = map addGlobalOptions
[ Command.ConfigList.cmd
, gitAnnexShellCheck Command.InAnnex.cmd
, gitAnnexShellCheck Command.LockContent.cmd
@ -51,11 +51,11 @@ cmdsMap = M.fromList $ map mk
-- determine the security policy to use
, gitAnnexShellCheck Command.P2PStdIO.cmd
]
appendcmds = readonlycmds ++
appendcmds = readonlycmds ++ map addGlobalOptions
[ gitAnnexShellCheck Command.RecvKey.cmd
, gitAnnexShellCheck Command.Commit.cmd
]
allcmds =
allcmds = map addGlobalOptions
[ gitAnnexShellCheck Command.DropKey.cmd
, Command.GCryptSetup.cmd
]
@ -69,6 +69,9 @@ cmdsFor = fromMaybe [] . flip M.lookup cmdsMap
cmdsList :: [Command]
cmdsList = concat $ M.elems cmdsMap
addGlobalOptions :: Command -> Command
addGlobalOptions c = c { cmdglobaloptions = globalOptions ++ cmdglobaloptions c }
globalOptions :: [GlobalOption]
globalOptions =
globalSetter checkUUID (strOption
@ -119,7 +122,7 @@ builtin cmd dir params = do
let (params', fieldparams, opts) = partitionParams params
rsyncopts = ("RsyncOptions", unwords opts)
fields = rsyncopts : filter checkField (parseFields fieldparams)
dispatch False (cmd : params') cmdsList globalOptions fields mkrepo
dispatch False (cmd : params') cmdsList fields mkrepo
"git-annex-shell"
"Restricted login shell for git-annex only SSH access"
where