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

Timestamp:

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

Author:

Adeodato Simo <dato@…>

Hash name:

20060701121823-d6905-84ce9cefd26f9b0ae5dbd7b27848a494c9367ff9

Message:

[bzr] ignore state and log files without using .bzrignore

This patch makes BzrWorkingDir? not use .bzrignore to ignore the state
and log files when necessary, and add them to bzrlib's DEFAULT_IGNORE
list.

The rationale for this is that the conversion is cleaner this way, since
otherwise the resulting bzr repository will always need an extra commit
to revert .bzrignore to match the original repository.

File:

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

vcpx/repository/bzr.py

@@ -25 +25 @@
 from bzrlib.add import smart_add_tree
 from bzrlib import errors
-from bzrlib import IGNORE_FILENAME
+from bzrlib import IGNORE_FILENAME, DEFAULT_IGNORE
 
 from vcpx.repository import Repository
@@ -63 +63 @@
         except errors.NotBranchError, errors.NoWorkingTree:
             pass
+
+        from os.path import split
+
+        # Omit our own log...
+        logfile = self.repository.projectref().logfile
+        dir, file = split(logfile)
+        if dir == self.basedir:
+            self.ignored.append(file)
+
+        # ... and state file
+        sfname = self.repository.projectref().state_file.filename
+        dir, file = split(sfname)
+        if dir == self.basedir:
+            self.ignored.append(file)
+            self.ignored.append(file+'.old')
+            self.ignored.append(file+'.journal')
+
+        DEFAULT_IGNORE.extend(self.ignored)
+
 
     #############################
@@ -267 +286 @@
         trees).
         """
-        from os.path import join, split
-
         if self._working_tree is None:
-            ignored = self.ignored
-
-            # Omit our own log...
-            logfile = self.repository.projectref().logfile
-            dir, file = split(logfile)
-            if dir == self.basedir:
-                ignored.append(file)
-
-            # ... and state file
-            sfname = self.repository.projectref().state_file.filename
-            dir, file = split(sfname)
-            if dir == self.basedir:
-                ignored.append(file)
-                ignored.append(file+'.old')
-                ignored.append(file+'.journal')
-
-            if ignored:
-                bzrignore = open(join(self.basedir, IGNORE_FILENAME), 'wU')
-                bzrignore.write('\n'.join(ignored))
-
             self.log.info('Initializing new repository in %r...', self.basedir)
             try: