status: Fix space leak in local mode, introduced in version 4.20130920.

Actually fixed 2 leaks, the tuple leak may have been older.

Command/Status.hs

@@ -311,15 +311,16 @@ getLocalStatInfo dir = do
 	initial = (emptyKeyData, emptyKeyData, emptyNumCopiesStats)
 	update matcher fast key file vs@(presentdata, referenceddata, numcopiesstats) =
 		ifM (matcher $ FileInfo file file)
-			( (,,)
+			( do
-				<$> ifM (inAnnex key)
+				!presentdata' <- ifM (inAnnex key)
 					( return $ addKey key presentdata
 					, return presentdata
 					)
-				<*> pure (addKey key referenceddata)
+				let !referenceddata' = addKey key referenceddata
-				<*> if fast
+				!numcopiesstats' <- if fast
 					then return numcopiesstats
 					else updateNumCopiesStats key file numcopiesstats
+				return $! (presentdata', referenceddata', numcopiesstats')
 			, return vs
 			)
 
@@ -345,11 +346,11 @@ addKey key (KeyData count size unknownsize backends) =
 	ks = keySize key
 
 updateNumCopiesStats :: Key -> FilePath -> NumCopiesStats -> Annex NumCopiesStats
-updateNumCopiesStats key file stats = do
+updateNumCopiesStats key file (NumCopiesStats m) = do
-	variance <- Variance <$> numCopiesCheck file key (-)
+	!variance <- Variance <$> numCopiesCheck file key (-)
-	return $ stats { numCopiesVarianceMap = update (numCopiesVarianceMap stats) variance }
+	let !m' = M.insertWith' (+) variance 1 m
-  where
+	let !ret = NumCopiesStats m'
-  	update m variance = M.insertWith' (+) variance 1 m
+	return ret
 
 showSizeKeys :: KeyData -> String
 showSizeKeys d = total ++ missingnote

debian/changelog

@@ -10,6 +10,7 @@ git-annex (4.20131003) UNRELEASED; urgency=low
   * The control socket path passed to ssh needs to be 17 characters
     shorter than the maximum unix domain socket length, because ssh
     appends stuff to it to make a temporary filename. Closes: #725512
+  * status: Fix space leak in local mode, introduced in version 4.20130920.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 03 Oct 2013 15:41:24 -0400