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/RemoteState.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/RemoteState.hs')
| -rw-r--r-- | Logs/RemoteState.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Logs/RemoteState.hs b/Logs/RemoteState.hs index 7b3859a35..b302b739a 100644 --- a/Logs/RemoteState.hs +++ b/Logs/RemoteState.hs @@ -14,6 +14,7 @@ import Common.Annex import Logs import Logs.UUIDBased import qualified Annex.Branch +import qualified Annex import qualified Data.Map as M import Data.Time.Clock.POSIX @@ -23,11 +24,14 @@ type RemoteState = String setRemoteState :: UUID -> Key -> RemoteState -> Annex () setRemoteState u k s = do ts <- liftIO getPOSIXTime - Annex.Branch.change (remoteStateLogFile k) $ + config <- Annex.getGitConfig + Annex.Branch.change (remoteStateLogFile config k) $ showLogNew id . changeLog ts u s . parseLogNew Just getRemoteState :: UUID -> Key -> Annex (Maybe RemoteState) -getRemoteState u k = extract . parseLogNew Just - <$> Annex.Branch.get (remoteStateLogFile k) +getRemoteState u k = do + config <- Annex.getGitConfig + extract . parseLogNew Just + <$> Annex.Branch.get (remoteStateLogFile config k) where extract m = value <$> M.lookup u m |