diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-01-28 17:17:26 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 17:17:26 -0400 |
commit | 20a8350e36f6e38b55603e6578fa7b1c4967c1a9 (patch) | |
tree | 6c6b884cbc52496d614be996d702e0b8f6dc9300 /Logs/Web.hs | |
parent | 6e765717650f0270cdc497d38245bcbc4180e60c (diff) |
implement annex.tune.branchhash1
I hope this doesn't impact speed much -- it does have to pull out a value
from Annex state every time it accesses the branch now.
The test case I dropped has never caught any problems that I can remember,
and would have been rather difficult to convert.
Diffstat (limited to 'Logs/Web.hs')
-rw-r--r-- | Logs/Web.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Logs/Web.hs b/Logs/Web.hs index 4729cead4..38993c33c 100644 --- a/Logs/Web.hs +++ b/Logs/Web.hs @@ -37,7 +37,8 @@ import Utility.Url {- Gets all urls that a key might be available from. -} getUrls :: Key -> Annex [URLString] getUrls key = do - l <- go $ urlLogFile key : oldurlLogs key + config <- Annex.getGitConfig + l <- go $ urlLogFile config key : oldurlLogs config key tmpl <- Annex.getState (maybeToList . M.lookup key . Annex.tempurls) return (tmpl ++ l) where @@ -54,13 +55,15 @@ getUrlsWithPrefix key prefix = filter (prefix `isPrefixOf`) <$> getUrls key setUrlPresent :: UUID -> Key -> URLString -> Annex () setUrlPresent uuid key url = do us <- getUrls key - unless (url `elem` us) $ - addLog (urlLogFile key) =<< logNow InfoPresent url + unless (url `elem` us) $ do + config <- Annex.getGitConfig + addLog (urlLogFile config key) =<< logNow InfoPresent url logChange key uuid InfoPresent setUrlMissing :: UUID -> Key -> URLString -> Annex () setUrlMissing uuid key url = do - addLog (urlLogFile key) =<< logNow InfoMissing url + config <- Annex.getGitConfig + addLog (urlLogFile config key) =<< logNow InfoMissing url whenM (null <$> getUrls key) $ logChange key uuid InfoMissing |