diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-10 18:16:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-10 18:16:03 -0400 |
| commit | 2a6fc46baf66d19da150dd5bfb91c3dd9e33e244 (patch) | |
| tree | a72376f7a4b45069f1a8c8bb5155be46d25f9f30 /Assistant/Changes.hs | |
| parent | 5335b4edc67513354c723d51d4f9a7a99cf144c4 (diff) | |
moved transfer queueing out of watcher and into committer
This cleaned up the code quite a bit; now the committer just looks at the
Change to see if it's a change that needs to have a transfer queued for it.
If I later want to add dropping keys for files that were removed, or
something like that, this should make it straightforward.
This also fixes a bug. In direct mode, moving a file out of an archive
directory failed to start a transfer to get its content. The problem
was that the file had not been committed to git yet, and so the transfer
code didn't want to touch it, since fileKey failed to get its key.
Only starting transfers after a commit avoids this problem.
Diffstat (limited to 'Assistant/Changes.hs')
| -rw-r--r-- | Assistant/Changes.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Changes.hs b/Assistant/Changes.hs index 3d3956899..9114f5124 100644 --- a/Assistant/Changes.hs +++ b/Assistant/Changes.hs @@ -14,7 +14,7 @@ import Utility.TSet import Data.Time.Clock {- Handlers call this when they made a change that needs to get committed. -} -madeChange :: FilePath -> ChangeType -> Assistant (Maybe Change) +madeChange :: FilePath -> ChangeInfo -> Assistant (Maybe Change) madeChange f t = Just <$> (Change <$> liftIO getCurrentTime <*> pure f <*> pure t) noChange :: Assistant (Maybe Change) |