Changeset 1649 in tailor

Timestamp:

07/17/08 23:06:14 (5 years ago)

Author:

lele@…

Hash name:

20080717210614-97f81-8a68a90caeb65f5350c16220ba8d117384348eca

Message:

Substitute REPLACED with RENAMED when it is the case
This is not enough and there are still problems with the REPLACED kind
of entries: when it's a directory that gets replaced, tailor should go
down the slipping route of adding REMOVEs for entries that were
effectively deleted...

Location:

vcpx

Files:

• repository/svn.py (modified) (2 diffs)
• tests/svn.py (modified) (2 diffs)
• tests/data/svn-rename_replace.log (added)

vcpx/repository/svn.py

@@ -294 +294 @@
                 # outside of this module:
                 #  D -> Remove entry completely (it's not going to be in here)
-                #  (M,A,R) -> A
+                #  (M,A) -> A
+
+                # Finally, take care of the 'R' entries: if the entry
+                # is a target of a rename, just discard it (hopefully
+                # the target VC will do the right thing), otherwise
+                # change those to 'A'.
 
                 mv_or_cp = {}
                 for e in self.current['entries']:
-                    if e.action_kind == e.ADDED and e.old_name is not None:
+                    if (e.action_kind == e.ADDED or
+                        e.action_kind == 'R') and e.old_name is not None:
                         mv_or_cp[e.old_name] = e
 
@@ -334 +340 @@
                         else:
                             check_renames_from_dir(e.name)
-                        e.action_kind = e.ADDED
+
+                        # Another scenario is
+                        #   $ svn mv dir otherdir
+                        #   $ svn rm otherdir/subdir
+                        #   $ svn mv olddir/subdir otherdir
+                        #   $ svn rm olddir
+                        if e.old_name is not None:
+                            e.action_kind = e.RENAMED
+                        else:
+                            e.action_kind = e.ADDED
                         entries2.append(e)
                     elif parent_was_copied(e.name):

vcpx/tests/svn.py

@@ -164 +164 @@
         self.assertRaises(StopIteration, csets.next)
 
+    def testRenameReplace(self):
+        """Verify how tailor handle svn "R" event on renames"""
+
+        log = self.getSvnLog('svn-rename_replace')
+        csets = changesets_from_svnlog(log, FR('file:///tmp/rep',
+                                               '/cedar-backup2/trunk'))
+
+        cset = csets.next()
+        self.assertEqual(len(cset.entries), 7)
+        for entry, expected in map(None, cset.entries,
+                                   (('Makefile', 'UPD'),
+                                    ('test', 'REN', 'unittest'),
+                                    ('test/__init__.py', 'ADD'),
+                                    ('test/filesystemtests.py', 'ADD'),
+                                    ('test/knapsacktests.py', 'ADD'),
+                                    ('util/createtree.py', 'UPD'),
+                                    ('test/data', 'REN', 'unittest/data'))):
+            self.assertEqual(entry.name, expected[0])
+            self.assertEqual(entry.action_kind, expected[1],
+                             msg=entry.name+': got %r, expected %r' %
+                             (entry.action_kind, expected[1]))
+            if expected[1]=='REN':
+                self.assertEqual(entry.old_name, expected[2],
+                                 msg=entry.name+': got %r, expected %r' %
+                                 (entry.old_name, expected[2]))
+
     def testTrackingRoot(self):
         """Verify we are able to track the root of the repository"""
@@ -207 +233 @@
         entry = cset.entries[2]
         self.assertEqual(entry.name, 'py/documentation/example/test')
-        self.assertEqual(entry.action_kind, entry.ADDED)
+        self.assertEqual(entry.action_kind, entry.RENAMED)
+        self.assertEqual(entry.old_name, 'example/test')
 
         self.assertRaises(StopIteration, csets.next)