Here.

15:55:25 | morn@twi:~/dev/darcs/hashed-storage-0.4.9 -> darcs diff --from-tag 0.4.8
Sun Mar 21 15:54:09 CET 2010  Petr Rockai <me@mornfall.net>
  tagged 0.4.9
Sun Mar 21 15:54:03 CET 2010  Petr Rockai <me@mornfall.net>
  * Bump version to 0.4.9.
Sun Mar 21 15:48:50 CET 2010  Petr Rockai <me@mornfall.net>
  * Make Index not break itself when a new empty directory emerges.
Sat Mar 20 15:21:08 CET 2010  Petr Rockai <me@mornfall.net>
  tagged 0.4.8
diff -rN -u -p old-hashed-storage-0.4.9/hashed-storage.cabal new-hashed-storage-0.4.9/hashed-storage.cabal
--- old-hashed-storage-0.4.9/hashed-storage.cabal       2010-03-21 15:55:50.000000000 +0100
+++ new-hashed-storage-0.4.9/hashed-storage.cabal       2010-03-21 15:55:50.000000000 +0100
@@ -1,5 +1,5 @@
 name:          hashed-storage
-version:       0.4.8
+version:       0.4.9
 synopsis:      Hashed file storage support code.
 
 description:   Support code for reading and manipulating hashed file storage
diff -rN -u -p old-hashed-storage-0.4.9/Storage/Hashed/Index.hs new-hashed-storage-0.4.9/Storage/Hashed/Index.hs
--- old-hashed-storage-0.4.9/Storage/Hashed/Index.hs    2010-03-21 15:55:50.000000000 +0100
+++ new-hashed-storage-0.4.9/Storage/Hashed/Index.hs    2010-03-21 15:55:50.000000000 +0100
@@ -271,9 +271,8 @@ readDir index state item =
        inferiors <- if want then subs $ start substate
                             else return []
 
-       let we_changed = or [ changed x | (_, x) <- inferiors ] || nullleaf
-           nullleaf = null inferiors && oldhash == nullsha
-           nullsha = SHA256 (BS.replicate 32 0)
+       let we_changed = or [ changed x | (_, x) <- inferiors ] || leaf
+           leaf = null inferiors
            tree' = makeTree [ (n, fromJust $ treeitem s) | (n, s) <- inferiors, isJust $ treeitem s ]
            treehash = we_changed ? (hashtree index tree', oldhash)
            tree = tree' { treeHash = treehash }

1 patch for repository http://darcs.net:

Sun Mar 21 15:46:46 CET 2010  Petr Rockai <me@mornfall.net>
  * Resolve issue1756: new h-s handles emptied directories correctly in Index.

Attachments

• resolve-issue1756_-new-h_s-handles-emptied-directories-correctly-in-index_.dpatch
• unnamed

Forgotten comma in there. ... : - (
1 patch for repository darcs-unstable@darcs.net:darcs:

Sun Mar 21 16:02:03 CET 2010  Petr Rockai <me@mornfall.net>
  * Resolve issue1756: new h-s handles emptied directories correctly in Index.

Attachments

• resolve-issue1756_-new-h_s-handles-emptied-directories-correctly-in-index_.dpatch
• unnamed

I'd hate to add to Ganesh's already burgeoning review pile, but as we're
trying to get darcs 2.4.1 out the door, I think he's the best/fastest
person to look into this...

We record a change in a dir if

(a) any of the children have changed
(b) the dir is now empty

I think this still leaves a hole when a file is removed from a directory 
but the directory is not then empty. A simple amendment to the attached 
test - moving e/f back into d - seems to confirm this.

(That said, this patch is clearly an improvement on the previous 
behaviour)

Ganesh Sittampalam <bugs@darcs.net> writes:

> Ganesh Sittampalam <ganesh@earth.li> added the comment:
>
> We record a change in a dir if
>
> (a) any of the children have changed
> (b) the dir is now empty
>
> I think this still leaves a hole when a file is removed from a directory 
> but the directory is not then empty. A simple amendment to the attached 
> test - moving e/f back into d - seems to confirm this.
>
> (That said, this patch is clearly an improvement on the previous 
> behaviour)
Oh, I see. Mostly means I screwed up the testcase and got lulled by it
into thinking this was it. I'll look into this some more, then. :\

Yours,
   Petr.

Petr Rockai <me@mornfall.net> writes:

> Oh, I see. Mostly means I screwed up the testcase and got lulled by it
> into thinking this was it. I'll look into this some more, then. :\

This should be a proper fix... (also rolls back the previous version).

diff -rN -u -p old-hashed-storage-0.4/Storage/Hashed/Index.hs new-hashed-storage-0.4/Storage/Hashed/Index.hs
--- old-hashed-storage-0.4/Storage/Hashed/Index.hs      2010-03-24 10:38:08.000000000 +0100
+++ new-hashed-storage-0.4/Storage/Hashed/Index.hs      2010-03-24 10:38:08.000000000 +0100
@@ -261,9 +261,7 @@ readDir index state item =
            subs off | off < following = do
              result <- readItem index $ substate { start = off }
              rest <- subs $ next result
-             case treeitem result of
-               Nothing -> return $! rest
-               Just _  -> return $! (name (resitem result) $ dirlength substate, result) : rest
+             return $! (name (resitem result) $ dirlength substate, result) : rest
            subs coff | coff == following = return []
                      | otherwise = fail $ "Offset mismatch at " ++ show coff ++
                                           " (ends at " ++ show following ++ ")"
@@ -271,8 +269,9 @@ readDir index state item =
        inferiors <- if want then subs $ start substate
                             else return []
 
-       let we_changed = or [ changed x | (_, x) <- inferiors ] || leaf
-           leaf = null inferiors
+       let we_changed = or [ changed x | (_, x) <- inferiors ] || nullleaf
+           nullleaf = null inferiors && oldhash == nullsha
+           nullsha = SHA256 (BS.replicate 32 0)
            tree' = makeTree [ (n, fromJust $ treeitem s) | (n, s) <- inferiors, isJust $ treeitem s ]
            treehash = we_changed ? (hashtree index tree', oldhash)
            tree = tree' { treeHash = treehash }

Yours,
   Petr.

Looks ok to me, but we really need better test coverage of this area..

Just realised we still need an amended version of the patch to bump to h-s 
0.4.10, and I think you mentioned tests too. Please go ahead and push 
yourself once ready.

Fixed up.

1 patch for repository darcs-unstable@darcs.net:darcs:

Wed Mar 24 22:24:53 CET 2010  Petr Rockai <me@mornfall.net>
  * Resolve issue1756: new h-s handles file removals correctly in Index.

Attachments

• resolve-issue1756_-new-h_s-handles-file-removals-correctly-in-index_.dpatch
• unnamed

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-7aa3ca11c9a3009034ccd57f987108cc7d5046ec

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-7aa3ca11c9a3009034ccd57f987108cc7d5046ec