direct: Fix ugly warning messages.

replaceFileOr was broken and ran the rollback action always.
Luckily, for replaceFile, the rollback action was safe to run, since it
just nuked a temp file that had already been moved into place.

However, when `git annex direct` used replaeFileOr, its rollback printed a
scary message:

  /home/joey/tmp/rrrr/.git/annex/misctmp/tmp32268: rename: does not exist (No such file or directory)

There was actually no bad result though.

Annex/ReplaceFile.hs

@@ -30,14 +30,16 @@ replaceFileOr :: FilePath -> (FilePath -> Annex ()) -> (FilePath -> Annex ()) ->
 replaceFileOr file action rollback = do
 	tmpdir <- fromRepo gitAnnexTmpMiscDir
 	void $ createAnnexDirectory tmpdir
-	bracket (liftIO $ setup tmpdir) rollback $ \tmpfile -> do
-		action tmpfile
-		liftIO $ catchIO (rename tmpfile file) (fallback tmpfile)
+	tmpfile <- liftIO $ setup tmpdir
+	go tmpfile `catchNonAsync` (const $ rollback tmpfile)
   where
   	setup tmpdir = do
 		(tmpfile, h) <- openTempFileWithDefaultPermissions tmpdir "tmp"
 		hClose h
 		return tmpfile
+	go tmpfile = do
+		action tmpfile
+		liftIO $ catchIO (rename tmpfile file) (fallback tmpfile)
 	fallback tmpfile _ = do
 		createDirectoryIfMissing True $ parentDir file
 		moveFile tmpfile file

debian/changelog

@@ -30,6 +30,7 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
   * Windows: Now uses actual inode equivilants in new direct mode
     repositories, for safer detection of eg, renaming of files with the same
     size and mtime.
+  * direct: Fix ugly warning messages.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2014 14:41:26 -0400