Changeset 1048 in tailor

Timestamp:

12/27/05 13:28:08 (7 years ago)

Author:

lele@…

Hash name:

20051227122808-7a6fb-1698d025510cbc4aa6ccfd308c636f07a1072c79

Message:

Reset the notion of external copies at each changeset
Changesets [840] and [841] introduced a bug in the Subversion log
parser, outlined by #24. This fix the case by resetting the list of
copied paths at each changeset.

Location:

vcpx

Files:

• svn.py (modified) (6 diffs)
• tests/svn.py (modified) (1 diff)
• tests/data/svn-external_copies_test.log (added)

vcpx/svn.py

@@ -69 +69 @@
             self.current_field = []
             self.renamed = {}
-            self.external_copies = []
+            self.copies = []
 
         def startElement(self, name, attributes):
@@ -76 +76 @@
                 self.current['revision'] = attributes['revision']
                 self.current['entries'] = []
+                self.copies = []
             elif name in ['author', 'date', 'msg']:
                 self.current_field = []
@@ -117 +118 @@
                         mv_or_cp[e.old_name] = e
 
-                def parent_was_copied_externally(n):
-                    for p in self.external_copies:
-                        if n.startswith(p):
+                def parent_was_copied(n):
+                    for p in self.copies:
+                        if n.startswith(p+'/'):
                             return True
                     return False
@@ -137 +138 @@
                         e.action_kind = e.ADDED
                         entries.append(e)
-                    elif parent_was_copied_externally(e.name):
+                    elif parent_was_copied(e.name):
                         if e.action_kind != e.DELETED:
                             e.action_kind = e.ADDED
@@ -167 +168 @@
 
                     if type(self.current_path_action) == type( () ):
+                        self.copies.append(entry.name)
                         old = get_entry_from_path(self.current_path_action[1])
                         if old:
@@ -173 +175 @@
                             self.renamed[entry.old_name] = True
                         else:
-                            self.external_copies.append(entry.name)
                             entry.action_kind = entry.ADDED
                     else:

vcpx/tests/svn.py

@@ -268 +268 @@
                                             chunksize=100))
         self.assertEqual(len(csets), 4)
+
+    def testExternalCopies(self):
+        """Verify that external copies+deletions are handled ok"""
+
+        log = self.getSvnLog('svn-external_copies_test')
+        csets = changesets_from_svnlog(log, 'svn+ssh://caia/tmp/svn', '/trunk')
+        
+        cset = csets.next()
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 5)
+
+        entry = cset.removedEntries()[0]
+        self.assertEqual(entry.name, 'README_LOGIN')
+
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 4)