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

reorg threads

Browse source
This commit is contained in:
Joey Hess 2012-06-25 16:10:10 -04:00
parent 19eee6a1df
commit 0b146f9ecc
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Assistant.hs
View file

@ -59,11 +59,11 @@ import Assistant.ThreadedMonad
import Assistant.DaemonStatus import Assistant.DaemonStatus
import Assistant.Changes import Assistant.Changes
import Assistant.Commits import Assistant.Commits
import Assistant.Watcher import Assistant.Threads.Watcher
import Assistant.Committer import Assistant.Threads.Committer
import Assistant.Pusher import Assistant.Threads.Pusher
import Assistant.Merger import Assistant.Threads.Merger
import Assistant.SanityChecker import Assistant.Threads.SanityChecker
import qualified Utility.Daemon import qualified Utility.Daemon
import Utility.LogFile import Utility.LogFile

4
Assistant/Committer.hs → Assistant/Threads/Committer.hs
View file

@ -5,13 +5,13 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Assistant.Committer where module Assistant.Threads.Committer where
import Common.Annex import Common.Annex
import Assistant.Changes import Assistant.Changes
import Assistant.Commits import Assistant.Commits
import Assistant.ThreadedMonad import Assistant.ThreadedMonad
import Assistant.Watcher import Assistant.Threads.Watcher
import qualified Annex import qualified Annex
import qualified Annex.Queue import qualified Annex.Queue
import qualified Git.Command import qualified Git.Command

2
Assistant/Merger.hs → Assistant/Threads/Merger.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Assistant.Merger where module Assistant.Threads.Merger where
import Common.Annex import Common.Annex
import Assistant.ThreadedMonad import Assistant.ThreadedMonad

2
Assistant/Pusher.hs → Assistant/Threads/Pusher.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Assistant.Pusher where module Assistant.Threads.Pusher where
import Common.Annex import Common.Annex
import Assistant.Commits import Assistant.Commits

8
Assistant/SanityChecker.hs → Assistant/Threads/SanityChecker.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Assistant.SanityChecker ( module Assistant.Threads.SanityChecker (
sanityCheckerThread sanityCheckerThread
) where ) where
@ -15,7 +15,7 @@ import Assistant.DaemonStatus
import Assistant.ThreadedMonad import Assistant.ThreadedMonad
import Assistant.Changes import Assistant.Changes
import Utility.ThreadScheduler import Utility.ThreadScheduler
import qualified Assistant.Watcher import qualified Assistant.Threads.Watcher as Watcher
import Data.Time.Clock.POSIX import Data.Time.Clock.POSIX
@ -79,5 +79,5 @@ check st status changechan = do
insanity m = runThreadState st $ warning m insanity m = runThreadState st $ warning m
addsymlink file s = do addsymlink file s = do
insanity $ "found unstaged symlink: " ++ file insanity $ "found unstaged symlink: " ++ file
Assistant.Watcher.runHandler st status changechan Watcher.runHandler st status changechan
Assistant.Watcher.onAddSymlink file s Watcher.onAddSymlink file s

2
Assistant/Watcher.hs → Assistant/Threads/Watcher.hs
View file

@ -7,7 +7,7 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
module Assistant.Watcher where module Assistant.Threads.Watcher where
import Common.Annex import Common.Annex
import Assistant.ThreadedMonad import Assistant.ThreadedMonad