Changeset 865 in tailor

Timestamp:

10/02/05 23:20:50 (8 years ago)

Author:

lele@…

Hash name:

20051002212050-97f81-4a825b665bae966f0bd94786081f61137ee14299

Message:

Collapse multiple deletions on a single file under cvs
This should fix #7, that reported a strange case where cvs log says
a single file has two revisions, by the same author and with the same
timestamp, both deleting the file.

Location:

vcpx

Files:

• cvs.py (modified) (2 diffs)
• tests/cvs.py (modified) (1 diff)

vcpx/cvs.py

@@ -123 +123 @@
         key = (timestamp, author, changelog)
         if self.changesets.has_key(key):
-            return self.changesets[key].addEntry(entry, revision)
+            cs = self.changesets[key]
+            for e in cs.entries:
+                if e.name == entry:
+                    return e
+            return cs.addEntry(entry, revision)
         else:
             cs = Changeset(_getGlobalCVSRevision(timestamp, author),
@@ -281 +285 @@
 
                 if previous and last.action_kind == last.DELETED:
-                    previous.action_kind = previous.ADDED
+                    # For unknown reasons, sometimes there are two dead
+                    # revision is a row.
+                    if previous.action_kind <> last.DELETED:
+                        previous.action_kind = previous.ADDED
 
                 previous = last

vcpx/tests/cvs.py

@@ -929 +929 @@
         self.assertRaises(UnicodeEncodeError, log.encode, 'ascii')
         self.assertEqual(len(log.encode('ascii', 'ignore')), 41)
+
+    DOUBLE_DEAD_TEST = """\
+cvs rlog: Logging composestar/temp/ComposestarVSAddin/ComposestarVSAddin
+
+RCS file: /cvsroot/composestar/composestar/temp/ComposestarVSAddin/Attic/Ini.cs,v
+head: 1.3
+branch:
+locks: strict
+access list:
+keyword substitution: kv
+total revisions: 3;     selected revisions: 3
+description:
+----------------------------
+revision 1.3
+date: 2004/07/15 08:28:02;  author: sverre_boschman;  state: dead;  lines: +0 -0
+*** empty log message ***
+----------------------------
+revision 1.2
+date: 2004/07/15 08:28:02;  author: sverre_boschman;  state: dead;  lines: +0 -0
+*** empty log message ***
+----------------------------
+revision 1.1
+date: 2004/07/14 15:39:55;  author: sverre_boschman;  state: Exp;
+Backup
+=============================================================================
+"""
+
+    def testDoubleDead(self):
+        """Verify the parser collapse multiple deletions on a single entry"""
+
+        log = StringIO(self.DOUBLE_DEAD_TEST)
+        csets = changesets_from_cvslog(log, 'composestar')
+
+        self.assertEqual(len(csets), 2)
+
+        cset = csets[0]
+        self.assertEqual(len(cset.entries), 1)
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'temp/ComposestarVSAddin/ComposestarVSAddin/Ini.cs')
+        self.assertEqual(entry.new_revision, '1.1')
+        self.assertEqual(entry.action_kind, entry.ADDED)
+
+        cset = csets[1]
+        self.assertEqual(len(cset.entries), 1)
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'temp/ComposestarVSAddin/ComposestarVSAddin/Ini.cs')
+        self.assertEqual(entry.new_revision, '1.3')
+        self.assertEqual(entry.action_kind, entry.DELETED)
+