Changeset 962 in tailor

Timestamp:

10/27/05 09:56:59 (8 years ago)

Author:

R.Ghetta <birrachiara@…>

Hash name:

20051027075659-2c016-1b169d8c9c03e1c7f7d8e86057afafcbb916bfa2

Message:

hack to generate pseudo-add-dir entries

File:

• vcpx/monotone.py (modified) (5 diffs)

vcpx/monotone.py

@@ -311 +311 @@
         self.repository = repository
 
+    def _addPathToSet(self, s, dirs):
+        for d in xrange(0,len(dirs)):
+            nd = '/'.join(dirs[0:d])
+            s.add( nd );
+    
     def convertDiff(self, chset):
         """
@@ -337 +342 @@
                 "monotone diff returned status %d" % mtl.exit_status)
 
+        implicit_dirs_add = set()
+        dirs_add = set()
+                
         # monotone diffs are prefixed by a section containing
         # metainformations about files
@@ -361 +369 @@
 
                     # ok, is a file, control changesets data
-                    if token == "add_file" or token=="add_directory":
+                    if token == "add_file":
                         chentry = chset.addEntry(fname[1:-1], chset.revision)
                         chentry.action_kind = chentry.ADDED
+                        # split filespec in parts, skipping the filename
+                        # (monotone always uses '/' as path separator)
+                        self._addPathToSet(implicit_dirs_add, "/".split(chentry.name)[:-1]);
+                    elif token=="add_directory":
+                        chentry = chset.addEntry(fname[1:-1], chset.revision)
+                        chentry.action_kind = chentry.ADDED
+                        self._addPathToSet(dirs_add, "/".split(chentry.name));
                     elif token == "delete_file" or token=="delete_directory":
                         chentry = chset.addEntry(fname[1:-1], chset.revision)
@@ -378 +393 @@
                         chentry.action_kind = chentry.RENAMED
                         chentry.old_name= fname[1:-1]
+                        if token=="rename_directory":
+                            self._addPathToSet(dirs_add, "/".split(chentry.name))
                     elif token == "patch":
                         # patch entries are in the form: from oldrev to newrev
@@ -401 +418 @@
             if in_item:
                 raise GetUpstreamChangesetsFailure("Unexpected end of 'diff' parsing changeset info")
+
+        # remove explicit dir adds from implicit set, then create "add" changesets
+        # for the remaining dirs
+        implicit_dirs_add = implicit_dirs_add.difference(dirs_add)
+        for d in implicit_dirs_add:
+            chentry = chset.addEntry(d, chset.revision)
+            chentry.action_kind = chentry.ADDED