use gitRepo

This commit is contained in:
Joey Hess 2012-10-12 01:17:45 -04:00
parent a7642b3b6e
commit 549c779a38
7 changed files with 10 additions and 10 deletions

View file

@ -25,7 +25,7 @@ thisThread = "Merger"
- pushes. -}
mergeThread :: ThreadState -> DaemonStatusHandle -> TransferQueue -> NamedThread
mergeThread st dstatus transferqueue = thread $ do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
let dir = Git.localGitDir g </> "refs"
createDirectoryIfMissing True dir
let hook a = Just $ runHandler st dstatus transferqueue a

View file

@ -74,7 +74,7 @@ oneDay = 24 * 60 * 60
- will block the watcher. -}
check :: ThreadState -> DaemonStatusHandle -> TransferQueue -> ChangeChan -> IO Bool
check st dstatus transferqueue changechan = do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
-- Find old unstaged symlinks, and add them to git.
(unstaged, cleanup) <- Git.LsFiles.notInRepo False ["."] g
now <- getPOSIXTime

View file

@ -24,7 +24,7 @@ thisThread = "TransferPoller"
- of each transfer is complete. -}
transferPollerThread :: ThreadState -> DaemonStatusHandle -> NamedThread
transferPollerThread st dstatus = thread $ do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
tn <- newNotificationHandle =<<
transferNotifier <$> getDaemonStatus dstatus
forever $ do

View file

@ -94,7 +94,7 @@ expensiveScan :: ThreadState -> DaemonStatusHandle -> TransferQueue -> [Remote]
expensiveScan st dstatus transferqueue rs = unless onlyweb $ do
liftIO $ debug thisThread ["starting scan of", show visiblers]
void $ alertWhile dstatus (scanAlert visiblers) $ do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
(files, cleanup) <- LsFiles.inRepo [] g
go files
void cleanup

View file

@ -24,7 +24,7 @@ thisThread = "TransferWatcher"
- and updates the DaemonStatus's map of ongoing transfers. -}
transferWatcherThread :: ThreadState -> DaemonStatusHandle -> TransferQueue -> NamedThread
transferWatcherThread st dstatus transferqueue = thread $ do
g <- runThreadState st $ fromRepo id
g <- runThreadState st gitRepo
let dir = gitAnnexTransferDir g
createDirectoryIfMissing True dir
let hook a = Just $ runHandler st dstatus transferqueue a