mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix git push startup

Browse source
This commit is contained in:
Joey Hess 2012-11-09 15:03:16 -04:00
parent d7911e0377
commit 232b61e946
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Assistant/XMPP/Git.hs
View file

@ -19,7 +19,7 @@ import Assistant.Sync
import Annex.UUID import Annex.UUID
import Config import Config
import Git import Git
import Git.Command import qualified Git.Command
import qualified Git.Branch import qualified Git.Branch
import qualified Annex.Branch import qualified Annex.Branch
import Locations.UserConfig import Locations.UserConfig
@ -33,6 +33,7 @@ import System.Posix.Types
import System.Process (std_in, std_out, std_err) import System.Process (std_in, std_out, std_err)
import Control.Concurrent import Control.Concurrent
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.Map as M
finishXMPPPairing :: JID -> UUID -> Assistant () finishXMPPPairing :: JID -> UUID -> Assistant ()
finishXMPPPairing jid u = void $ alertWhile alert $ finishXMPPPairing jid u = void $ alertWhile alert $
@ -85,15 +86,13 @@ xmppPush cid remote refs = runPush (SendPushRunning cid) handleDeferred $ do
env <- liftIO getEnvironment env <- liftIO getEnvironment
path <- liftIO getSearchPath path <- liftIO getSearchPath
let myenv = let myenv = M.fromList
[ ("PATH", join [searchPathSeparator] $ tmpdir:path) [ ("PATH", join [searchPathSeparator] $ tmpdir:path)
, (relayIn, show inf) , (relayIn, show inf)
, (relayOut, show outf) , (relayOut, show outf)
, (relayControl, show controlf) , (relayControl, show controlf)
] ]
g <- liftAnnex gitRepo `M.union` M.fromList env
let name = Remote.name remote
let params = Param "push" : Param name : map (Param . show) refs
inh <- liftIO $ fdToHandle readpush inh <- liftIO $ fdToHandle readpush
outh <- liftIO $ fdToHandle writepush outh <- liftIO $ fdToHandle writepush
@ -103,9 +102,14 @@ xmppPush cid remote refs = runPush (SendPushRunning cid) handleDeferred $ do
t1 <- forkIO <~> toxmpp inh t1 <- forkIO <~> toxmpp inh
t2 <- forkIO <~> fromxmpp outh controlh t2 <- forkIO <~> fromxmpp outh controlh
ok <- liftIO $ boolSystemEnv "git" {- This can take a long time to run, so avoid running it in the
(gitCommandLine params g) - Annex monad. Also, override environment. -}
(Just $ env ++ myenv) g <- liftAnnex gitRepo
let g' = g { gitEnv = Just $ M.toList myenv }
let name = Remote.name remote
let params = Param name : map (Param . show) refs
ok <- liftIO $ Git.Command.runBool "push" params g'
liftIO $ mapM_ killThread [t1, t2] liftIO $ mapM_ killThread [t1, t2]
return ok return ok
where where