add debugging

Git/Branch.hs

@@ -73,12 +73,12 @@ commit :: String -> Branch -> [Ref] -> Repo -> IO Sha
 commit message branch parentrefs repo = do
 	tree <- getSha "write-tree" $
 		pipeRead [Param "write-tree"] repo
-	sha <- getSha "commit-tree" $
-		ignorehandle $ pipeWriteRead
-			(map Param $ ["commit-tree", show tree] ++ ps)
-			message repo
+	sha <- getSha "commit-tree" $ pipeWriteRead
+		(map Param $ ["commit-tree", show tree] ++ ps)
+		message repo
+	print ("got", sha)
 	run "update-ref" [Param $ show branch, Param $ show sha] repo
+	print ("update-ref done", sha)
 	return sha
 	where
-		ignorehandle a = snd <$> a
 		ps = concatMap (\r -> ["-p", show r]) parentrefs

Git/Command.hs

@@ -57,16 +57,18 @@ pipeWrite params s repo = assertLocal repo $ do
 	hClose h
 	return p
 
-{- Runs a git subcommand, feeding it input, and returning its output.
- - You should call either getProcessStatus or forceSuccess on the PipeHandle. -}
-pipeWriteRead :: [CommandParam] -> String -> Repo -> IO (PipeHandle, String)
+{- Runs a git subcommand, feeding it input, and returning its output,
+ - which is expected to be fairly small, since it's all read into memory
+ - strictly. -}
+pipeWriteRead :: [CommandParam] -> String -> Repo -> IO String
 pipeWriteRead params s repo = assertLocal repo $ do
 	(p, from, to) <- hPipeBoth "git" (toCommand $ gitCommandLine params repo)
 	fileEncoding to
 	fileEncoding from
 	_ <- forkIO $ finally (hPutStr to s) (hClose to)
-	c <- hGetContents from
-	return (p, c)
+	c <- hGetContentsStrict from
+	forceSuccess p
+	return c
 
 {- Reads null terminated output of a git command (as enabled by the -z 
  - parameter), and splits it. -}

Git/HashObject.hs

@@ -38,11 +38,9 @@ hashFile h file = CoProcess.query h send receive
 {- Injects some content into git, returning its Sha. -}
 hashObject :: ObjectType -> String -> Repo -> IO Sha
 hashObject objtype content repo = getSha subcmd $ do
-	(h, s) <- pipeWriteRead (map Param params) content repo
-	length s `seq` do
-		forceSuccess h
-		reap -- XXX unsure why this is needed
-		return s
+	s <- pipeWriteRead (map Param params) content repo
+	reap -- XXX unsure why this is needed, of if it is anymore
+	return s
 	where
 		subcmd = "hash-object"
 		params = [subcmd, "-t", show objtype, "-w", "--stdin"]

Git/Ref.hs

@@ -40,7 +40,10 @@ exists ref = runBool "show-ref"
 
 {- Get the sha of a fully qualified git ref, if it exists. -}
 sha :: Branch -> Repo -> IO (Maybe Sha)
-sha branch repo = process <$> showref repo
+sha branch repo = do
+	r <- process <$> showref repo
+	print r
+	return r
 	where
 		showref = pipeRead [Param "show-ref",
 			Param "--hash", -- get the hash

System/Cmd/Utils.hs

@@ -179,7 +179,7 @@ Not available on Windows or with Hugs.
 -}
 hPipeFrom :: FilePath -> [String] -> IO (PipeHandle, Handle)
 hPipeFrom fp args =
-    ddd "hPipeFrom" $ do
+    ddd (show ("hPipeFrom", fp, args)) $ do
        pipepair <- createPipe
        let childstuff = do dupTo (snd pipepair) stdOutput
                            closeFd (fst pipepair)
@@ -281,7 +281,7 @@ Not available on Windows.
 -}
 hPipeBoth :: FilePath -> [String] -> IO (PipeHandle, Handle, Handle)
 hPipeBoth fp args =
-    ddd "hPipeBoth" $ do
+    ddd (show ("hPipeBoth", fp, args)) $ do
        frompair <- createPipe
        topair <- createPipe
        let childstuff = do dupTo (snd frompair) stdOutput

Utility/Misc.hs

@@ -33,7 +33,7 @@ separate c l = unbreak $ break c l
 			| otherwise = (a, tail b)
 
 {- Breaks out the first line. -}
-firstLine :: String-> String
+firstLine :: String -> String
 firstLine = takeWhile (/= '\n')
 
 {- Splits a list into segments that are delimited by items matching

Utility/SafeCommand.hs

@@ -78,8 +78,8 @@ safeSystemEnv command params env = do
 {- executeFile with debug logging -}
 executeFile :: FilePath -> Bool -> [String] -> Maybe [(String, String)] -> IO ()
 executeFile c path p e = do
-	debugM "Utility.SafeCommand.executeFile" $
-		"Running: " ++ c ++ " " ++ show p ++ " " ++ maybe "" show e
+	--debugM "Utility.SafeCommand.executeFile" $
+	--	"Running: " ++ c ++ " " ++ show p ++ " " ++ maybe "" show e
 	System.Posix.Process.executeFile c path p e
 
 {- Escapes a filename or other parameter to be safely able to be exposed to

git-annex.cabal

@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 3.20120629
+Version: 3.20120630
 Cabal-Version: >= 1.8
 License: GPL
 Maintainer: Joey Hess <joey@kitenet.net>