Changeset 866 in tailor

Timestamp:

10/03/05 01:25:00 (8 years ago)

Author:

lele@…

Hash name:

20051002232500-97f81-927d793eaed07abcad3e7c7dd2bbabb13fce527f

Message:

Collapse multiple deletions on a single file, being tolerant on timestamp
This complete the fix to #7, taking into account the usual threshold
when comparing the timestamp.

Location:

vcpx

Files:

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

vcpx/cvs.py

@@ -46 +46 @@
     last = None
 
+    # Loop over collected changesets, and collapse those with same author,
+    # same changelog and that were committed within 3 minutes one from the
+    # other. If they have entries in common, keep them separated. Special
+    # treatment to deleted entries, given that sometime there are two
+    # deletions on the same file: in that case, keep only the last one,
+    # with higher revision.
     for cs in collected:
-        if (last and last.author == cs.author and  last.log == cs.log and
+        if (last and last.author == cs.author and last.log == cs.log and
             abs(lastts - cs.date) < threshold and
             not [e for e in cs.entries
-                 if e.name in [n.name for n in last.entries]]):
-            last.entries.extend(cs.entries)
+                 if e.name in [n.name for n in last.entries
+                               if n.action_kind <> e.action_kind]]):
+            for e in cs.entries:
+                if e.action_kind == e.DELETED:
+                    doubledelete = False
+                    for n in last.entries:
+                        if n.name == e.name and n.action_kind == n.DELETED:
+                            doubledelete = True
+                            n.new_revision = e.new_revision
+                            break
+                    if not doubledelete:
+                        last.entries.append(e)
+                else:
+                    last.entries.append(e)
             if lastts < cs.date:
                 lastts = cs.date

vcpx/tests/cvs.py

@@ -954 +954 @@
 Backup
 =============================================================================
+
+RCS file: /cvsroot/composestar/composestar/temp/ComposestarVSAddin/ConfigManager/Attic/ConfigManager.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:03;  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
+=============================================================================
 """
 
@@ -960 +982 @@
 
         log = StringIO(self.DOUBLE_DEAD_TEST)
-        csets = changesets_from_cvslog(log, 'composestar')
+        csets = changesets_from_cvslog(log,
+                                       'composestar/temp/ComposestarVSAddin')
 
         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(len(cset.entries), 2)
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'ComposestarVSAddin/Ini.cs')
         self.assertEqual(entry.new_revision, '1.1')
         self.assertEqual(entry.action_kind, entry.ADDED)
+        entry = cset.entries[1]
+        self.assertEqual(entry.name, 'ComposestarVSAddin/ConfigManager.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(len(cset.entries), 2)
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'ComposestarVSAddin/Ini.cs')
         self.assertEqual(entry.new_revision, '1.3')
         self.assertEqual(entry.action_kind, entry.DELETED)
-
+        entry = cset.entries[1]
+        self.assertEqual(entry.name, 'ComposestarVSAddin/ConfigManager.cs')
+        self.assertEqual(entry.new_revision, '1.3')
+        self.assertEqual(entry.action_kind, entry.DELETED)
+