This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".

The branch, 0.5 has been updated
       via  83345dd972b0149f730714d4e001fbd4c5b4669c (commit)
      from  215b731c190b34d86c66fe8f200bdcde49365009 (commit)


Summary of changes:
 project_template/default/foo.cabal             |    2 +-
 snap.cabal                                     |    1 +
 src/Snap/Extension/Loader/Devel/TreeWatcher.hs |    7 +------
 3 files changed, 3 insertions(+), 7 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 83345dd972b0149f730714d4e001fbd4c5b4669c
Author: Carl Howells <[email protected]>
Date:   Sun Feb 13 12:20:24 2011 -0800

    make TreeWatcher depend on the newest version of the directory-tree 
package, simplifying it internally

diff --git a/project_template/default/foo.cabal 
b/project_template/default/foo.cabal
index 5f8a96e..588179a 100644
--- a/project_template/default/foo.cabal
+++ b/project_template/default/foo.cabal
@@ -28,7 +28,7 @@ Executable projname
     heist >= 0.5 && < 0.6,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
     mtl >= 2 && < 3,
-    snap == 0.4.*,
+    snap == 0.5.*,
     snap-core == 0.4.*,
     snap-server == 0.4.*,
     text >= 0.11 && < 0.12,
diff --git a/snap.cabal b/snap.cabal
index a0e7dd9..e688e1c 100644
--- a/snap.cabal
+++ b/snap.cabal
@@ -58,6 +58,7 @@ Library
     blaze-builder >= 0.2.1.4 && <0.3,
     bytestring >= 0.9.1 && < 0.10,
     directory >= 1.0 && < 1.2,
+    directory-tree >= 0.10 && < 0.11,
     enumerator == 0.4.*,
     filepath >= 1.1 && <1.3,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
diff --git a/src/Snap/Extension/Loader/Devel/TreeWatcher.hs 
b/src/Snap/Extension/Loader/Devel/TreeWatcher.hs
index afdcaaf..4670194 100644
--- a/src/Snap/Extension/Loader/Devel/TreeWatcher.hs
+++ b/src/Snap/Extension/Loader/Devel/TreeWatcher.hs
@@ -30,12 +30,7 @@ getTreeStatus = liftA2 (<$>) TS readModificationTimes
 checkTreeStatus :: TreeStatus -> IO Bool
 checkTreeStatus (TS paths entries) = check <$> readModificationTimes paths
   where
-    check = and . zipWith adtEq entries
-    adtEq (n1 :/ dt1) (n2 :/ dt2) = n1 == n2 && dtEq dt1 dt2
-
-    dtEq (Dir n1 d1) (Dir n2 d2) = n1 == n2 && and (zipWith dtEq d1 d2)
-    dtEq (File n1 t1) (File n2 t2) = n1 == n2 && t1 == t2
-    dtEq _ _ = False
+    check = and . zipWith (==) entries
 
 
 ------------------------------------------------------------------------------
-----------------------------------------------------------------------


hooks/post-receive
-- 
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap

Reply via email to