Changeset 1129 in tailor

Timestamp:

05/19/06 21:46:17 (7 years ago)

Author:

lele@…

Hash name:

20060519194617-97f81-a314f3a3c827edd894bd2eb55f6aa0ea93a44820

Message:

Don't necessarily remove an empty directory
Fix CvspsWorkingDir.__maybeDeleteDirectory() so that it does
not remove the directory when the same changeset adds other entries
to it. This fixes #49.

File:

• vcpx/cvsps.py (modified) (1 diff)

vcpx/cvsps.py

@@ -178 +178 @@
         absentrydir = join(self.basedir, entrydir)
         if not exists(absentrydir) or listdir(absentrydir) == ['CVS']:
+            # Oh, the directory is empty: if there are no other added entries
+            # in the directory, insert a REMOVE event against it.
+            for added in changeset.addedEntries():
+                if added.name.startswith(entrydir):
+                    # entrydir got empty, but only temporarily
+                    return
+
             deldir = changeset.addEntry(entrydir, None)
             deldir.action_kind = deldir.DELETED