after is a better name for observe_

This commit is contained in:
Joey Hess 2012-01-03 00:29:27 -04:00
parent 34abd7bca8
commit ee554542c1
3 changed files with 9 additions and 10 deletions

View file

@ -182,7 +182,7 @@ onLocal r a = do
-- No need to update the branch; its data is not used
-- for anything onLocal is used to do.
Annex.BranchState.disableUpdate
observe_ (liftIO Git.Command.reap) a
liftIO Git.Command.reap `after` a
keyUrls :: Git.Repo -> Key -> [String]
keyUrls r key = map tourl (annexLocations key)
@ -217,9 +217,9 @@ copyToRemote r key
-- run copy from perspective of remote
liftIO $ onLocal r $ do
ensureInitialized
observe_ Annex.Content.saveState $
Annex.Content.getViaTmp key $
rsyncOrCopyFile params keysrc
Annex.Content.saveState `after`
Annex.Content.getViaTmp key
(rsyncOrCopyFile params keysrc)
| Git.repoIsSsh r = do
keysrc <- inRepo $ gitAnnexLocation key
rsyncHelper =<< rsyncParamsRemote r False key keysrc