Changeset 1201 in tailor

Timestamp:

06/30/06 06:42:29 (7 years ago)

Author:

Adeodato Simo <dato@…>

Hash name:

20060630044229-d6905-b193f45b29ad58be18cd933f53c7ab320ee5e752

Message:

[bzr] rewrite _addPathnames and _addSubtree using smart_add_tree

BzrWorkingDir?._addPathnames: make 25 lines shorter by making use of
smart_add_tree, which can deal with already added or renamed files.
This fixes ticket #64, since this function also takes care of adding
missing parent directories.

BzrWorkingDir?._addSubtree: reintroduce, but this time paying attention
to the return value, since it includes a list of ignored files: if any,
call self._addPathnames() on them.

File:

• vcpx/repository/bzr.py (modified) (2 diffs)

vcpx/repository/bzr.py

@@ -20 +20 @@
 del version_info
 
-from bzrlib.osutils import normpath
+from bzrlib.osutils import normpath, pathjoin
 from bzrlib.bzrdir import BzrDir
 from bzrlib.delta import compare_trees
+from bzrlib.add import smart_add_tree
 from bzrlib import errors
 
@@ -155 +156 @@
 
     def _addPathnames(self, names):
-        """
-        Add new files to working tree.
-
-        This method may get invoked several times with the same files.
-        Bzrlib complains if you try to add a file which is already
-        versioned. This method filters these out. A file might already been
-        marked to be added in this changeset, or might be a target in a rename
-        operation. Remove those too.
-
-        This method does not catch any errors from the adding through bzrlib,
-        since they are **real** errors.
-        """
-        last_revision = self._working_tree.branch.last_revision()
-        if last_revision is None:
-            # initial revision
-            fnames = names
-        else:
-            fnames = []
-            basis_tree = self._working_tree.branch.basis_tree()
-            inv = basis_tree.inventory
-            diff = compare_trees(basis_tree, self._working_tree)
-            added = ([new[0] for new in diff.added] +
-                     [renamed[1] for renamed in diff.renamed])
-
-            def parent_was_copied(n):
-                for p in added:
-                    if n.startswith(p+'/'):
-                        return True
-                return False
-
-            for fn in names:
-                normfn = normpath(fn)
-                if (not inv.has_filename(fn)
-                    and not normfn in added
-                    and not parent_was_copied(normfn)):
-                    fnames.append(fn)
-                else:
-                    self.log.debug('"%s" already in inventory, skipping', fn)
-
-        if len(fnames):
-            self.log.info('Adding %s...', ', '.join(fnames))
-            self._working_tree.add(fnames)
+        if len(names):
+            names = [ pathjoin(self.basedir, n) for n in names ]
+            smart_add_tree(self._working_tree, names, recurse=False)
+
+    def _addSubtree(self, subdir):
+        subdir = pathjoin(self.basedir, subdir)
+        added, ignored = smart_add_tree(self._working_tree, [subdir], recurse=True)
+
+        if len(ignored):
+            f = []
+            map(f.extend, ignored.values())
+            self._addPathnames(f)
 
     def _commit(self, date, author, patchname, changelog=None, entries=None):