Merge branch 'windows' of git://git-annex.branchable.com into windows

30 files changed, 30 insertions, 28 deletions

diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index c7c01b40c..c7c01b40c 100755..100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 025ff60bf..b885b5e5b 100755
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -29,7 +29,7 @@ import Common.Annex
 import qualified Annex
 import Annex.Perms
 import qualified Git
-import Utility.TempFile
+import Utility.Tmp
 import Logs.Location
 import Utility.InodeCache
 
diff --git a/Annex/Journal.hs b/Annex/Journal.hs
index e68591ce2..e68591ce2 100755..100644
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
diff --git a/Annex/Link.hs b/Annex/Link.hs
index 24ec6c7c9..24ec6c7c9 100755..100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs
index f94521117..af072d8ae 100644
--- a/Assistant/DaemonStatus.hs
+++ b/Assistant/DaemonStatus.hs
@@ -9,7 +9,7 @@ module Assistant.DaemonStatus where
 
 import Assistant.Common
 import Assistant.Alert.Utility
-import Utility.TempFile
+import Utility.Tmp
 import Assistant.Types.NetMessager
 import Utility.NotificationBroadcaster
 import Logs.Transfer
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 227d1bc03..3c7d09698 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -16,7 +16,7 @@ import Assistant.Ssh
 import Config.Files
 import Utility.FileMode
 import Utility.Shell
-import Utility.TempFile
+import Utility.Tmp
 import Utility.Env
 
 #ifdef darwin_HOST_OS
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 0c718d019..7875c4c4c 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -8,7 +8,7 @@
 module Assistant.Ssh where
 
 import Common.Annex
-import Utility.TempFile
+import Utility.Tmp
 import Utility.UserInfo
 import Utility.Shell
 import Git.Remote
@@ -146,7 +146,7 @@ authorizedKeysLine rsynconly dir pubkey
 
 {- Generates a ssh key pair. -}
 genSshKeyPair :: IO SshKeyPair
-genSshKeyPair = withTempDir "git-annex-keygen" $ \dir -> do
+genSshKeyPair = withTmpDir "git-annex-keygen" $ \dir -> do
 	ok <- boolSystem "ssh-keygen"
 		[ Param "-P", Param "" -- no password
 		, Param "-f", File $ dir </> "key"
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index 19300cf3c..3c1e6178a 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -33,7 +33,7 @@ import Assistant.WebApp.Control
 import Assistant.WebApp.OtherRepos
 import Assistant.Types.ThreadedMonad
 import Utility.WebApp
-import Utility.TempFile
+import Utility.Tmp
 import Utility.FileMode
 import Git
 
@@ -74,7 +74,7 @@ webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup
 		, return app
 		)
 	runWebApp listenhost app' $ \addr -> if noannex
-		then withTempFile "webapp.html" $ \tmpfile _ ->
+		then withTmpFile "webapp.html" $ \tmpfile _ ->
 			go addr webapp tmpfile Nothing
 		else do
 			let st = threadState assistantdata
diff --git a/Common.hs b/Common.hs
index 5dc3cfbb2..5dc3cfbb2 100755..100644
--- a/Common.hs
+++ b/Common.hs
diff --git a/Config/Files.hs b/Config/Files.hs
index 45f478eeb..6504d1f6d 100644
--- a/Config/Files.hs
+++ b/Config/Files.hs
@@ -8,7 +8,7 @@
 module Config.Files where
 
 import Common
-import Utility.TempFile
+import Utility.Tmp
 import Utility.FreeDesktop
 
 {- ~/.config/git-annex/file -}
diff --git a/Git/CatFile.hs b/Git/CatFile.hs
index 5ab10b187..5ab10b187 100755..100644
--- a/Git/CatFile.hs
+++ b/Git/CatFile.hs
diff --git a/Git/CheckAttr.hs b/Git/CheckAttr.hs
index b3055fd4c..b3055fd4c 100755..100644
--- a/Git/CheckAttr.hs
+++ b/Git/CheckAttr.hs
diff --git a/Git/FilePath.hs b/Git/FilePath.hs
index c3813fe9e..c3813fe9e 100755..100644
--- a/Git/FilePath.hs
+++ b/Git/FilePath.hs
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs
index 82ce0edaf..82ce0edaf 100755..100644
--- a/Git/LsFiles.hs
+++ b/Git/LsFiles.hs
diff --git a/Git/UpdateIndex.hs b/Git/UpdateIndex.hs
index 5d07e2011..5d07e2011 100755..100644
--- a/Git/UpdateIndex.hs
+++ b/Git/UpdateIndex.hs
diff --git a/Init.hs b/Init.hs
index 17dd6cb8c..058ce9f0a 100755
--- a/Init.hs
+++ b/Init.hs
@@ -16,7 +16,7 @@ module Init (
 ) where
 
 import Common.Annex
-import Utility.TempFile
+import Utility.Tmp
 import Utility.Network
 import qualified Annex
 import qualified Git
diff --git a/Locations.hs b/Locations.hs
index ba1e74150..ba1e74150 100755..100644
--- a/Locations.hs
+++ b/Locations.hs
diff --git a/Logs/Presence.hs b/Logs/Presence.hs
index ec5cec209..ec5cec209 100755..100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
diff --git a/Logs/Unused.hs b/Logs/Unused.hs
index 437b01f71..342d88aa6 100644
--- a/Logs/Unused.hs
+++ b/Logs/Unused.hs
@@ -19,7 +19,7 @@ import qualified Data.Map as M
 import Common.Annex
 import Command
 import Types.Key
