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

indent

Browse source
This commit is contained in:
Joey Hess 2016-03-11 14:46:54 -04:00
parent ec8eba18ad
commit 3c4ad3eeca
Failed to extract signature
1 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Git/Tree.hs
View file

@ -128,27 +128,26 @@ adjustTree adjusttreeitem addtreeitems r repo = withMkTreeHandle repo $ \h -> do
where where
go _ wasmodified c _ [] = return (c, wasmodified, []) go _ wasmodified c _ [] = return (c, wasmodified, [])
go h wasmodified c intree (i:is) go h wasmodified c intree (i:is)
| intree i = | intree i = case readObjectType (LsTree.typeobj i) of
case readObjectType (LsTree.typeobj i) of Just BlobObject -> do
Just BlobObject -> do let ti = TreeItem (LsTree.file i) (LsTree.mode i) (LsTree.sha i)
let ti = TreeItem (LsTree.file i) (LsTree.mode i) (LsTree.sha i) v <- adjusttreeitem ti
v <- adjusttreeitem ti case v of
case v of Nothing -> go h True c intree is
Nothing -> go h True c intree is Just ti'@(TreeItem f m s) ->
Just ti'@(TreeItem f m s) -> let !modified = wasmodified || ti' /= ti
let !modified = wasmodified || ti' /= ti blob = TreeBlob f m s
blob = TreeBlob f m s in go h modified (blob:c) intree is
in go h modified (blob:c) intree is Just TreeObject -> do
Just TreeObject -> do (sl, modified, is') <- go h False [] (beneathSubTree i) is
(sl, modified, is') <- go h False [] (beneathSubTree i) is let added = filter (inTree i) addtreeitems
let added = filter (inSubTree i) addtreeitems subtree <- if modified || not (null added)
subtree <- if modified || not (null added) then liftIO $ recordSubTree h $ NewSubTree (LsTree.file i)
then liftIO $ recordSubTree h $ NewSubTree (LsTree.file i) (map treeItemToTreeContent added ++ sl)
(map treeItemToTreeContent added ++ sl) else return $ RecordedSubTree (LsTree.file i) (LsTree.sha i) []
else return $ RecordedSubTree (LsTree.file i) (LsTree.sha i) [] let !modified' = modified || wasmodified
let !modified' = modified || wasmodified go h modified' (subtree : c) intree is'
go h modified' (subtree : c) intree is' _ -> error ("unexpected object type \"" ++ LsTree.typeobj i ++ "\"")
_ -> error ("unexpected object type \"" ++ LsTree.typeobj i ++ "\"")
| otherwise = return (c, wasmodified, i:is) | otherwise = return (c, wasmodified, i:is)
{- Assumes the list is ordered, with tree objects coming right before their {- Assumes the list is ordered, with tree objects coming right before their
@ -161,17 +160,16 @@ extractTree l = case go [] inTopTree l of
where where
go t _ [] = Right (t, []) go t _ [] = Right (t, [])
go t intree (i:is) go t intree (i:is)
| intree i = | intree i = case readObjectType (LsTree.typeobj i) of
case readObjectType (LsTree.typeobj i) of Just BlobObject ->
Just BlobObject -> let b = TreeBlob (LsTree.file i) (LsTree.mode i) (LsTree.sha i)
let b = TreeBlob (LsTree.file i) (LsTree.mode i) (LsTree.sha i) in go (b:t) intree is
in go (b:t) intree is Just TreeObject -> case go [] (beneathSubTree i) is of
Just TreeObject -> case go [] (beneathSubTree i) is of Right (subtree, is') ->
Right (subtree, is') -> let st = RecordedSubTree (LsTree.file i) (LsTree.sha i) subtree
let st = RecordedSubTree (LsTree.file i) (LsTree.sha i) subtree in go (st:t) intree is'
in go (st:t) intree is' Left e -> Left e
Left e -> Left e _ -> parseerr ("unexpected object type \"" ++ LsTree.typeobj i ++ "\"")
_ -> parseerr ("unexpected object type \"" ++ LsTree.typeobj i ++ "\"")
| otherwise = Right (t, i:is) | otherwise = Right (t, i:is)
parseerr = Left parseerr = Left
@ -185,5 +183,5 @@ beneathSubTree t =
let prefix = getTopFilePath (LsTree.file t) ++ "/" let prefix = getTopFilePath (LsTree.file t) ++ "/"
in (\i -> prefix `isPrefixOf` getTopFilePath (LsTree.file i)) in (\i -> prefix `isPrefixOf` getTopFilePath (LsTree.file i))
inSubTree :: LsTree.TreeItem -> TreeItem -> Bool inTree :: LsTree.TreeItem -> TreeItem -> Bool
inSubTree t (TreeItem f _ _) = takeDirectory (getTopFilePath f) == takeDirectory (getTopFilePath (LsTree.file t)) inTree t (TreeItem f _ _) = takeDirectory (getTopFilePath f) == takeDirectory (getTopFilePath (LsTree.file t))