Changeset 83 in tailor

Timestamp:

07/12/04 19:41:23 (9 years ago)

Author:

lele@…

Hash name:

20040712174123-97f81-088445f4e9e4bde496f3631d2062543f7c62612a

Message:

Collapse related CVS changes into a single one

Location:

vcpx

Files:

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

vcpx/cvs.py

@@ -72 +72 @@
     ## =====================================================================...
 
-    coll = ChangeSetCollector(log)
-    for cs in coll:
+    from datetime import timedelta
+
+    collected = ChangeSetCollector(log)
+    collapsed = []
+
+    threshold = timedelta(seconds=180)
+    last = None
+    
+    for cs in collected:
+        if not last:
+            last = cs
+            collapsed.append(cs)
+        else:
+            if last.author == cs.author and \
+               last.log == cs.log and \
+               abs(last.date - cs.date) < threshold:
+                last.entries.extend(cs.entries)
+            else:
+                last = cs
+                collapsed.append(cs)
+
+    for cs in collapsed:
         yield cs
         
@@ -96 +116 @@
         return iter([self.changesets[k] for k in keys])
     
+    def __getGlobalRevision(self, timestamp, author, changelog):
+        """
+        CVS does not have the notion of a repository-wide revision number,
+        since it tracks just single files.
+
+        Here we could "count" the grouped changesets ala `cvsps`,
+        but that's tricky because of branches.  Since right now there
+        is nothing that depends on this being a number, not to mention
+        a *serial* number, simply emit a (hopefully) unique signature...
+        """
+
+        # NB: the _getUpstreamChangesets() below depends on this format
+
+        if len(changelog)>33:
+            msg = changelog[:30] + '...'
+        else:
+            msg = changelog
+        msg = msg.replace('\n', '')
+        return '%s; %s, "%s"' % (timestamp, author, msg)
+
     def __collect(self, timestamp, author, changelog, entry, revision):
         """Register a change set about an entry."""
@@ -105 +145 @@
             return self.changesets[key].addEntry(entry, revision)
         else:
-            cs = Changeset(revision, timestamp, author, changelog)
+            cs = Changeset(self.__getGlobalRevision(timestamp,
+                                                    author,
+                                                    changelog),
+                           timestamp, author, changelog)
             self.changesets[key] = cs
             return cs.addEntry(entry, revision)
@@ -128 +171 @@
         
         day,time = info[0][6:].split(' ')
-        y,m,d = map(int, day.split('/'))
+        y,m,d = map(int, day.split(day[4]))
         hh,mm,ss = map(int, time.split(':'))
         date = datetime(y,m,d,hh,mm,ss)

vcpx/tests/cvs.py

@@ -114 +114 @@
 """
 
+    COLLAPSE_TEST = """\
+RCS file: /usr/local/CVSROOT/PyObjC/Doc/libObjCStreams.tex,v
+Working file: Doc/libObjCStreams.tex
+head: 1.4
+branch:
+locks: strict
+access list:
+keyword substitution: kv
+total revisions: 4;     selected revisions: 4
+description:
+----------------------------
+revision 1.4
+date: 1997-12-21 23:01:28;  author: lele;  state: Exp;  lines: +2 -8
+Fake changelog 1
+----------------------------
+revision 1.3
+date: 1996-10-18 13:48:36;  author: lele;  state: Exp;  lines: +10 -3
+Fake changelog 2
+----------------------------
+revision 1.2
+date: 1996-10-14 13:56:50;  author: lele;  state: Exp;  lines: +11 -19
+Fake changelog 3
+----------------------------
+revision 1.1
+date: 1996-10-07 18:32:11;  author: lele;  state: Exp;
+Fake changelog 4
+=============================================================================
+
+RCS file: /usr/local/CVSROOT/PyObjC/Doc/libPyObjC.tex,v
+Working file: Doc/libPyObjC.tex
+head: 1.4
+branch:
+locks: strict
+access list:
+keyword substitution: kv
+total revisions: 4;     selected revisions: 4
+description:
+----------------------------
+revision 1.4
+date: 1997-12-21 23:01:29;  author: lele;  state: Exp;  lines: +2 -8
+Fake changelog 1
+----------------------------
+revision 1.3
+date: 1996-10-18 13:48:45;  author: lele;  state: Exp;  lines: +7 -2
+Fake changelog 2
+----------------------------
+revision 1.2
+date: 1996-10-18 12:36:04;  author: lele;  state: Exp;  lines: +7 -3
+Fake changelog 3
+----------------------------
+revision 1.1
+date: 1996-10-07 18:32:12;  author: lele;  state: Exp;
+Fake changelog 4
+=============================================================================
+"""
+
     def testBasicBehaviour(self):
         """Verify basic cvs log parser behaviour"""
@@ -188 +244 @@
         entry = cset.entries[0]
         self.assertEqual(entry.action_kind, entry.DELETED)
+
+    def testCollapsedChangeset(self):
+        """Verify the mechanism used to collapse related changesets"""
+
+        log = StringIO(self.COLLAPSE_TEST)
+        csets = changesets_from_cvslog(log)
+
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 2)
+        self.assertEqual(cset.date, datetime(1996, 10, 7, 18, 32, 11))
+        
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 1)
+        self.assertEqual(cset.date, datetime(1996, 10, 14, 13, 56, 50))
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'Doc/libObjCStreams.tex')       
+        
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 1)
+        self.assertEqual(cset.date, datetime(1996, 10, 18, 12, 36, 4))
+        entry = cset.entries[0]
+        self.assertEqual(entry.name, 'Doc/libPyObjC.tex')       
+        
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 2)
+        self.assertEqual(cset.date, datetime(1996, 10, 18, 13, 48, 36))
+