diff options
author | 2015-05-19 15:04:24 -0400 | |
---|---|---|
committer | 2015-05-19 15:04:24 -0400 | |
commit | bbb2b798aec645f0c0754a5fb4e2fe8a126e2fd4 (patch) | |
tree | 5ed2e57712d389841257462d1057e9689905fb58 /Annex/Content.hs | |
parent | 11c97d173423bd5d3320124670ccc3b4c8675c06 (diff) |
better memoize core.sharedrepository handling
It was memoized, but that was not used consistently. Move it to
Types.GitConfig so it will auto-memoize.
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r-- | Annex/Content.hs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 379ff0785..c19fc29c0 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -614,39 +614,39 @@ preseedTmp key file = go =<< inAnnex key - allow reading it, per core.sharedRepository setting. -} freezeContent :: FilePath -> Annex () freezeContent file = unlessM crippledFileSystem $ - liftIO . go =<< fromRepo getSharedRepository + withShared go where - go GroupShared = modifyFileMode file $ + go GroupShared = liftIO $ modifyFileMode file $ removeModes writeModes . addModes [ownerReadMode, groupReadMode] - go AllShared = modifyFileMode file $ + go AllShared = liftIO $ modifyFileMode file $ removeModes writeModes . addModes readModes - go _ = modifyFileMode file $ + go _ = liftIO $ modifyFileMode file $ removeModes writeModes . addModes [ownerReadMode] {- Adjusts read mode of annexed file per core.sharedRepository setting. -} chmodContent :: FilePath -> Annex () chmodContent file = unlessM crippledFileSystem $ - liftIO . go =<< fromRepo getSharedRepository + withShared go where - go GroupShared = modifyFileMode file $ + go GroupShared = liftIO $ modifyFileMode file $ addModes [ownerReadMode, groupReadMode] - go AllShared = modifyFileMode file $ + go AllShared = liftIO $ modifyFileMode file $ addModes readModes - go _ = modifyFileMode file $ + go _ = liftIO $ modifyFileMode file $ addModes [ownerReadMode] {- Allows writing to an annexed file that freezeContent was called on - before. -} thawContent :: FilePath -> Annex () thawContent file = unlessM crippledFileSystem $ - liftIO . go =<< fromRepo getSharedRepository + withShared go where - go GroupShared = groupWriteRead file - go AllShared = groupWriteRead file - go _ = allowWrite file + go GroupShared = liftIO $ groupWriteRead file + go AllShared = liftIO $ groupWriteRead file + go _ = liftIO $ allowWrite file {- Finds files directly inside a directory like gitAnnexBadDir - (not in subdirectories) and returns the corresponding keys. -} |