Permalink
Browse files

Updated to use filestore 0.6 (new diff API).

Thanks to markwright for partial patch.
  • Loading branch information...
1 parent bb7bf4f commit 7af6eb9721576fd1d6fbb83dcc1a6374ca894f4e John MacFarlane committed Dec 31, 2012
Showing with 4 additions and 4 deletions.
  1. +3 −3 Network/Gitit/Handlers.hs
  2. +1 −1 gitit.cabal
@@ -471,9 +471,9 @@ getDiff :: FileStore -> FilePath -> Maybe RevisionId -> Maybe RevisionId
-> IO Html
getDiff fs file from to = do
rawDiff <- diff fs file from to
- let diffLineToHtml (B, xs) = thespan << unlines xs
- diffLineToHtml (F, xs) = thespan ! [theclass "deleted"] << unlines xs
- diffLineToHtml (S, xs) = thespan ! [theclass "added"] << unlines xs
+ let diffLineToHtml (Both xs _) = thespan << unlines xs
+ diffLineToHtml (First xs) = thespan ! [theclass "deleted"] << unlines xs
+ diffLineToHtml (Second xs) = thespan ! [theclass "added"] << unlines xs
return $ h2 ! [theclass "revision"] <<
("Changes from " ++ fromMaybe "beginning" from ++
" to " ++ fromMaybe "current" to) +++
View
@@ -154,7 +154,7 @@ Executable gitit
old-locale >= 1,
time >= 1.1 && < 1.5,
recaptcha >= 0.1,
- filestore >= 0.5 && < 0.6,
+ filestore >= 0.6 && < 0.7,
zlib >= 0.5 && < 0.6,
url >= 2.1 && < 2.2,
happstack-server >= 7.0 && < 7.2,

0 comments on commit 7af6eb9

Please sign in to comment.