Merge pull request #5 from leksah/master

Migrate from String to Text

Author: hamishmack

.travis.yml

@@ -1,15 +1,33 @@
-language: haskell
+env:
+  - GHCVER=7.4.1
+  - GHCVER=7.4.2
+  - GHCVER=7.6.3
+  - GHCVER=7.8.3
+
 before_install:
+  - sudo add-apt-repository -y ppa:hvr/ghc
   - sudo apt-get update -qq
-  - sudo apt-get --no-install-recommends install libgtksourceview-3.0-dev alex happy
-  - cabal install Cabal
-  - cabal install cabal-install
-  - PATH="$HOME/.cabal/bin:$PATH" cabal install gtk2hs-buildtools
+  - sudo apt-get --no-install-recommends install libgtk2.0-dev libgtk-3-dev
+  - sudo apt-get install cabal-install-1.20 ghc-$GHCVER
+  - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/1.20/bin:$PATH
+  - cabal update
+  - |
+    if [ $GHCVER = "head" ] || [ ${GHCVER%.*} = "7.8" ]; then
+      sudo apt-get install happy-1.19.3 alex-3.1.3
+      export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.3/bin:$PATH
+    else
+      sudo apt-get install happy alex
+    fi
+
 install:
-  - PATH="$HOME/.cabal/bin:$PATH" cabal install cabal-meta cabal-src
+  - cabal install Cabal
+  - cabal install gtk2hs-buildtools
+
 script:
-  - PATH="$HOME/.cabal/bin:$PATH" cabal-meta install --force-reinstalls
+  - cabal install
+
 notifications:
   irc:
     channels: "irc.freenode.net#leksah"
+    skip_join: true
   email: true

vcsgui/src/VCSGui/Common/Commit.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  Main
@@ -30,6 +31,8 @@ import Control.Monad
 import Control.Monad.Reader
 import Data.Maybe
 import Paths_vcsgui(getDataFileName)
+import qualified Data.Text as T (unpack, pack)
+import Data.Text (Text)
 
 --
 -- glade path and object accessors
@@ -47,7 +50,7 @@ accessorActTxtViewMsg = "txtViewMsg"
 --
 
 -- | This function will be called after the ok action is called.
-type OkCallBack = String    -- ^ Commit message as specified in the GUI.
+type OkCallBack = Text    -- ^ Commit message as specified in the GUI.
             -> [FilePath]   -- ^ List of 'FilePath's of the files that were selected.
             -> [Option]     -- ^ options (this is currently not implemented i.e. '[]' is passed)
             -> Wrapper.Ctx ()
@@ -66,8 +69,8 @@ data CommitGUI = CommitGUI {
 }
 
 -- | Represents a file which can be selected for commiting.
-data SCFile = GITSCFile Bool FilePath String |
-              SVNSCFile Bool FilePath String Bool
+data SCFile = GITSCFile Bool FilePath Text |
+              SVNSCFile Bool FilePath Text Bool
     deriving (Show)
 
 -- | Return 'True' if the 'SCFile' is flagged as selected.
@@ -81,7 +84,7 @@ filePath (GITSCFile _ fp _ ) = fp
 filePath (SVNSCFile _ fp _ _) = fp
 
 -- | Return the status of this file.
-status :: SCFile -> String
+status :: SCFile -> Text
 status (GITSCFile _ _ s) = s
 status (SVNSCFile _ _ s _) = s
 
@@ -92,7 +95,7 @@ isLocked _                   = False
 
 
 -- | Options to the 'OkCallBack'.
-type Option = String
+type Option = Text
 
 
 -- | Display a window to enter a commit message and select files to be commited.
@@ -150,7 +153,7 @@ getSelectedFiles listStore = do
             return (selectedFiles)
 
 getTreeViewFromGladeCustomStore :: Builder
-                        -> String
+                        -> Text
                         -> TreeViewSetter
                         -> Wrapper.Ctx (H.TreeViewItem SCFile)
 getTreeViewFromGladeCustomStore builder name setupListStore = do
@@ -166,9 +169,9 @@ getTreeViewFromGladeCustomStore builder name setupListStore = do
 wrapWidget :: GObjectClass objClass =>
      Builder
      -> (GObject -> objClass)
-     -> String -> IO (String, objClass)
+     -> Text -> IO (Text, objClass)
 wrapWidget builder cast name = do
-    putStrLn $ " cast " ++ name
+    putStrLn $ " cast " ++ T.unpack name
     gobj <- builderGetObject builder cast name
     return (name, gobj)
 

vcsgui/src/VCSGui/Common/ConflictsResolved.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Common.ConflictsResolved

vcsgui/src/VCSGui/Common/Error.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Common.Error
@@ -15,11 +16,12 @@
 module VCSGui.Common.Error (
     showErrorGUI
 ) where
-import Graphics.UI.Gtk
 
+import Graphics.UI.Gtk
+import Data.Text (Text)
 
 -- | Displays a simple window displaying given 'String' as an error message.
-showErrorGUI :: String -- ^ Message to display.
+showErrorGUI :: Text -- ^ Message to display.
     -> IO ()
 showErrorGUI msg = do
     dialog <- messageDialogNew Nothing [] MessageError ButtonsOk msg

vcsgui/src/VCSGui/Common/ExceptionHandler.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Common.ExceptionHandler
@@ -20,6 +21,8 @@ import qualified Control.Exception as Exc
 
 import VCSWrapper.Common
 import VCSGui.Common.Error
