From f0497312a77d59f24c8273245ac324b02bb1eb13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 30 Jun 2011 13:25:37 -0400
Subject: [PATCH] rename GitQueue to Git.Queue

---
 Annex.hs                    |  2 +-
 AnnexQueue.hs               | 12 ++++++------
 GitQueue.hs => Git/Queue.hs | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename GitQueue.hs => Git/Queue.hs (93%)

diff --git a/Annex.hs b/Annex.hs
index e2f4a10206..c21cfb37ca 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -19,7 +19,7 @@ module Annex (
 import Control.Monad.State
 
 import qualified Git
-import GitQueue
+import Git.Queue
 import Types.Backend
 import Types.Remote
 import Types.Crypto
diff --git a/AnnexQueue.hs b/AnnexQueue.hs
index 58e77a6e85..4c35adfb87 100644
--- a/AnnexQueue.hs
+++ b/AnnexQueue.hs
@@ -16,7 +16,7 @@ import Control.Monad (when, unless)
 
 import Annex
 import Messages
-import qualified GitQueue
+import qualified Git.Queue
 import Utility
 
 {- Adds a git command to the queue, possibly running previously queued
@@ -24,24 +24,24 @@ import Utility
 add :: String -> [CommandParam] -> FilePath -> Annex ()
 add command params file = do
 	q <- getState repoqueue
-	store $ GitQueue.add q command params file
+	store $ Git.Queue.add q command params file
 
 {- Runs the queue if it is full. Should be called periodically. -}
 flushWhenFull :: Annex ()
 flushWhenFull = do
 	q <- getState repoqueue
-	when (GitQueue.full q) $ flush False
+	when (Git.Queue.full q) $ flush False
 
 {- Runs (and empties) the queue. -}
 flush :: Bool -> Annex ()
 flush silent = do
 	q <- getState repoqueue
-	unless (0 == GitQueue.size q) $ do
+	unless (0 == Git.Queue.size q) $ do
 		unless silent $
 			showSideAction "Recording state in git..."
 		g <- gitRepo
-		q' <- liftIO $ GitQueue.flush g q
+		q' <- liftIO $ Git.Queue.flush g q
 		store q'
 
-store :: GitQueue.Queue -> Annex ()
+store :: Git.Queue.Queue -> Annex ()
 store q = changeState $ \s -> s { repoqueue = q }
diff --git a/GitQueue.hs b/Git/Queue.hs
similarity index 93%
rename from GitQueue.hs
rename to Git/Queue.hs
index 5da3ba1d6e..e1ec0cd313 100644
--- a/GitQueue.hs
+++ b/Git/Queue.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module GitQueue (
+module Git.Queue (
 	Queue,
 	empty,
 	add,
@@ -21,7 +21,7 @@ import Data.String.Utils
 import Control.Monad (unless, forM_)
 import Utility
 
-import qualified Git
+import Git
 
 {- An action to perform in a git repository. The file to act on
  - is not included, and must be able to be appended after the params. -}
@@ -72,7 +72,7 @@ full :: Queue -> Bool
 full (Queue n _) = n > maxSize
 
 {- Runs a queue on a git repository. -}
-flush :: Git.Repo -> Queue -> IO Queue
+flush :: Repo -> Queue -> IO Queue
 flush repo (Queue _ m) = do
 	forM_ (M.toList m) $ uncurry $ runAction repo
 	return empty
@@ -80,10 +80,10 @@ flush repo (Queue _ m) = do
 {- Runs an Action on a list of files in a git repository.
  -
  - Complicated by commandline length limits. -}
-runAction :: Git.Repo -> Action -> [FilePath] -> IO ()
+runAction :: Repo -> Action -> [FilePath] -> IO ()
 runAction repo action files = unless (null files) runxargs
 	where
 		runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs
-		params = toCommand $ Git.gitCommandLine repo
+		params = toCommand $ gitCommandLine repo
 			(Param (getSubcommand action):getParams action)
 		feedxargs h = hPutStr h $ join "\0" files