Changeset 1238 in tailor

Timestamp:

08/09/06 20:53:15 (7 years ago)

Author:

lele@…

Hash name:

20060809185315-97f81-91d7bf22c2833f40236d61ff01b486d9b7d8533f

Message:

Augment the ignored list with the content of .bzrignore not user's global prefs

File:

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

vcpx/repository/bzr.py

@@ -69 +69 @@
 class BzrWorkingDir(UpdatableSourceWorkingDir, SynchronizableTargetWorkingDir):
     def __init__(self, repository):
-        from bzrlib import version_info
+        from bzrlib import version_info, IGNORE_FILENAME
 
         if version_info > (0,9):
-            from bzrlib.ignores import add_runtime_ignores, get_user_ignores
-        else:
-            from bzrlib import IGNORE_FILENAME, DEFAULT_IGNORE
+            from bzrlib.ignores import add_runtime_ignores, parse_ignore_file
+        else:
+            from bzrlib import DEFAULT_IGNORE
         
         WorkingDir.__init__(self, repository)
@@ -90 +90 @@
 
             # read .bzrignore for _addSubtree()
-            if version_info > (0,9):
-                self.ignored.extend(get_user_ignores())
-            else:
-                if wt.has_filename(IGNORE_FILENAME):
-                    f = wt.get_file_byname(IGNORE_FILENAME)
+            if wt.has_filename(IGNORE_FILENAME):
+                f = wt.get_file_byname(IGNORE_FILENAME)
+                if version_info > (0,9):
+                    self.ignored.extend(parse_ignore_file(f))
+                else:
                     self.ignored.extend([ line.rstrip("\n\r") for line in f.readlines() ])
+                f.close()
         except errors.NotBranchError, errors.NoWorkingTree:
             pass