From 52ee62d5245914a55c3415d5bad94cfecf8db457 Mon Sep 17 00:00:00 2001
From: Max Kirillov <max@max630.net>
Date: Sun, 2 Apr 2017 16:25:37 +0300
Subject: [PATCH] refactor: create Git namespace

for functionality related to git in general, but not to
the rehi-specific tasks.
---
 app/Rehi.hs                                  | 4 ++--
 app/Rehi/{GitCommands.hs => Git/Commands.hs} | 4 ++--
 app/Rehi/{GitTypes.hs => Git/Types.hs}       | 2 +-
 app/Test.hs                                  | 2 +-
 git-rehi.cabal                               | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename app/Rehi/{GitCommands.hs => Git/Commands.hs} (97%)
 rename app/Rehi/{GitTypes.hs => Git/Types.hs} (79%)

diff --git a/app/Rehi.hs b/app/Rehi.hs
index b805b06..dbd5199 100644
--- a/app/Rehi.hs
+++ b/app/Rehi.hs
@@ -52,7 +52,7 @@ import qualified GHC.IO.Exception as GIE
 import qualified Prelude as Prelude
 import qualified System.IO as SI
 
-import Rehi.GitTypes (Hash(Hash), hashString)
+import Rehi.Git.Types (Hash(Hash), hashString)
 import Rehi.Utils (equalWith, index_only, readPopen, mapFileLinesM, modifySnd,
                    trim, writeFile, appendToFile, whenM, unlessM, ifM, popen_lines,
                    tryWithRethrowComandFailure,onCommandFailure)
@@ -63,7 +63,7 @@ import Rehi.Utils.IO(withBinaryFile,readBinaryFile,openBinaryFile,openBinaryTemp
                lookupEnv, system, initProgram)
 import Rehi.Utils.Regex (regex_match, regex_match_with_newlines, regex_match_all, regex_split)
 
-import qualified Rehi.GitCommands as Cmd
+import qualified Rehi.Git.Commands as Cmd
 
 main :: IO ()
 main = handleErrors (SI.hPutStrLn SI.stderr) (hPutStrLn SI.stderr) (exitWith . ExitFailure) $ do
diff --git a/app/Rehi/GitCommands.hs b/app/Rehi/Git/Commands.hs
similarity index 97%
rename from app/Rehi/GitCommands.hs
rename to app/Rehi/Git/Commands.hs
index 4fef047..ef1d750 100644
--- a/app/Rehi/GitCommands.hs
+++ b/app/Rehi/Git/Commands.hs
@@ -2,14 +2,14 @@
 {-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Rehi.GitCommands where
+module Rehi.Git.Commands where
 
 import Data.Maybe (maybe)
 import Data.Monoid ((<>))
 
 import qualified Data.ByteString as B
 
-import Rehi.GitTypes
+import Rehi.Git.Types
 import Rehi.Utils (equalWith, index_only, mapFileLinesM, modifySnd,
                    trim, writeFile, appendToFile, whenM, unlessM, ifM, popen_lines)
 import Rehi.Utils.ArgList (ArgList(ArgList), getArgList)
diff --git a/app/Rehi/GitTypes.hs b/app/Rehi/Git/Types.hs
similarity index 79%
rename from app/Rehi/GitTypes.hs
rename to app/Rehi/Git/Types.hs
index a32c9a9..670ead4 100644
--- a/app/Rehi/GitTypes.hs
+++ b/app/Rehi/Git/Types.hs
@@ -1,4 +1,4 @@
-module Rehi.GitTypes where
+module Rehi.Git.Types where
 
 import Data.ByteString(ByteString)
 
diff --git a/app/Test.hs b/app/Test.hs
index ad701f2..e87dbda 100644
--- a/app/Test.hs
+++ b/app/Test.hs
@@ -4,7 +4,7 @@
 module Test where
 
 import Rehi hiding (main)
-import Rehi.GitTypes (Hash(Hash), hashString)
+import Rehi.Git.Types (Hash(Hash), hashString)
 import Rehi.Utils.Regex (regex_split)
 import Rehi.Utils.IO (getTemporaryDirectory,removeFile,openBinaryTempFile,readBinaryFile)
 
diff --git a/git-rehi.cabal b/git-rehi.cabal
index e76cc7b..b12ec1a 100644
--- a/git-rehi.cabal
+++ b/git-rehi.cabal
@@ -16,8 +16,8 @@ executable git-rehi
   hs-source-dirs:      app
   main-is:             Rehi.hs
   other-modules:       Rehi
-                       , Rehi.GitTypes
-                       , Rehi.GitCommands
+                       , Rehi.Git.Types
+                       , Rehi.Git.Commands
                        , Rehi.Utils
                        , Rehi.Utils.ArgList
                        , Rehi.Utils.Regex
@@ -46,8 +46,8 @@ executable git-rehi-test
   hs-source-dirs:      app
   main-is:             Test.hs
   other-modules:       Rehi
-                       , Rehi.GitTypes
-                       , Rehi.GitCommands
+                       , Rehi.Git.Types
+                       , Rehi.Git.Commands
                        , Rehi.Utils
                        , Rehi.Utils.ArgList
                        , Rehi.Utils.Regex
-- 
2.11.4.GIT