summaryrefslogtreecommitdiff
path: root/Annex/Branch
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-03 16:35:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-03 16:35:57 -0400
commit6e2eaff251cff32119f9def02afafa709e5d3da8 (patch)
treeef791fa88d0e8ea7dd3545cefe649034a6823683 /Annex/Branch
parent0013d5b66019a96c809d28c96a0d3555694b1de2 (diff)
add remote state logs
This allows a remote to store a piece of arbitrary state associated with a key. This is needed to support Tahoe, where the file-cap is calculated from the data stored in it, and used to retrieve a key later. Glacier also would be much improved by using this. GETSTATE and SETSTATE are added to the external special remote protocol. Note that the state is left as-is even when a key is removed from a remote. It's up to the remote to decide when it wants to clear the state. The remote state log, $KEY.log.rmt, is a UUID-based log. However, rather than using the old UUID-based log format, I created a new variant of that format. The new varient is more space efficient (since it lacks the "timestamp=" hack, and easier to parse (and the parser doesn't mess with whitespace in the value), and avoids compatability cruft in the old one. This seemed worth cleaning up for these new files, since there could be a lot of them, while before UUID-based logs were only used for a few log files at the top of the git-annex branch. The transition code has also been updated to handle these new UUID-based logs. This commit was sponsored by Daniel Hofer.
Diffstat (limited to 'Annex/Branch')
-rw-r--r--Annex/Branch/Transitions.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs
index 90002de62..84cd1bbd9 100644
--- a/Annex/Branch/Transitions.hs
+++ b/Annex/Branch/Transitions.hs
@@ -34,6 +34,8 @@ dropDead :: FilePath -> String -> TrustMap -> FileTransition
dropDead f content trustmap = case getLogVariety f of
Just UUIDBasedLog -> ChangeFile $
UUIDBased.showLog id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLog Just content
+ Just NewUUIDBasedLog -> ChangeFile $
+ UUIDBased.showLogNew id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLogNew Just content
Just (PresenceLog _) ->
let newlog = Presence.compactLog $ dropDeadFromPresenceLog trustmap $ Presence.parseLog content
in if null newlog