diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-14 15:30:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-14 15:43:13 -0400 |
| commit | 02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (patch) | |
| tree | 456548530c65850a829a1a85609070bc111de1b9 /Annex | |
| parent | 2b24e16a633575703a43e1fb991f34b290a1d7e4 (diff) | |
split more stuff out of Git.hs
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 3 | ||||
| -rw-r--r-- | Annex/Ssh.hs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index a2ecd50a7..a22a4adcf 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -28,6 +28,7 @@ import qualified Git.Ref import qualified Git.Branch import qualified Git.UnionMerge import qualified Git.HashObject +import qualified Git.Index import Annex.CatFile {- Name of the branch that is used to store git-annex's information. -} @@ -249,7 +250,7 @@ withIndex = withIndex' False withIndex' :: Bool -> Annex a -> Annex a withIndex' bootstrapping a = do f <- fromRepo gitAnnexIndex - bracketIO (Git.useIndex f) id $ do + bracketIO (Git.Index.override f) id $ do unlessM (liftIO $ doesFileExist f) $ do unless bootstrapping create liftIO $ createDirectoryIfMissing True $ takeDirectory f diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 6893f94ef..fe83aad00 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -10,6 +10,7 @@ module Annex.Ssh where import Control.Monad.State (liftIO) import qualified Git +import qualified Git.Url import Utility.SafeCommand import Types import Config @@ -22,10 +23,10 @@ sshToRepo :: Git.Repo -> [CommandParam] -> Annex [CommandParam] sshToRepo repo sshcmd = do s <- getConfig repo "ssh-options" "" let sshoptions = map Param (words s) - let sshport = case Git.urlPort repo of + let sshport = case Git.Url.port repo of Nothing -> [] Just p -> [Param "-p", Param (show p)] - let sshhost = Param $ Git.urlHostUser repo + let sshhost = Param $ Git.Url.hostuser repo return $ sshoptions ++ sshport ++ [sshhost] ++ sshcmd {- Generates parameters to run a git-annex-shell command on a remote |