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

fix edge case failure in prop_view_roundtrips

Browse source 
"./" made it fail, because that gets eliminated
This commit is contained in:
Joey Hess 2019-08-16 11:34:01 -04:00
parent fa62c32233
commit e4a8366162
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Annex/View.hs
View file

@ -283,8 +283,12 @@ fromView view f = MetaData $
- MetaFields that were present in the input metadata - MetaFields that were present in the input metadata
- (excluding fields that are not visible). -} - (excluding fields that are not visible). -}
prop_view_roundtrips :: FilePath -> MetaData -> Bool -> Bool prop_view_roundtrips :: FilePath -> MetaData -> Bool -> Bool
prop_view_roundtrips f metadata visible = null f || viewTooLarge view || prop_view_roundtrips f metadata visible = or
all hasfields (viewedFiles view viewedFileFromReference f metadata) [ null f
, null (takeFileName f) && null (takeDirectory f)
, viewTooLarge view
, all hasfields (viewedFiles view viewedFileFromReference f metadata)
]
where where
view = View (Git.Ref "master") $ view = View (Git.Ref "master") $
map (\(mf, mv) -> ViewComponent mf (FilterValues $ S.filter (not . B.null . fromMetaValue) mv) visible) map (\(mf, mv) -> ViewComponent mf (FilterValues $ S.filter (not . B.null . fromMetaValue) mv) visible)