-import Utility.TempFile
+import Utility.Tmp
 
 writeUnusedLog :: FilePath -> [(Int, Key)] -> Annex ()
 writeUnusedLog prefix l = do
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 0cc4da40c..3f88a0334 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -35,7 +35,7 @@ import qualified Annex.Content
 import qualified Annex.BranchState
 import qualified Annex.Branch
 import qualified Utility.Url as Url
-import Utility.TempFile
+import Utility.Tmp
 import Config
 import Config.Cost
 import Init
@@ -179,7 +179,7 @@ tryGitConfigRead r
 
 	geturlconfig headers = do
 		s <- Url.get (Git.repoLocation r ++ "/config") headers
-		withTempFile "git-annex.tmp" $ \tmpfile h -> do
+		withTmpFile "git-annex.tmp" $ \tmpfile h -> do
 			hPutStr h s
 			hClose h
 			safely $ pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile]
diff --git a/Test.hs b/Test.hs
index c1f82d171..bc603b004 100644
--- a/Test.hs
+++ b/Test.hs
@@ -16,6 +16,7 @@ import Control.Exception.Extensible
 import qualified Data.Map as M
 import System.IO.HVFS (SystemFS(..))
 import qualified Text.JSON
+import System.Path
 
 import Common
 
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index e048b3db8..9793f04e8 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -20,7 +20,7 @@ import qualified Git.LsFiles as LsFiles
 import Backend
 import Annex.Version
 import Utility.FileMode
-import Utility.TempFile
+import Utility.Tmp
 import qualified Upgrade.V2
 
 -- v2 adds hashing of filenames of content and location log files.
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 935fc4825..b5de6c8c0 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -14,7 +14,7 @@ import qualified Git.Ref
 import qualified Annex.Branch
 import Logs.Location
 import Annex.Content
-import Utility.TempFile
+import Utility.Tmp
 
 olddir :: Git.Repo -> FilePath
 olddir g
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index 599d41a03..9477ad5b9 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -18,7 +18,7 @@ import Control.Applicative
 import System.IO.Unsafe (unsafeInterleaveIO)
 
 import Utility.SafeCommand
-import Utility.TempFile
+import Utility.Tmp
 import Utility.Exception
 import Utility.Monad
 
diff --git a/Utility/Env.hs b/Utility/Env.hs
index cb738732f..cb738732f 100755..100644
--- a/Utility/Env.hs
+++ b/Utility/Env.hs
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index d3460bdf7..e33f5156a 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -13,6 +13,7 @@ import System.Posix.Types
 import Control.Applicative
 import Control.Concurrent
 import Control.Exception (bracket)
+import System.Path
 
 import Common
 import Utility.Env
diff --git a/Utility/Path.hs b/Utility/Path.hs
index 2c2fc35ff..2c2fc35ff 100755..100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
diff --git a/Utility/TempFile.hs b/Utility/Tmp.hs
index 58d07c3a2..f03e4c0dc 100755..100644
--- a/Utility/TempFile.hs
+++ b/Utility/Tmp.hs
@@ -1,11 +1,11 @@
-{- temp file functions
+{- Temporary files and directories.
  -
  - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
  -
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Utility.TempFile where
+module Utility.Tmp where
 
 import Control.Exception (bracket)
 import System.IO
@@ -31,15 +31,15 @@ viaTmp a file content = do
 
 {- Runs an action with a tmp file located in the system's tmp directory
  - (or in "." if there is none) then removes the file. -}
-withTempFile :: Template -> (FilePath -> Handle -> IO a) -> IO a
-withTempFile template a = do
+withTmpFile :: Template -> (FilePath -> Handle -> IO a) -> IO a
+withTmpFile template a = do
 	tmpdir <- catchDefaultIO "." getTemporaryDirectory
-	withTempFileIn tmpdir template a
+	withTmpFileIn tmpdir template a
 
 {- Runs an action with a tmp file located in the specified directory,
  - then removes the file. -}
-withTempFileIn :: FilePath -> Template -> (FilePath -> Handle -> IO a) -> IO a
-withTempFileIn tmpdir template a = bracket create remove use
+withTmpFileIn :: FilePath -> Template -> (FilePath -> Handle -> IO a) -> IO a
+withTmpFileIn tmpdir template a = bracket create remove use
   where
 	create = openTempFile tmpdir template
 	remove (name, handle) = do
@@ -50,15 +50,15 @@ withTempFileIn tmpdir template a = bracket create remove use
 {- Runs an action with a tmp directory located within the system's tmp
  - directory (or within "." if there is none), then removes the tmp
  - directory and all its contents. -}
-withTempDir :: Template -> (FilePath -> IO a) -> IO a
-withTempDir template a = do
+withTmpDir :: Template -> (FilePath -> IO a) -> IO a
+withTmpDir template a = do
 	tmpdir <- catchDefaultIO "." getTemporaryDirectory
-	withTempDirIn tmpdir template a
+	withTmpDirIn tmpdir template a
 
 {- Runs an action with a tmp directory located within a specified directory,
  - then removes the tmp directory and all its contents. -}
-withTempDirIn :: FilePath -> Template -> (FilePath -> IO a) -> IO a
-withTempDirIn tmpdir template = bracket create remove
+withTmpDirIn :: FilePath -> Template -> (FilePath -> IO a) -> IO a
+withTmpDirIn tmpdir template = bracket create remove
   where
 	remove d = whenM (doesDirectoryExist d) $
 		removeDirectoryRecursive d
diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs
index 3a71c6baf..3a71c6baf 100755..100644
--- a/Utility/UserInfo.hs
+++ b/Utility/UserInfo.hs
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index 0614384a1..762819b2f 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -10,7 +10,7 @@
 module Utility.WebApp where
 
 import Common
-import Utility.TempFile
+import Utility.Tmp
 import Utility.FileMode
 
 import qualified Yesod