userheads

MoinMoin/storage/backends/stores.py

 # Copyright: 2011 MoinMoin:RonnyPfannschmidt
 # Copyright: 2011 MoinMoin:ThomasWaldmann
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
 MoinMoin - backend that ties together 4 key/value stores
 
 A meta store (a ByteStore):
 
 - key = revid UUID (bytes, ascii)
@@ skipping 124 matching lines @@
 
     def retrieve(self, metaid):
         meta = self._get_meta(metaid)
         dataid = meta[DATAID]
         data = self._get_data(dataid)
         return meta, data
 
     def retrieve_branch(self, branchid):
         return self._get_branch(branchid)
 ····
-    def retrieve_branch(self, userheadid):
+    def retrieve_userhead(self, userheadid):
         return self._get_userhead(userheadid)
 
 
 class MutableBackend(Backend, MutableBackendBase):
     """
     same as Backend, but read/write
     """
     def create(self):
         self.meta_store.create()
         self.data_store.create()
@@ skipping 24 matching lines @@
         return metaid
 
     def store_branch(self, branch):
         branchid = branch.get(BRANCH_ID, make_uuid())
         branch = self._serialize(branch)
         self.branches_store[branchid] = branch
         return branchid
 
     def store_userhead(self, userhead):
         uhid = userhead.get(UH_ID, make_uuid())
-        userhead = self._serialize(branch)
-        self.userheads_store[userheadid] = userhead
-        return userheadid
+        userhead = self._serialize(userhead)
+        self.userheads_store[uhid] = userhead
+        return uhid
 
     def store(self, meta, data):
         # XXX Idea: we could check the type the store wants from us:
         # if it is a str/bytes (BytesStore), just use meta "as is",
         # if it is a file (FileStore), wrap it into StringIO and give that to the store.
         if DATAID not in meta:
             tfw = TrackingFileWrapper(data, hash_method=HASH_ALGORITHM)
             dataid = make_uuid()
             self.data_store[dataid] = tfw
             meta[DATAID] = dataid
@@ skipping 25 matching lines @@
 
     def _del_data(self, dataid):
         del self.data_store[dataid]
 
     def remove(self, metaid):
         meta = self._get_meta(metaid)
         dataid = meta[DATAID]
         self._del_meta(metaid)
         self._del_data(dataid)