Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects.

This allows eg, putting .git/annex/tmp on a ram disk, if the disk IO
of temp object files is too annoying (and if you don't want to keep
partially transferred objects across reboots).

.git/annex/misctmp must be on the same filesystem as the git work tree,
since files are moved to there in a way that will not work cross-device,
as well as symlinked into there.

I first wanted to put the tmp objects in .git/annex/objects/tmp, but
that would pose transition problems on upgrade when partially transferred
objects existed.

git annex info does not currently show the size of .git/annex/misctemp,
since it should stay small. It would also be ok to make something clean it
out, periodically.

Annex/Content.hs

@@ -221,7 +221,7 @@ getViaTmpChecked check key action =
  -}
 prepGetViaTmpChecked :: Key -> Annex Bool -> Annex Bool
 prepGetViaTmpChecked key getkey = do
-	tmp <- fromRepo $ gitAnnexTmpLocation key
+	tmp <- fromRepo $ gitAnnexTmpObjectLocation key
 
 	e <- liftIO $ doesFileExist tmp
 	alreadythere <- if e
@@ -250,7 +250,7 @@ finishGetViaTmp check key action = do
 
 prepTmp :: Key -> Annex FilePath
 prepTmp key = do
-	tmp <- fromRepo $ gitAnnexTmpLocation key
+	tmp <- fromRepo $ gitAnnexTmpObjectLocation key
 	createAnnexDirectory (parentDir tmp)
 	return tmp
 

Annex/Init.hs

@@ -120,7 +120,7 @@ probeCrippledFileSystem = do
 #ifdef mingw32_HOST_OS
 	return True
 #else
-	tmp <- fromRepo gitAnnexTmpDir
+	tmp <- fromRepo gitAnnexTmpMiscDir
 	let f = tmp </> "gaprobe"
 	createAnnexDirectory tmp
 	liftIO $ writeFile f ""
@@ -157,7 +157,7 @@ probeFifoSupport = do
 #ifdef mingw32_HOST_OS
 	return False
 #else
-	tmp <- fromRepo gitAnnexTmpDir
+	tmp <- fromRepo gitAnnexTmpMiscDir
 	let f = tmp </> "gaprobe"
 	createAnnexDirectory tmp
 	liftIO $ do

Annex/Journal.hs

@@ -35,11 +35,11 @@ import Utility.WinLock
  -}
 setJournalFile :: JournalLocked -> FilePath -> String -> Annex ()
 setJournalFile _jl file content = do
+	tmp <- fromRepo gitAnnexTmpMiscDir
 	createAnnexDirectory =<< fromRepo gitAnnexJournalDir
-	createAnnexDirectory =<< fromRepo gitAnnexTmpDir
+	createAnnexDirectory tmp
 	-- journal file is written atomically
 	jfile <- fromRepo $ journalFile file
-	tmp <- fromRepo gitAnnexTmpDir
 	let tmpfile = tmp </> takeFileName jfile
 	liftIO $ do
 		writeBinaryFile tmpfile content

Annex/ReplaceFile.hs

@@ -24,7 +24,7 @@ import Annex.Exception
  -}
 replaceFile :: FilePath -> (FilePath -> Annex ()) -> Annex ()
 replaceFile file a = do
-	tmpdir <- fromRepo gitAnnexTmpDir
+	tmpdir <- fromRepo gitAnnexTmpMiscDir
 	void $ createAnnexDirectory tmpdir
 	bracketIO (setup tmpdir) nukeFile $ \tmpfile -> do
 		a tmpfile
@@ -36,4 +36,4 @@ replaceFile file a = do
 		return tmpfile
 	fallback tmpfile _ = do
 		createDirectoryIfMissing True $ parentDir file
-		rename tmpfile file
+		moveFile tmpfile file