From cf7fec4b463850c4ce4eec0a885f719ab14a1f0f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 May 2013 14:54:59 -0400 Subject: [PATCH] list standard groups in vicfg --- Command/Vicfg.hs | 10 +++++++--- .../wishlist:_vicfg_possible_repo_group_names.mdwn | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs index ad0fa02011..b176e55973 100644 --- a/Command/Vicfg.hs +++ b/Command/Vicfg.hs @@ -21,6 +21,7 @@ import Types.Group import Logs.Trust import Logs.Group import Logs.PreferredContent +import Types.StandardGroups import Remote def :: [Command] @@ -94,20 +95,23 @@ genCfg cfg descs = unlines $ concat [intro, trust, groups, preferredcontent] trust = settings cfgTrustMap [ "" , com "Repository trust configuration" - , com "(Valid trust levels: " ++ - unwords (map showTrustLevel [Trusted .. DeadTrusted]) ++ - ")" + , com "(Valid trust levels: " ++ trustlevels ++ ")" ] (\(t, u) -> line "trust" u $ showTrustLevel t) (\u -> lcom $ line "trust" u $ showTrustLevel SemiTrusted) + where + trustlevels = unwords $ map showTrustLevel [Trusted .. DeadTrusted] groups = settings cfgGroupMap [ "" , com "Repository groups" + , com $ "(Standard groups: " ++ grouplist ++ ")" , com "(Separate group names with spaces)" ] (\(s, u) -> line "group" u $ unwords $ S.toList s) (\u -> lcom $ line "group" u "") + where + grouplist = unwords $ map fromStandardGroup [minBound..] preferredcontent = settings cfgPreferredContentMap [ "" diff --git a/doc/todo/wishlist:_vicfg_possible_repo_group_names.mdwn b/doc/todo/wishlist:_vicfg_possible_repo_group_names.mdwn index d535069621..e30cc619af 100644 --- a/doc/todo/wishlist:_vicfg_possible_repo_group_names.mdwn +++ b/doc/todo/wishlist:_vicfg_possible_repo_group_names.mdwn @@ -13,3 +13,4 @@ The same is not currently done for repository groups Thanks. +> [[done]] --[[Joey]]