git.iko.soy/typeable/gitrev
on master help sign in
swap
450a7ab3 ahead, 0 behind
gitrev.cabal+1−1
since splitsnapshots
unifiedsplit
@@ -1,5 +1,5 @@
1name: gitrev
1name: gitrev
2−version: 1.3.0
2+version: 1.3.1
3synopsis: Compile git revision info into Haskell projects
3synopsis: Compile git revision info into Haskell projects
4homepage: https://github.com/acfoltzer/gitrev
4homepage: https://github.com/acfoltzer/gitrev
5license: BSD3
5license: BSD3
src/Development/GitRev.hs+17−3
@@ -32,7 +32,15 @@
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!
34
34
35−module Development.GitRev (gitHash, gitBranch, gitDirty, gitDirtyTracked, gitCommitCount, gitCommitDate) where
35+module Development.GitRev
36+ ( gitBranch
37+ , gitCommitCount
38+ , gitCommitDate
39+ , gitDescribe
40+ , gitDirty
41+ , gitDirtyTracked
42+ , gitHash
43+ ) where
36
44
37import Control.Exception
45import Control.Exception
38import Control.Monad
46import Control.Monad
@@ -58,7 +66,7 @@ runGit args def useIdx = do
58 if gitFound
66 if gitFound
59 then do
67 then do
60 -- a lot of bookkeeping to record the right dependencies
68 -- a lot of bookkeeping to record the right dependencies
61− pwd <- runIO getGitDirectory
69+ pwd <- runIO getDotGit
62 let hd = pwd </> ".git" </> "HEAD"
70 let hd = pwd </> ".git" </> "HEAD"
63 index = pwd </> ".git" </> "index"
71 index = pwd </> ".git" </> "index"
64 packedRefs = pwd </> ".git" </> "packed-refs"
72 packedRefs = pwd </> ".git" </> "packed-refs"
@@ -113,7 +121,7 @@ getDotGit = do
113getGitRoot :: IO FilePath
121getGitRoot :: IO FilePath
114getGitRoot = do
122getGitRoot = do
115 pwd <- getCurrentDirectory
123 pwd <- getCurrentDirectory
116− (code, out, err) <-
124+ (code, out, _) <-
117 readProcessWithExitCode "git" ["rev-parse", "--show-toplevel"] ""
125 readProcessWithExitCode "git" ["rev-parse", "--show-toplevel"] ""
118 case code of
126 case code of
119 ExitSuccess -> return $ takeWhile (/= '\n') out
127 ExitSuccess -> return $ takeWhile (/= '\n') out
@@ -137,6 +145,12 @@ gitBranch :: ExpQ
137gitBranch =
145gitBranch =
138 stringE =<< runGit ["rev-parse", "--abbrev-ref", "HEAD"] "UNKNOWN" IdxNotUsed
146 stringE =<< runGit ["rev-parse", "--abbrev-ref", "HEAD"] "UNKNOWN" IdxNotUsed
139
147
148+-- | Return the long git description for the current git commit, or
149+-- @UNKNOWN@ if not in a git repository.
150+gitDescribe :: ExpQ
151+gitDescribe =
152+ stringE =<< runGit ["describe", "--long", "--always"] "UNKNOWN" IdxNotUsed
153+
140-- | Return @True@ if there are non-committed files present in the
154-- | Return @True@ if there are non-committed files present in the
141-- repository
155-- repository
142gitDirty :: ExpQ
156gitDirty :: ExpQ