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

info: remove "repository mode"

Browse source 
info: Removed the "repository mode" from its output (including the --json
output) since with the removal of direct mode, there is no repository mode.
This commit is contained in:
Joey Hess 2019-08-29 14:12:22 -04:00
parent c83c82a9c4
commit 4f59ac05b6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -11,6 +11,9 @@ git-annex (7.20190826) UNRELEASED; urgency=medium
* indirect: This command has become a deprecated noop. * indirect: This command has become a deprecated noop.
* proxy: This command is deprecated because it was only needed in direct * proxy: This command is deprecated because it was only needed in direct
mode. (But it continues to work.) mode. (But it continues to work.)
* info: Removed the "repository mode" from its output (including the
--json output) since with the removal of direct mode, there is no
repository mode.
* info: When file matching options are specified when getting * info: When file matching options are specified when getting
info of something other than a directory, they won't have any effect, info of something other than a directory, they won't have any effect,
so error out to avoid confusion. so error out to avoid confusion.

10
Command/Info.hs
View file

@ -226,8 +226,7 @@ selStats fast_stats slow_stats = do
-} -}
global_fast_stats :: [Stat] global_fast_stats :: [Stat]
global_fast_stats = global_fast_stats =
[ repository_mode [ repo_list Trusted
, repo_list Trusted
, repo_list SemiTrusted , repo_list SemiTrusted
, repo_list UnTrusted , repo_list UnTrusted
, transfer_list , transfer_list
@ -315,13 +314,6 @@ showStat s = maybe noop calc =<< s
(lift . showHeader) desc (lift . showHeader) desc
lift . showRaw =<< a lift . showRaw =<< a
repository_mode :: Stat
repository_mode = simpleStat "repository mode" $ lift $
ifM (fromRepo Git.repoIsLocalBare)
( return "bare"
, return "indirect"
)
repo_list :: TrustLevel -> Stat repo_list :: TrustLevel -> Stat
repo_list level = stat n $ nojson $ lift $ do repo_list level = stat n $ nojson $ lift $ do
us <- filter (/= NoUUID) . M.keys us <- filter (/= NoUUID) . M.keys