BranchInfo is a data type

src/BranchParse.hs

@@ -49,14 +49,14 @@ instance Arbitrary Branch where
 	arbitrary = MkBranch <$> arbitrary `suchThat` isValidBranch
 
 
-type BranchInfo = ((Maybe Branch, Maybe Branch), Maybe Distance)
+data BranchInfo = MkBranchInfo (Maybe Branch) (Maybe Branch) (Maybe Distance) deriving (Eq, Show)
 
 noBranchInfo :: BranchInfo
-noBranchInfo = ((Nothing, Nothing), Nothing)
+noBranchInfo = MkBranchInfo Nothing Nothing Nothing
 
 newRepo :: Parser BranchInfo
 newRepo = 
-	fmap (\ branch -> ((Just $ MkBranch branch, Nothing), Nothing))
+	fmap (\ branch -> MkBranchInfo (Just $ MkBranch branch) Nothing Nothing)
 		$ string "Initial commit on " *> many anyChar <* eof
 
 noBranch :: Parser BranchInfo
@@ -69,20 +69,20 @@ trackedBranch = MkBranch <$> manyTill anyChar (try $ string "...")
 
 branchRemoteTracking :: Parser BranchInfo
 branchRemoteTracking = 
-	(\ branch tracking behead -> ((Just branch, Just $ MkBranch tracking), Just behead))
+	(\ branch tracking behead -> MkBranchInfo (Just branch) (Just $ MkBranch tracking) (Just behead))
 		<$> trackedBranch
 		<*> many (noneOf " ") <* char ' '
 		<*> inBrackets
 
 branchRemote :: Parser BranchInfo
 branchRemote = 
-	(\ branch tracking -> ((Just branch, Just $ MkBranch tracking), Nothing))
+	(\ branch tracking -> MkBranchInfo (Just branch) (Just $ MkBranch tracking) Nothing)
 		<$> trackedBranch
 		<*> many (noneOf " ") <* eof
 
 branchOnly :: Parser BranchInfo
 branchOnly = 
-	(\ branch -> ((Just $ MkBranch branch, Nothing), Nothing))
+	(\ branch -> MkBranchInfo (Just $ MkBranch branch) Nothing Nothing)
 		<$> many (noneOf " ") <* eof
 
 branchParser :: Parser BranchInfo

src/Main.hs

@@ -2,7 +2,7 @@ import System.Process (readProcessWithExitCode)
 import System.Exit (ExitCode(ExitSuccess))
 import Data.Maybe (fromMaybe)
 import Control.Applicative ((<$>), (<*>))
-import BranchParse (Branch(MkBranch), BranchInfo, branchInfo, Distance, pairFromDistance)
+import BranchParse (Branch(MkBranch), BranchInfo(MkBranchInfo), branchInfo, Distance, pairFromDistance)
 import StatusParse (Status(MakeStatus), processStatus)
 import Data.List (intercalate)
 
@@ -63,7 +63,7 @@ branchOrHash branch =
 		Just (MkBranch bn) -> return bn
 
 allInfo :: (BranchInfo, Status Int) -> (IO String, Numbers)
-allInfo (((branch, _), behead), stat) = (branchOrHash branch, showBranchNumbers behead ++ showStatusNumbers stat)
+allInfo ((MkBranchInfo branch _ behead), stat) = (branchOrHash branch, showBranchNumbers behead ++ showStatusNumbers stat)
 
 ioStrings :: (IO String, Numbers) -> IO [String]
 ioStrings (ios,ss) = (: ss) <$> ios

src/TestBranchParse.hs

@@ -1,4 +1,4 @@
-import BranchParse (BranchInfo, branchInfo, Distance, Branch(MkBranch))
+import BranchParse (BranchInfo(MkBranchInfo), branchInfo, Distance, Branch(MkBranch), noBranchInfo)
 import Test.QuickCheck (property, stdArgs, maxSuccess, quickCheckWith)
 
 
@@ -16,31 +16,31 @@ checkRight b s = expectRight b $ branchInfo s
 propNoBranch :: Branch -> Bool
 propNoBranch (MkBranch s) =
 		checkRight
-			((Nothing, Nothing), Nothing)
+			noBranchInfo
 			$ s ++ " (no branch)"
 
 propNewRepo :: Branch -> Bool
 propNewRepo b@(MkBranch s) =
 		checkRight 
-			((Just b, Nothing), Nothing)
+			(MkBranchInfo (Just b) Nothing Nothing)
 			$ "Initial commit on " ++ s
 
 propBranchOnly :: Branch -> Bool
 propBranchOnly b@(MkBranch s) = 
 		checkRight 
-			((Just b, Nothing), Nothing)
+			(MkBranchInfo (Just b) Nothing Nothing)
 			s
 
 propBranchRemote :: Branch -> Branch -> Bool
 propBranchRemote b'@(MkBranch b) t'@(MkBranch t) =
 		checkRight
-			((Just b', Just t'), Nothing)
+			(MkBranchInfo (Just b') (Just t') Nothing)
 			$ b ++"..." ++ t 
 
 propBranchRemoteTracking :: Branch -> Branch -> Distance -> Bool
 propBranchRemoteTracking b'@(MkBranch b) t'@(MkBranch t) distance = 
 		checkRight 
-			((Just b', Just t'), Just distance)
+			(MkBranchInfo (Just b') (Just t') (Just distance))
 		 	$ b ++ "..." ++ t ++ " " ++ show distance
 
 main :: IO()