Changeset 78 in tailor

Timestamp:

07/12/04 15:20:15 (9 years ago)

Author:

lele@…

Hash name:

20040712132015-97f81-ab52233e6009a68c307a5af1c2279b73fb8d61f5

Message:

Recognize deleted (dead) entries in the cvs log

Location:

vcpx

Files:

• cvs.py (modified) (3 diffs)
• tests/cvs.py (modified) (4 diffs)

vcpx/cvs.py

@@ -118 +118 @@
 
         info = log.readline().split(';')
+
+        assert info[0][:6] == 'date: '
         
         day,time = info[0][6:].split(' ')
@@ -123 +125 @@
         hh,mm,ss = map(int, time.split(':'))
         date = datetime(y,m,d,hh,mm,ss)
+
+        assert info[1].strip()[:8] == 'author: '
+
         author = info[1].strip()[8:]
+
+        assert info[2].strip()[:7] == 'state: '
+
+        state = info[2].strip()[7:]
+        
         mesg = []
         l = log.readline()
@@ -167 +177 @@
             cs = self.__parseRevision(entry, log)
             while cs:
-                date,author,changelog,e,rev = cs
+                date,author,changelog,e,rev,state = cs
 
                 last = self.__collect(date, author, changelog, e, rev)
-                last.action_kind = last.UPDATED
+                if state == 'dead':
+                    last.action_kind = last.DELETED
+                else:
+                    last.action_kind = last.UPDATED
                 
                 cs = self.__parseRevision(entry, log)

vcpx/tests/cvs.py

@@ -5 +5 @@
 # :Autore:   Lele Gaifax <lele@nautilus.homeip.net>
 # 
-
-"""
-"""
-
-__docformat__ = 'reStructuredText'
 
 from unittest import TestCase, TestSuite
@@ -97 +92 @@
 """
     
+    DELETED_TEST = """\
+RCS file: /cvsroot/docutils/docutils/THANKS.txt,v
+Working file: THANKS.txt
+head: 1.2
+branch:
+locks: strict
+access list:
+symbolic names:
+keyword substitution: kv
+total revisions: 2;      selected revisions: 2
+description:
+----------------------------
+revision 1.2
+date: 2004/06/10 02:17:20;  author: goodger;  state: dead;  lines: +3 -2
+updated
+----------------------------
+revision 1.1
+date: 2004/06/03 13:50:58;  author: goodger;  state: Exp;
+Added to project (exctracted from HISTORY.txt)
+=============================================================================
+"""
+
     def testBasicBehaviour(self):
         """Verify basic cvs log parser behaviour"""
@@ -122 +139 @@
         self.assertEqual(entry.action_kind, entry.UPDATED)
        
-    def testDoubleBehaviour(self):
-        """Verify cvs log parser behaviour"""
+    def testGroupingCapability(self):
+        """Verify cvs log parser grouping capability"""
 
         log = StringIO(self.DOUBLE_TEST)
@@ -157 +174 @@
         self.assertEqual(cset.author, "felixwiemann")
         self.assertEqual(cset.date, datetime(2004, 6, 20, 16, 3, 17))
+
+    def testDeletedEntry(self):
+        """Verify recognition of deleted entries in the cvs log"""
+
+        log = StringIO(self.DELETED_TEST)
+        csets = changesets_from_cvslog(log)
+
+        cset = csets.next()
+        entry = cset.entries[0]
+        self.assertEqual(entry.action_kind, entry.ADDED)
+        
+        cset = csets.next()
+        entry = cset.entries[0]
+        self.assertEqual(entry.action_kind, entry.DELETED)