From 09085c76d76f708361e3670eb6726671ed1ba845 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Dec 2015 16:48:15 -0700 Subject: implement getGitConfigValue & getGitConfigBool Signed-off-by: Sean Whitton (cherry picked from commit 1828c6d987f9d499b95610311379dcbdeaa21e33) --- src/Propellor/Git.hs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src') diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index a4418340..e11528fa 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -29,6 +29,27 @@ setRepoUrl url = do void $ boolSystem "git" [Param "config", Param (branchval "remote"), Param "origin"] void $ boolSystem "git" [Param "config", Param (branchval "merge"), Param $ "refs/heads/"++branch] +getGitConfigValue :: String -> IO (Maybe String) +getGitConfigValue key = do + value <- catchMaybeIO $ + takeWhile (/= '\n') + <$> readProcess "git" ["config", key] + return $ case value of + Just v | not (null v) -> Just v + _ -> Nothing + +-- `git config --bool propellor.blah` outputs "false" if propellor.blah is unset +-- i.e. the git convention is that the default value of any git-config setting +-- is "false". So we don't need a Maybe Bool here. +getGitConfigBool :: String -> IO Bool +getGitConfigBool key = do + value <- catchMaybeIO $ + takeWhile (/= '\n') + <$> readProcess "git" ["config", "--bool", key] + return $ case value of + Just "true" -> True + _ -> False + getRepoUrl :: IO (Maybe String) getRepoUrl = getM get urls where -- cgit v1.2.3 From 0dab06c92cfef9f46d2e99b9207dba97450d5953 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Dec 2015 16:48:48 -0700 Subject: rewrite getRepoUrl with getGitConfigValue Signed-off-by: Sean Whitton (cherry picked from commit 3d4c34dece4d295a349ac5b24ec1fbbd3e90f668) --- src/Propellor/Git.hs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index e11528fa..a2f5aef2 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -51,16 +51,9 @@ getGitConfigBool key = do _ -> False getRepoUrl :: IO (Maybe String) -getRepoUrl = getM get urls +getRepoUrl = getM getGitConfigValue urls where urls = ["remote.deploy.url", "remote.origin.url"] - get u = do - v <- catchMaybeIO $ - takeWhile (/= '\n') - <$> readProcess "git" ["config", u] - return $ case v of - Just url | not (null url) -> Just url - _ -> Nothing hasOrigin :: IO Bool hasOrigin = catchDefaultIO False $ do -- cgit v1.2.3 From 6bacac7f38f60945527f148644d3f9eba70b4bf5 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Dec 2015 16:50:19 -0700 Subject: implement two pre-spin safety checks - check that we're on the branch specified in git config value propellor.spin-branch - check that there are no uncommitted changes if git config value propellor.forbid-dirty-spin is true Signed-off-by: Sean Whitton (cherry picked from commit 8f374d73ae5b2bb53f82835c6d6b5c0194590006) --- src/Propellor/Spin.hs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src') diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index ae7e7af5..f01975c9 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -32,6 +32,24 @@ import Utility.SafeCommand commitSpin :: IO () commitSpin = do + -- safety check #1: check we're on the configured spin branch + spinBranch <- getGitConfigValue "propellor.spin-branch" + case spinBranch of + Nothing -> return () -- just a noop + Just b -> do + currentBranch <- getCurrentBranch + when (b /= currentBranch) $ error + ("spin aborted: check out branch " + ++ b ++ " first") + + -- safety check #2: check we can commit with a dirty tree + noDirtySpin <- getGitConfigBool "propellor.forbid-dirty-spin" + when noDirtySpin $ do + status <- takeWhile (/= '\n') + <$> readProcess "git" ["status", "--porcelain"] + when (not . null $ status) $ + error "spin aborted: commit changes first" + void $ actionMessage "Git commit" $ gitCommit (Just spinCommitMessage) [Param "--allow-empty", Param "-a"] -- cgit v1.2.3 From 5c261fd69be879f3458128398bb6fbb605fb2e1a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Dec 2015 16:56:07 -0700 Subject: tweak wrong spin branch error message Signed-off-by: Sean Whitton (cherry picked from commit 9d44dcd39bb88408ed4cfc94a7b4dfa34a1b5591) --- src/Propellor/Spin.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index f01975c9..bda146cc 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -38,9 +38,9 @@ commitSpin = do Nothing -> return () -- just a noop Just b -> do currentBranch <- getCurrentBranch - when (b /= currentBranch) $ error - ("spin aborted: check out branch " - ++ b ++ " first") + when (b /= currentBranch) $ + error ("spin aborted: check out " + ++ b ++ " branch first") -- safety check #2: check we can commit with a dirty tree noDirtySpin <- getGitConfigBool "propellor.forbid-dirty-spin" -- cgit v1.2.3