diff options
| -rw-r--r-- | anissue.cabal | 6 | ||||
| -rw-r--r-- | app/Cache.hs (renamed from app/History/Cache.hs) | 2 | ||||
| -rw-r--r-- | app/Git.hs | 4 | ||||
| -rw-r--r-- | app/Git/CommitHash.hs (renamed from app/History/CommitHash.hs) | 2 | ||||
| -rw-r--r-- | app/History.hs | 8 | ||||
| -rw-r--r-- | app/Issue/Provenance.hs | 4 | ||||
| -rw-r--r-- | app/IssueEvent.hs (renamed from app/History/IssueEvent.hs) | 4 |
7 files changed, 16 insertions, 14 deletions
diff --git a/anissue.cabal b/anissue.cabal index 118567e..d053af8 100644 --- a/anissue.cabal +++ b/anissue.cabal @@ -66,16 +66,16 @@ executable anissue -- Modules included in this executable, other than Main. other-modules: + Cache Data.List.Extra Debug Die Exception Git + Git.CommitHash History - History.Cache - History.CommitHash - History.IssueEvent Issue + IssueEvent Issue.Filter Issue.Group Issue.Meta diff --git a/app/History/Cache.hs b/app/Cache.hs index 978f3d9..52d18ca 100644 --- a/app/History/Cache.hs +++ b/app/Cache.hs @@ -1,4 +1,4 @@ -module History.Cache +module Cache ( cached, cachedMaybe, ) @@ -1,5 +1,6 @@ module Git - ( withWorkingTree, + ( module Git.CommitHash, + withWorkingTree, getCommitHashes, getRootDir, ) @@ -13,6 +14,7 @@ import Data.Maybe (fromMaybe) import Data.Text qualified as T import Data.Text.Encoding qualified as T import Exception qualified as E +import Git.CommitHash import Process (proc, sh, sh_) import System.Directory (createDirectoryIfMissing) import System.FilePath (dropTrailingPathSeparator, takeDirectory) diff --git a/app/History/CommitHash.hs b/app/Git/CommitHash.hs index 1075b2f..db7a478 100644 --- a/app/History/CommitHash.hs +++ b/app/Git/CommitHash.hs @@ -1,4 +1,4 @@ -module History.CommitHash +module Git.CommitHash ( CommitHash (..), toShortText, toText, diff --git a/app/History.hs b/app/History.hs index e1ea0ab..70fc123 100644 --- a/app/History.hs +++ b/app/History.hs @@ -5,6 +5,7 @@ module History where import CMark qualified as D +import Cache (cachedMaybe) import Control.Exception (catch, handle, try) import Data.Binary (Binary) import Data.ByteString.Lazy qualified as LB @@ -21,15 +22,14 @@ import Die (die) import Exception qualified as E import GHC.Generics (Generic) import Git qualified -import History.Cache (cachedMaybe) -import History.CommitHash (CommitHash (..)) -import History.CommitHash qualified as C -import History.IssueEvent (IssueEvent (..)) +import Git.CommitHash (CommitHash (..)) +import Git.CommitHash qualified as C import Issue qualified as I import Issue.Parser qualified as I import Issue.Provenance qualified as I import Issue.Tag qualified as I import Issue.Text qualified as I +import IssueEvent (IssueEvent (..)) import Patch qualified as A import Process (proc, sh) import Render qualified as P diff --git a/app/Issue/Provenance.hs b/app/Issue/Provenance.hs index addb6fe..18255da 100644 --- a/app/Issue/Provenance.hs +++ b/app/Issue/Provenance.hs @@ -20,8 +20,8 @@ import Data.Time.Calendar (Day (..), toModifiedJulianDay) import Data.Time.Clock (DiffTime, UTCTime (..), picosecondsToDiffTime) import Exception qualified as E import GHC.Generics (Generic) -import History.CommitHash (CommitHash) -import History.CommitHash qualified as C +import Git.CommitHash (CommitHash) +import Git.CommitHash qualified as C import Process (sh) import System.Process.Typed (setWorkingDir) import Prelude hiding (lines) diff --git a/app/History/IssueEvent.hs b/app/IssueEvent.hs index 932cfd9..8f4cdd2 100644 --- a/app/History/IssueEvent.hs +++ b/app/IssueEvent.hs @@ -1,8 +1,8 @@ -module History.IssueEvent (IssueEvent (..)) where +module IssueEvent (IssueEvent (..)) where import Data.Binary (Binary) import GHC.Generics (Generic) -import History.CommitHash (CommitHash) +import Git.CommitHash (CommitHash) import Issue (Issue) import Issue.Render qualified as I import Patch (Patch) |