diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-08-22 16:14:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-08-22 16:14:12 -0400 |
| commit | 203148363f459635b1be40b8c6ed376073230dda (patch) | |
| tree | 422df5684fc77663c6a3c7fd601c1eff27b3758b /Git | |
| parent | 4c73d77b42e97ad740d5731ad73c40a31c0c84f9 (diff) | |
split groups of related functions out of Utility
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/LsFiles.hs | 2 | ||||
| -rw-r--r-- | Git/Queue.hs | 8 | ||||
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs index 23b383a09..1ecbb029b 100644 --- a/Git/LsFiles.hs +++ b/Git/LsFiles.hs @@ -16,7 +16,7 @@ module Git.LsFiles ( ) where import Git -import Utility +import Utility.SafeCommand {- Scans for files that are checked into git at the specified locations. -} inRepo :: Repo -> [FilePath] -> IO [FilePath] diff --git a/Git/Queue.hs b/Git/Queue.hs index 0016be472..25b9ffad0 100644 --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -19,15 +19,15 @@ import System.IO import System.Cmd.Utils import Data.String.Utils import Control.Monad (forM_) -import Utility +import Utility.SafeCommand 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. -} -data Action = Action { - getSubcommand :: String, - getParams :: [CommandParam] +data Action = Action + { getSubcommand :: String + , getParams :: [CommandParam] } deriving (Show, Eq, Ord) {- A queue of actions to perform (in any order) on a git repository, diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index b0da07170..a5bcbeac4 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -18,7 +18,7 @@ import Data.Maybe import Data.String.Utils import Git -import Utility +import Utility.SafeCommand {- Performs a union merge between two branches, staging it in the index. - Any previously staged changes in the index will be lost. |