Changeset 909 in tailor

Timestamp:

10/16/05 03:42:33 (8 years ago)

Author:

lele@…

Hash name:

20051016014233-97f81-44d6611671f5d5df9cbdd4f1cb6bdbbcc3f4bffb

Message:

Drop the queuelen from the statefile
It was used mainly for informing user about how many changesets were still
pending in the queue. Keeping it in the pickle is a major PITA, and not
relaying on it makes everything more streamy.

Location:

vcpx

Files:

• source.py (modified) (1 diff)
• tailor.py (modified) (1 diff)
• tests/statefile.py (modified) (5 diffs)
• statefile.py (modified) (7 diffs)

vcpx/source.py

@@ -185 +185 @@
         """
 
-        pending = len(self.state_file)
-        if pending == 0:
+        if not self.state_file.pending():
             last = self.state_file.lastAppliedChangeset()
             if last:

vcpx/tailor.py

@@ -102 +102 @@
             raise
 
-        nchanges = len(pendings)
-        if nchanges:
-            self.log_info("Applying %d upstream changesets" % nchanges)
+        if pendings.pending():
+            self.log_info("Applying pending upstream changesets")
 
             try:

vcpx/tests/statefile.py

@@ -21 +21 @@
         sf = StateFile(rontf.name, None)
         sf.setPendingChangesets([1,2,3,4,5])
-        self.assertEqual(len(sf), 5)
 
         sf = StateFile(rontf.name, None)
@@ -38 +37 @@
         sf.applied()
         self.assertEqual(sf.lastAppliedChangeset(), 2)
-        self.assertEqual(len(sf), 3)
         sf.finalize()
+        self.assertEqual(sf.pending(), True)
 
         sf = StateFile(rontf.name, None)
         self.assertEqual(sf.lastAppliedChangeset(), 2)
-        self.assertEqual(len(sf), 3)
         i = 3
         for cs in sf:
             self.assertEqual(cs, i)
+            sf.applied()
             i += 1
+        sf.finalize()
+        self.assertEqual(sf.pending(), False)
 
     def testJournal(self):
@@ -58 +59 @@
         sf = StateFile(rontf.name, None)
         sf.setPendingChangesets([1,2,3,4,5])
-        self.assertEqual(len(sf), 5)
 
         sf = StateFile(rontf.name, None)
@@ -68 +68 @@
         sf.applied()
         self.assertEqual(sf.lastAppliedChangeset(), 2)
-        self.assertEqual(len(sf), 3)
         self.assert_(exists(rontf.name + '.journal'))
 
         sf = StateFile(rontf.name, None)
         self.assertEqual(sf.lastAppliedChangeset(), 2)
-        self.assertEqual(len(sf), 3)
         i = 3
         for cs in sf:
@@ -86 +84 @@
         sf = StateFile(rontf.name, None)
         sf.setPendingChangesets([1,2,3,4,5])
-        self.assertEqual(len(sf), 5)
 
         reversed = list(sf.reversed())

vcpx/statefile.py

@@ -45 +45 @@
         self.last_applied = None
         self.current = None
-        self.queuelen = 0
 
     def _load(self):
@@ -60 +59 @@
             self.archive = open(self.filename)
             self.last_applied = load(self.archive)
-            self.queuelen = load(self.archive)
+            # compatibility dummity: there was the queuelen here
+            load(self.archive)
         except IOError:
             self.archive = None
             self.last_applied = None
-            self.queuelen = 0
 
     def _write(self, changesets):
@@ -75 +74 @@
             sf = open(self.filename, 'w')
             dump(self.last_applied, sf)
-            dump(len(changesets), sf)
+            dump(None, sf)
             for cs in changesets:
                 dump(cs, sf)
@@ -97 +96 @@
             self.archive = None
             raise StopIteration
-        self.queuelen -= 1
         return self.current
-
-    def __len__(self):
-        if self.archive is None:
-            self._load()
-        return self.queuelen
 
     def reversed(self):
@@ -128 +121 @@
             yield load(self.archive)
 
+    def pending(self):
+        """
+        Verify if there's at least one changeset still pending.
+        """
+
+        if self.archive is None:
+            self._load()
+        if self.archive is None:
+            return False
+
+        pos = self.archive.tell()
+        try:
+            next = load(self.archive)
+        except EOFError:
+            next = None
+        self.archive.seek(pos)
+        return next is not None
+
     def applied(self, current=None):
         """
@@ -170 +181 @@
                     old = open(self.filename)
                     load(old) # last applied
-                    queuelen = load(old)
-                    if queuelen>0:
+                    load(old) # dummy queuelen
+                    try:
                         cs = load(old)
                         # Skip already applied changesets
                         while cs <> last_applied:
-                            queuelen -= 1
-                            if queuelen==0:
-                                break
                             cs = load(old)
-
+                    except EOFError:
+                        cs = None
                     sf = open(self.filename + '.new', 'w')
                     dump(last_applied, sf)
-                    if queuelen==0:
-                        dump(queuelen, sf)
-                    else:
-                        dump(queuelen-1, sf)
+                    dump(None, sf)
+                    if cs is not None:
                         while True:
                             try:
@@ -199 +206 @@
                     sf = open(self.filename, 'w')
                     dump(last_applied, sf)
-                    dump(0, sf)
                     sf.close()