Changeset 1203 in tailor for vcpx/repository/bzr.py

Timestamp:

07/01/06 14:00:23 (7 years ago)

Author:

Adeodato Simo <dato@…>

Hash name:

20060701120023-d6905-5c72403bc1a2b22540203982d818d6aa61be6525

Message:

[bzr] _addSubtree(): do not add files in IGNORED_METADIRS and .bzrignore

The implementation of _addSubtree() recently introduced forces the
addition of files ignored by bzr, because the source repository could
contain files that matched bzr's idea of ignorable files.

However, dirs in IGNORED_METADIRS and things like the status and log
files (which _prepareTargetRepository adds to .bzrignore) should always
be ignored. This patch addresses that.

File:

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

vcpx/repository/bzr.py

@@ -25 +25 @@
 from bzrlib.add import smart_add_tree
 from bzrlib import errors
+from bzrlib import IGNORE_FILENAME
 
 from vcpx.repository import Repository
@@ -50 +51 @@
         # TODO: check if there is a "repository" in the configuration,
         # and use it as a bzr repository
+        self.ignored = []
         self._working_tree = None
         try:
             bzrdir = BzrDir.open(self.basedir)
-            self._working_tree = bzrdir.open_workingtree()
+            wt = self._working_tree = bzrdir.open_workingtree()
+
+            # read .bzrignore for _addSubtree()
+            if wt.has_filename(IGNORE_FILENAME):
+                f = wt.get_file_byname(IGNORE_FILENAME)
+                self.ignored.extend([ line.rstrip("\n\r") for line in f.readlines() ])
         except errors.NotBranchError, errors.NoWorkingTree:
             pass
@@ -164 +171 @@
         added, ignored = smart_add_tree(self._working_tree, [subdir], recurse=True)
 
+        from vcpx.dualwd import IGNORED_METADIRS
+
+        for meta in IGNORED_METADIRS + self.ignored:
+            if ignored.has_key(meta):
+                del ignored[meta]
+
         if len(ignored):
             f = []
@@ -255 +268 @@
         """
         from os.path import join, split
-        from bzrlib import IGNORE_FILENAME
 
         if self._working_tree is None:
-            ignored = []
+            ignored = self.ignored
 
             # Omit our own log...