+import qualified Data.Text as T (unwords, unlines)
+import Data.Monoid ((<>))
 
 
 -- | Wraps an IO computation to display an error message if a 'VCSException' occurs.
@@ -30,7 +33,7 @@ defaultVCSExceptionHandler vcsRunner = do
     case o of
         Left (VCSException exitCode out err repoLocation (cmd:opts)) -> do
             putStrLn $ "exception caught"
-            showErrorGUI $ unlines ["An error occured.", err, "Details:", "command: " ++ cmd, "options: " ++ unwords opts]
+            showErrorGUI $ T.unlines ["An error occured.", err, "Details:", "command: " <> cmd, "options: " <> T.unwords opts]
         Right _ -> do
             putStrLn $ "no exception"
             return ()

vcsgui/src/VCSGui/Common/FilesInConflict.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE OverloadedStrings #-}
 -----------------------------------------------------------------------------
 --
 -- Module      :  VCSGui.Common.FilesInConflict
@@ -28,6 +30,8 @@ import Control.Monad.Trans(liftIO)
 import Control.Monad
 import Control.Monad.Reader
 import Paths_vcsgui(getDataFileName)
+import Data.Text (Text)
+import qualified Data.Text as T (unpack, pack)
 
 --
 -- glade path and object accessors
@@ -93,7 +97,7 @@ showFilesInConflictGUI (Just setUpTreeView) filesInConflict filesToResolveGetter
     gui <- loadGUI $ setUpTreeView cwd filesInConflict filesToResolveGetter resolveMarker eMergeToolSetter
     mbMergeToolSetter <- case eMergeToolSetter of
                             Left (Merge.MergeTool path) -> do
-                                liftIO $ H.set (entPath gui) path
+                                liftIO $ H.set (entPath gui) $ T.pack path
                                 return Nothing
                             Right setter -> return $ Just setter
 
@@ -111,7 +115,7 @@ showFilesInConflictGUI (Just setUpTreeView) filesInConflict filesToResolveGetter
                 Nothing -> return ()
                 Just path -> do
                     -- update gui
-                    H.set (entPath gui) path
+                    H.set (entPath gui) $ T.pack path
                     -- call setter
                     case mbMergeToolSetter of
                         Nothing -> return ()
@@ -154,7 +158,7 @@ defaultSetUpTreeView mbcwd conflictingFiles filesToResolveGetter resolveMarker e
         H.addColumnToTreeView' treeViewItem
                                renderer
                                "File"
-                               $ \scf -> [cellText := filePath scf]
+                               $ \scf -> [cellText := T.pack $ filePath scf]
 
         renderer <- cellRendererToggleNew
         H.addColumnToTreeView' treeViewItem
@@ -163,7 +167,7 @@ defaultSetUpTreeView mbcwd conflictingFiles filesToResolveGetter resolveMarker e
                                $ \scf -> [cellToggleActive := isResolved scf]
 
         -- connect select action
-        on renderer cellToggled $ \columnId -> do
+        on renderer cellToggled $ \(columnId :: Text) -> do
                                 putStrLn $ "Checkbutton clicked at column " ++ (show columnId)
                                 --TODO only call tool if button is not checked, move this code to being called if a click on row is received
                                 let callTool' = (\path -> Wrapper.runVcs config $ callTool columnId listStore path)
@@ -181,7 +185,7 @@ defaultSetUpTreeView mbcwd conflictingFiles filesToResolveGetter resolveMarker e
                         Just treeIter <- liftIO $ treeModelGetIterFromString listStore columnId
                         value <- liftIO $ listStoreGetValue listStore $ listStoreIterToIndex treeIter
                         filesToResolve <- filesToResolveGetter $ filePath value
-                        resolvedByTool <- liftIO $ Process.exec mbcwd pathToTool filesToResolve
+                        resolvedByTool <- liftIO $ Process.exec mbcwd pathToTool $ map T.pack filesToResolve
                         let setResolved' = setResolved listStore treeIter value
                         case resolvedByTool of
                                     False -> ConflictsResolvedGUI.showConflictsResolvedGUI
@@ -203,7 +207,7 @@ defaultSetUpTreeView mbcwd conflictingFiles filesToResolveGetter resolveMarker e
 ----
 
 getTreeViewFromGladeCustomStore :: Builder
-                        -> String
+                        -> Text
                         -> (TreeView -> Wrapper.Ctx (ListStore SCFile)) -- ^ fn defining how to setup the liststore
                         -> Wrapper.Ctx (H.TreeViewItem SCFile)
 getTreeViewFromGladeCustomStore builder name setupListStore = do
@@ -219,9 +223,9 @@ getTreeViewFromGladeCustomStore builder name setupListStore = do
 wrapWidget :: GObjectClass objClass =>
      Builder
      -> (GObject -> objClass)
-     -> String -> IO (String, objClass)
+     -> Text -> IO (Text, objClass)
 wrapWidget builder cast name = do
-    putStrLn $ " cast " ++ name
+    putStrLn $ " cast " ++ T.unpack name
     gobj <- builderGetObject builder cast name
     return (name, gobj)
 
@@ -244,7 +248,7 @@ setToListStore (store, view) newList = do
 -- HELPER
 
 -- | shows a dialog to choose a folder, returns Just FilePath to folder if succesfull, Nothing if cancelled
-showFolderChooserDialog :: String -- ^ title of the window
+showFolderChooserDialog :: Text -- ^ title of the window
     -> Window -- ^ parent window
     -> FileChooserAction
     -> IO (Maybe FilePath)