add FIELD?=GLOB to git-annex view usage
And also to vadd usage. Also added some other things to the usage that were omitted before to save space. Adding even FIELD?=GLOB made the git-annex --help list of commands grow too wide for an 80 column display. So, removed the description of parameters from that list of commands. Sponsored-By: Brock Spratlen on Patreon
This commit is contained in:
parent
aa0350ff49
commit
c209e0f643
4 changed files with 4 additions and 9 deletions
|
@ -32,17 +32,13 @@ commandList cmds = concatMap go [minBound..]
|
||||||
cmdline c = concat
|
cmdline c = concat
|
||||||
[ cmdname c
|
[ cmdname c
|
||||||
, namepad (cmdname c)
|
, namepad (cmdname c)
|
||||||
, cmdparamdesc c
|
|
||||||
, descpad (cmdparamdesc c)
|
|
||||||
, cmddesc c
|
, cmddesc c
|
||||||
]
|
]
|
||||||
pad n s = replicate (n - length s) ' '
|
pad n s = replicate (n - length s) ' '
|
||||||
namepad = pad $ longest cmdname + 1
|
namepad = pad $ longest cmdname + 1
|
||||||
descpad = pad $ longest cmdparamdesc + 2
|
|
||||||
longest f = foldl max 0 $ map (length . f) cmds
|
longest f = foldl max 0 $ map (length . f) cmds
|
||||||
scmds = sort cmds
|
scmds = sort cmds
|
||||||
|
|
||||||
|
|
||||||
{- Descriptions of params used in usage messages. -}
|
{- Descriptions of params used in usage messages. -}
|
||||||
paramPaths :: String
|
paramPaths :: String
|
||||||
paramPaths = paramRepeating paramPath -- most often used
|
paramPaths = paramRepeating paramPath -- most often used
|
||||||
|
|
|
@ -66,7 +66,7 @@ noMessages c = c { cmdnomessages = True }
|
||||||
|
|
||||||
{- Adds a fallback action to a command, that will be run if it's used
|
{- Adds a fallback action to a command, that will be run if it's used
|
||||||
- outside a git repository. -}
|
- outside a git repository. -}
|
||||||
noRepo :: (String -> Parser (IO ())) -> Command -> Command
|
noRepo :: (CmdParamsDesc -> Parser (IO ())) -> Command -> Command
|
||||||
noRepo a c = c { cmdnorepo = Just (a (cmdparamdesc c)) }
|
noRepo a c = c { cmdnorepo = Just (a (cmdparamdesc c)) }
|
||||||
|
|
||||||
{- Adds Annex options to a command. -}
|
{- Adds Annex options to a command. -}
|
||||||
|
|
|
@ -10,14 +10,13 @@ module Command.VAdd where
|
||||||
import Command
|
import Command
|
||||||
import qualified Annex
|
import qualified Annex
|
||||||
import Annex.View
|
import Annex.View
|
||||||
import Command.View (checkoutViewBranch)
|
import Command.View (checkoutViewBranch, paramView)
|
||||||
|
|
||||||
cmd :: Command
|
cmd :: Command
|
||||||
cmd = notBareRepo $
|
cmd = notBareRepo $
|
||||||
command "vadd" SectionMetaData
|
command "vadd" SectionMetaData
|
||||||
"add subdirs to current view"
|
"add subdirs to current view"
|
||||||
(paramRepeating "FIELD=GLOB")
|
paramView (withParams seek)
|
||||||
(withParams seek)
|
|
||||||
|
|
||||||
seek :: CmdParams -> CommandSeek
|
seek :: CmdParams -> CommandSeek
|
||||||
seek = withWords (commandAction . start)
|
seek = withWords (commandAction . start)
|
||||||
|
|
|
@ -78,7 +78,7 @@ perform view = do
|
||||||
next $ checkoutViewBranch view applyView
|
next $ checkoutViewBranch view applyView
|
||||||
|
|
||||||
paramView :: String
|
paramView :: String
|
||||||
paramView = paramRepeating "FIELD=VALUE"
|
paramView = paramRepeating "TAG FIELD=GLOB ?TAG FIELD?=GLOB FIELD!=VALUE"
|
||||||
|
|
||||||
mkView :: [String] -> Annex View
|
mkView :: [String] -> Annex View
|
||||||
mkView ps = go =<< inRepo Git.Branch.current
|
mkView ps = go =<< inRepo Git.Branch.current
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue