summaryrefslogtreecommitdiff
path: root/GitQueue.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:25:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:25:31 -0400
commit4cd96ad2db0867ef7450215d3de7afcf748d7088 (patch)
tree4dd077502002f5cc476fb9ed0edeee2c1fb25930 /GitQueue.hs
parentfcdc4797a9ab2b792a9bb20f2ca9802b8f6d5a1e (diff)
rename
Diffstat (limited to 'GitQueue.hs')
-rw-r--r--GitQueue.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/GitQueue.hs b/GitQueue.hs
index 328243fa0..07cf9f62f 100644
--- a/GitQueue.hs
+++ b/GitQueue.hs
@@ -25,7 +25,7 @@ import qualified GitRepo as Git
- is not included, and must be able to be appended after the params. -}
data Action = Action {
getSubcommand :: String,
- getParams :: [ShellParam]
+ getParams :: [CommandParam]
} deriving (Show, Eq, Ord)
{- A queue of actions to perform (in any order) on a git repository,
@@ -38,7 +38,7 @@ empty :: Queue
empty = M.empty
{- Adds an action to a queue. -}
-add :: Queue -> String -> [ShellParam] -> FilePath -> Queue
+add :: Queue -> String -> [CommandParam] -> FilePath -> Queue
add queue subcommand params file = M.insertWith (++) action [file] queue
where
action = Action subcommand params
@@ -57,6 +57,6 @@ runAction repo action files = do
unless (null files) runxargs
where
runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs
- params = toShell $ Git.gitCommandLine repo
+ params = toCommand $ Git.gitCommandLine repo
(Param (getSubcommand action):getParams action)
feedxargs h = hPutStr h $ join "\0" files