summaryrefslogtreecommitdiff
path: root/doc/design/assistant/syncing.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-05 10:34:52 -0600
committerGravatar Joey Hess <joey@kitenet.net>2012-07-05 10:34:52 -0600
commitb7c3cc27454181dabd14a90560a5e613048314e8 (patch)
treeafd09d349536084d7cfb5cfd36109224ec379b30 /doc/design/assistant/syncing.mdwn
parent83c66ccaf88a10e8f4b16fc2162cbed2656b95e0 (diff)
parentc1728849a9b5d1e7803cf6a36f826a7bafdc667a (diff)
Merge branch 'master' into assistant
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
-rw-r--r--doc/design/assistant/syncing.mdwn9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index aa3c6066b..61434088d 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -16,7 +16,7 @@ all the other git clones, at both the git level and the key/value level.
* Poll transfer in progress info files for changes (use inotify again!
wow! hammer, meet nail..), and update the TransferInfo Map **done**
* enqueue Transfers (Uploads) as new files are added to the annex by
- Watcher.
+ Watcher. **done**
* enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by
Watcher.
* Write basic Transfer handling thread. Multiple such threads need to be
@@ -88,11 +88,8 @@ anyway.
### transfer tracking
-* Upload added to queue by the watcher thread when it adds content.
-* Download added to queue by the watcher thread when it seens new symlinks
- that lack content.
-* Transfer threads started/stopped as necessary to move data.
- (May sometimes want multiple threads downloading, or uploading, or even both.)
+Transfer threads started/stopped as necessary to move data.
+(May sometimes want multiple threads downloading, or uploading, or even both.)
startTransfer :: TransferQueue -> Transfer -> Annex ()
startTransfer q transfer = error "TODO"