@@ -32,15 +32,7 @@
32-- > % cabal exec runhaskell Example.hs
32-- > % cabal exec runhaskell Example.hs
33-- > Example.hs: [panic master@2ae047ba5e4a6f0f3e705a43615363ac006099c1 (Mon Jan 11 11:50:59 2016 -0800) (14 commits in HEAD) (uncommitted files present)] oh no!
33-- > Example.hs: [panic master@2ae047ba5e4a6f0f3e705a43615363ac006099c1 (Mon Jan 11 11:50:59 2016 -0800) (14 commits in HEAD) (uncommitted files present)] oh no!
35−module Development.GitRev
35+module Development.GitRev (gitHash, gitBranch, gitDirty, gitCommitCount, gitCommitDate) where
45import Control.Exception
37import Control.Exception
46import Control.Monad
38import Control.Monad
@@ -66,7 +58,7 @@ runGit args def useIdx = do
66 if gitFound
58 if gitFound
68 -- a lot of bookkeeping to record the right dependencies
60 -- a lot of bookkeeping to record the right dependencies
69− pwd <- runIO getDotGit
61+ pwd <- runIO getGitDirectory
70 let hd = pwd </> ".git" </> "HEAD"
62 let hd = pwd </> ".git" </> "HEAD"
71 index = pwd </> ".git" </> "index"
63 index = pwd </> ".git" </> "index"
72 packedRefs = pwd </> ".git" </> "packed-refs"
64 packedRefs = pwd </> ".git" </> "packed-refs"
@@ -97,11 +89,11 @@ runGit args def useIdx = do
97 ExitFailure _ -> return def
89 ExitFailure _ -> return def
98 else return def
90 else return def
100−-- | Determine where our @.git@ directory is, in case we're in a
92+-- | Determine where our git directory is, in case we're in a
101-- submodule.
93-- submodule.
102−getDotGit :: IO FilePath
94+getGitDirectory :: IO FilePath
103−getDotGit = do
95+getGitDirectory = do
104− pwd <- getGitRoot
96+ pwd <- getCurrentDirectory
105 let dotGit = pwd </> ".git"
97 let dotGit = pwd </> ".git"
106 oops = return dotGit -- it's gonna fail, that's fine
98 oops = return dotGit -- it's gonna fail, that's fine
107 isDir <- doesDirectoryExist dotGit
99 isDir <- doesDirectoryExist dotGit
@@ -117,16 +109,6 @@ getDotGit = do
117 else oops
109 else oops
118 _ -> oops
110 _ -> oops
120−-- | Get the root directory of the Git repo.
121−getGitRoot :: IO FilePath
123− pwd <- getCurrentDirectory
125− readProcessWithExitCode "git" ["rev-parse", "--show-toplevel"] ""
127− ExitSuccess -> return $ takeWhile (/= '\n') out
128− ExitFailure _ -> return pwd -- later steps will fail, that's fine
130-- | Type to flag if the git index is used or not in a call to runGit
112-- | Type to flag if the git index is used or not in a call to runGit
131data IndexUsed = IdxUsed -- ^ The git index is used
113data IndexUsed = IdxUsed -- ^ The git index is used
132 | IdxNotUsed -- ^ The git index is /not/ used
114 | IdxNotUsed -- ^ The git index is /not/ used
@@ -145,12 +127,6 @@ gitBranch :: ExpQ
145gitBranch =
127gitBranch =
146 stringE =<< runGit ["rev-parse", "--abbrev-ref", "HEAD"] "UNKNOWN" IdxNotUsed
128 stringE =<< runGit ["rev-parse", "--abbrev-ref", "HEAD"] "UNKNOWN" IdxNotUsed
148−-- | Return the long git description for the current git commit, or
149−-- @UNKNOWN@ if not in a git repository.
152− stringE =<< runGit ["describe", "--long", "--always"] "UNKNOWN" IdxNotUsed
154-- | Return @True@ if there are non-committed files present in the
130-- | Return @True@ if there are non-committed files present in the
155-- repository
131-- repository
156gitDirty :: ExpQ
132gitDirty :: ExpQ
@@ -160,15 +136,6 @@ gitDirty = do
160 "" -> conE falseName
136 "" -> conE falseName
161 _ -> conE trueName
137 _ -> conE trueName
163−-- | Return @True@ if there are non-commited changes to tracked files
164−-- present in the repository
165−gitDirtyTracked :: ExpQ
167− output <- runGit ["status", "--porcelain","--untracked-files=no"] "" IdxUsed
169− "" -> conE falseName
172-- | Return the number of commits in the current head
139-- | Return the number of commits in the current head
173gitCommitCount :: ExpQ
140gitCommitCount :: ExpQ
174gitCommitCount =
141gitCommitCount =