Changeset 1237 in tailor

Timestamp:

08/09/06 12:59:41 (7 years ago)

Author:

lele@…

Hash name:

20060809105941-97f81-eb642676b00b462899401d2b9bd5afcf8da1bdce

Message:

Use newer API to deal with ignore file in bzr 0.9

File:

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

vcpx/repository/bzr.py

@@ -20 +20 @@
 del version_info
 
-from bzrlib import IGNORE_FILENAME, DEFAULT_IGNORE, errors
+from bzrlib import errors
 from bzrlib.add import smart_add_tree
 from bzrlib.bzrdir import BzrDir
@@ -69 +69 @@
 class BzrWorkingDir(UpdatableSourceWorkingDir, SynchronizableTargetWorkingDir):
     def __init__(self, repository):
+        from bzrlib import version_info
+
+        if version_info > (0,9):
+            from bzrlib.ignores import add_runtime_ignores, get_user_ignores
+        else:
+            from bzrlib import IGNORE_FILENAME, DEFAULT_IGNORE
+        
         WorkingDir.__init__(self, repository)
         # TODO: check if there is a "repository" in the configuration,
@@ -83 +90 @@
 
             # 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() ])
+            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)
+                    self.ignored.extend([ line.rstrip("\n\r") for line in f.readlines() ])
         except errors.NotBranchError, errors.NoWorkingTree:
             pass
@@ -105 +115 @@
             self.ignored.append(file+'.journal')
 
-        DEFAULT_IGNORE.extend(self.ignored)
+        if version_info > (0,9):
+            add_runtime_ignores(self.ignored)
+        else:
+            DEFAULT_IGNORE.extend(self.ignored)