[PATCH 2 of 4] obsolete: obsstore.add now takes a list of markers

[Pierre-Yves David]

# HG changeset patch
# User Pierre-Yves.David at ens-lyon.org
# Date 1342210511 -7200
# Node ID f8b96a6ba78380af7f4c22f2b345f7f8b4b19c1e
# Parent  743a6a0c7a879874783c6c3983bc4c8928d4e83c
obsolete: obsstore.add now takes a list of markers.

This allow efficient IO and it greatly simplify the merging of markers.

diff -r 743a6a0c7a87 -r f8b96a6ba783 mercurial/obsolete.py
--- a/mercurial/obsolete.py	Thu Jul 12 19:58:07 2012 +0200
+++ b/mercurial/obsolete.py	Fri Jul 13 22:15:11 2012 +0200
@@ -164,8 +164,7 @@
         self.sopener = sopener
         data = sopener.tryread('obsstore')
         if data:
-            for marker in _readmarkers(data):
-                self._load(marker)
+            self._load(_readmarkers(data))
 
     def __iter__(self):
         return iter(self._all)
@@ -188,39 +187,40 @@
             if len(succ) != 20:
                 raise ValueError(succ)
         marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata))
-        self.add(transaction, marker)
+        self.add(transaction, [marker])
 
-    def add(self, transaction, marker):
-        """Add a new marker to the store"""
-        if marker not in self._all:
+    def add(self, transaction, markers):
+        """Add new markers to the store
+
+        Take care of filtering duplicate.
+        Return the number of new marker."""
+        new = [m for m in markers if m not in self._all]
+        if new:
             f = self.sopener('obsstore', 'ab')
             try:
                 offset = f.tell()
                 transaction.add('obsstore', offset)
                 # offset == 0: new file - add the version header
-                for bytes in _encodemarkers([marker], offset == 0):
+                for bytes in _encodemarkers(new, offset == 0):
                     f.write(bytes)
             finally:
                 # XXX: f.close() == filecache invalidation == obsstore rebuilt.
                 # call 'filecacheentry.refresh()'  here
                 f.close()
-            self._load(marker)
+            self._load(new)
+        return len(new)
 
     def mergemarkers(self, transation, data):
-        other = _readmarkers(data)
-        local = set(self._all)
-        new = [m for m in other if m not in local]
-        for marker in new:
-            # XXX: N marker == N x (open, write, close)
-            # we should write them all at once
-            self.add(transation, marker)
+        markers = _readmarkers(data)
+        self.add(transation, markers)
 
-    def _load(self, marker):
-        self._all.append(marker)
-        pre, sucs = marker[:2]
-        self.precursors.setdefault(pre, set()).add(marker)
-        for suc in sucs:
-            self.successors.setdefault(suc, set()).add(marker)
+    def _load(self, markers):
+        for mark in markers:
+            self._all.append(mark)
+            pre, sucs = mark[:2]
+            self.precursors.setdefault(pre, set()).add(mark)
+            for suc in sucs:
+                self.successors.setdefault(suc, set()).add(mark)
 
 def _encodemarkers(markers, addheader=False):
     # Kept separate from flushmarkers(), it will be reused for