renamed GitRepo to Git

It was always imported qualified as Git anyway

Annex.hs

@@ -18,7 +18,7 @@ module Annex (
 
 import Control.Monad.State
 
-import qualified GitRepo as Git
+import qualified Git
 import GitQueue
 import Types.Backend
 import Types.Remote

Backend.hs

@@ -39,7 +39,7 @@ import System.Posix.Files
 import System.Directory
 
 import Locations
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import Types
 import Types.Key

Backend/File.hs

@@ -20,7 +20,7 @@ import Data.String.Utils
 import Types.Backend
 import LocationLog
 import qualified Remote
-import qualified GitRepo as Git
+import qualified Git
 import Content
 import qualified Annex
 import Types

Branch.hs

@@ -30,7 +30,7 @@ import System.IO.Binary
 import qualified Data.ByteString.Char8 as B
 
 import Types.BranchState
-import qualified GitRepo as Git
+import qualified Git
 import qualified GitUnionMerge
 import qualified Annex
 import Utility

CmdLine.hs

@@ -18,7 +18,7 @@ import Control.Monad (when)
 
 import qualified Annex
 import qualified AnnexQueue
-import qualified GitRepo as Git
+import qualified Git
 import Content
 import Types
 import Command

Command.hs

@@ -21,8 +21,8 @@ import Types
 import qualified Backend
 import Messages
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
-import qualified GitRepo.LsFiles as LsFiles
+import qualified Git.LsFiles as LsFiles
 import Utility
 import Types.Key
 

Command/DropUnused.hs

@@ -20,7 +20,7 @@ import qualified Annex
 import qualified Command.Drop
 import qualified Command.Move
 import qualified Remote
-import qualified GitRepo as Git
+import qualified Git
 import Backend
 import Types.Key
 import Utility

Command/Init.hs

@@ -13,7 +13,7 @@ import System.Directory
 
 import Command
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
 import qualified Branch
 import UUID
 import Version

Command/Map.hs

@@ -15,7 +15,7 @@ import Data.List.Utils
 
 import Command
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
 import Messages
 import Types
 import Utility

Command/Status.hs

@@ -18,7 +18,7 @@ import qualified Types.Backend as B
 import qualified Types.Remote as R
 import qualified Remote
 import qualified Command.Unused
-import qualified GitRepo as Git
+import qualified Git
 import Command
 import Types
 import DataUnits

Command/Unannex.hs

@@ -19,8 +19,8 @@ import qualified Backend
 import LocationLog
 import Types
 import Content
-import qualified GitRepo as Git
+import qualified Git
-import qualified GitRepo.LsFiles as LsFiles
+import qualified Git.LsFiles as LsFiles
 import Messages
 
 command :: [Command]

Command/Uninit.hs

@@ -14,7 +14,7 @@ import Command
 import Messages
 import Types
 import Utility
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import qualified Command.Unannex
 import qualified Command.Init

Command/Unused.hs

@@ -22,8 +22,8 @@ import Locations
 import Utility
 import LocationLog
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
-import qualified GitRepo.LsFiles as LsFiles
+import qualified Git.LsFiles as LsFiles
 import qualified Backend
 import qualified Remote
 

Config.hs

@@ -10,7 +10,7 @@ module Config where
 import Data.Maybe
 import Control.Monad.State (liftIO)
 
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import Types
 import Utility

Content.hs

@@ -36,7 +36,7 @@ import Types
 import Locations
 import LocationLog
 import UUID
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import qualified AnnexQueue
 import qualified Branch

Git.hs

@@ -3,12 +3,12 @@
  - This is written to be completely independant of git-annex and should be
  - suitable for other uses.
  -
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2011 Joey Hess <joey@kitenet.net>
  -
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module GitRepo (
+module Git (
 	Repo,
 	repoFromCwd,
 	repoFromAbsPath,

Git/LsFiles.hs

@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module GitRepo.LsFiles (
+module Git.LsFiles (
 	inRepo,
 	notInRepo,
 	staged,
@@ -15,7 +15,7 @@ module GitRepo.LsFiles (
 	typeChangedStaged,
 ) where
 
-import GitRepo
+import Git
 import Utility
 
 {- Scans for files that are checked into git at the specified locations. -}

GitAnnex.hs

@@ -9,7 +9,7 @@ module GitAnnex where
 
 import System.Console.GetOpt
 
-import qualified GitRepo as Git
+import qualified Git
 import CmdLine
 import Command
 import Options

GitQueue.hs

@@ -21,7 +21,7 @@ import Data.String.Utils
 import Control.Monad (unless, forM_)
 import Utility
 
-import qualified GitRepo as Git
+import qualified Git
 
 {- An action to perform in a git repository. The file to act on
  - is not included, and must be able to be appended after the params. -}

GitUnionMerge.hs

@@ -18,7 +18,7 @@ import Data.List
 import Data.Maybe
 import Data.String.Utils
 
-import qualified GitRepo as Git
+import qualified Git
 import Utility
 
 {- Performs a union merge between two branches, staging it in the index.

LocationLog.hs

@@ -34,7 +34,7 @@ import Control.Monad (when)
 import Data.Maybe
 import Control.Monad.State (liftIO)
 
-import qualified GitRepo as Git
+import qualified Git
 import qualified Branch
 import UUID
 import Types

Locations.hs

@@ -36,7 +36,7 @@ import Data.Hash.MD5
 
 import Types
 import Types.Key
-import qualified GitRepo as Git
+import qualified Git
 
 {- Conventions:
  -

Remote/Bup.hs

@@ -21,7 +21,7 @@ import System.Cmd.Utils
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Locations

Remote/Directory.hs

@@ -18,7 +18,7 @@ import System.FilePath
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Locations

Remote/Git.hs

@@ -15,7 +15,7 @@ import System.Posix.Files
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import Locations
 import UUID

Remote/Hook.hs

@@ -20,7 +20,7 @@ import System.Exit
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Locations

Remote/Rsync.hs

@@ -18,7 +18,7 @@ import System.Posix.Process
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Locations

Remote/S3real.hs

@@ -27,7 +27,7 @@ import System.Posix.Env (setEnv)
 import Types
 import Types.Remote
 import Types.Key
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Messages

Remote/Special.hs

@@ -14,7 +14,7 @@ import Control.Monad.State (liftIO)
 
 import Types
 import Types.Remote
-import qualified GitRepo as Git
+import qualified Git
 import qualified Annex
 import UUID
 import Utility

Ssh.hs

@@ -9,7 +9,7 @@ module Ssh where
 
 import Control.Monad.State (liftIO)
 
-import qualified GitRepo as Git
+import qualified Git
 import Utility
 import Types
 import Config

Types/Remote.hs

@@ -12,7 +12,7 @@ module Types.Remote where
 import Control.Exception
 import Data.Map as M
 
-import qualified GitRepo as Git
+import qualified Git
 import Types.Key
 
 type RemoteConfig = M.Map String String

UUID.hs

@@ -29,7 +29,7 @@ import System.IO
 import qualified Data.Map as M
 import Data.Maybe
 
-import qualified GitRepo as Git
+import qualified Git
 import qualified Branch
 import Types
 import Types.UUID

Upgrade/V1.hs

@@ -25,8 +25,8 @@ import Locations
 import LocationLog
 import qualified Annex
 import qualified AnnexQueue
-import qualified GitRepo as Git
+import qualified Git
-import qualified GitRepo.LsFiles as LsFiles
+import qualified Git.LsFiles as LsFiles
 import Backend
 import Messages
 import Version

Upgrade/V2.hs

@@ -16,7 +16,7 @@ import Data.Maybe
 import Types.Key
 import Types
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
 import qualified Branch
 import Messages
 import Utility

Version.hs

@@ -11,7 +11,7 @@ import Control.Monad (unless)
 
 import Types
 import qualified Annex
-import qualified GitRepo as Git
+import qualified Git
 import Config
 
 type Version = String

git-annex-shell.hs

@@ -8,7 +8,7 @@
 import System.Environment
 import Data.List
 
-import qualified GitRepo as Git
+import qualified Git
 import CmdLine
 import Command
 import Utility

git-annex.hs

@@ -10,6 +10,4 @@ import System.Environment
 import GitAnnex
 
 main :: IO ()
-main = do
+main = run =<< getArgs
-	args <- getArgs
-	run args

git-union-merge.hs

@@ -11,7 +11,7 @@ import System.Directory
 import Control.Monad (when)
 
 import qualified GitUnionMerge
-import qualified GitRepo as Git
+import qualified Git
 
 header :: String
 header = "Usage: git-union-merge ref ref newref"

test.hs

@@ -27,7 +27,7 @@ import System.IO.HVFS (SystemFS(..))
 import qualified Annex
 import qualified BackendList
 import qualified Backend
-import qualified GitRepo as Git
+import qualified Git
 import qualified Locations
 import qualified Utility
 import qualified Types.Backend