Merge lp:~jelmer/brz/bzrignore into lp:brz

[Jelmer Vernooij]

Add a WorkingTreeFormat flag for the ignore pattern filename.

Add a WorkingTreeFormat flag for the ignore pattern filename.

Using this, only run .bzrignore-specific tests on bzr formats.

[Martin Packman (gz)]

This is quite neat.

review: Approve

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2017-08-26 19:06:32 +0000
+++ breezy/__init__.py	2018-03-04 23:18:01 +0000
@@ -42,9 +42,6 @@
 import sys
 
 
-IGNORE_FILENAME = ".bzrignore"
-
-
 __copyright__ = "Copyright 2005-2012 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
 
=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-02-26 13:36:15 +0000
+++ breezy/bzr/workingtree.py	2018-03-04 23:18:01 +0000
@@ -569,8 +569,8 @@
         ignore_globs = set()
         ignore_globs.update(ignores.get_runtime_ignores())
         ignore_globs.update(ignores.get_user_ignores())
-        if self.has_filename(breezy.IGNORE_FILENAME):
-            f = self.get_file(breezy.IGNORE_FILENAME)
+        if self.has_filename(self._format.ignore_filename):
+            f = self.get_file(self._format.ignore_filename)
             try:
                 ignore_globs.update(ignores.parse_ignore_file(f))
             finally:
@@ -1715,45 +1715,7 @@
 class WorkingTreeFormatMetaDir(bzrdir.BzrFormat, WorkingTreeFormat):
     """Base class for working trees that live in bzr meta directories."""
 
-    def __init__(self):
-        WorkingTreeFormat.__init__(self)
-        bzrdir.BzrFormat.__init__(self)
-
-    @classmethod
-    def find_format_string(klass, controldir):
-        """Return format name for the working tree object in controldir."""
-        try:
-            transport = controldir.get_workingtree_transport(None)
-            return transport.get_bytes("format")
-        except errors.NoSuchFile:
-            raise errors.NoWorkingTree(base=transport.base)
-
-    @classmethod
-    def find_format(klass, controldir):
-        """Return the format for the working tree object in controldir."""
-        format_string = klass.find_format_string(controldir)
-        return klass._find_format(format_registry, 'working tree',
-                format_string)
-
-    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
-            basedir=None):
-        WorkingTreeFormat.check_support_status(self,
-            allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
-            basedir=basedir)
-        bzrdir.BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
-            recommend_upgrade=recommend_upgrade, basedir=basedir)
-
-    def get_controldir_for_branch(self):
-        """Get the control directory format for creating branches.
-
-        This is to support testing of working tree formats that can not exist
-        in the same control directory as a branch.
-        """
-        return self._matchingcontroldir
-
-
-class WorkingTreeFormatMetaDir(bzrdir.BzrFormat, WorkingTreeFormat):
-    """Base class for working trees that live in bzr meta directories."""
+    ignore_filename = '.bzrignore'
 
     def __init__(self):
         WorkingTreeFormat.__init__(self)
 
=== modified file 'breezy/ignores.py'
--- breezy/ignores.py	2018-02-15 19:38:33 +0000
+++ breezy/ignores.py	2018-03-04 23:18:01 +0000
@@ -190,7 +190,7 @@
     :return: None
     """
     # read in the existing ignores set
-    ifn = tree.abspath(breezy.IGNORE_FILENAME)
+    ifn = tree.abspath(tree._format.ignore_filename)
     if tree.has_filename(ifn):
         with open(ifn, 'rbU') as f:
             file_contents = f.read()
@@ -203,13 +203,13 @@
     else:
         file_contents = b""
         newline = os.linesep.encode()
-    
+
     sio = BytesIO(file_contents)
     try:
         ignores = parse_ignore_file(sio)
     finally:
         sio.close()
-    
+
     # write out the updated ignores set
     f = atomicfile.AtomicFile(ifn, 'wb')
     try:
@@ -225,5 +225,5 @@
     finally:
         f.close()
 
-    if not tree.is_versioned(breezy.IGNORE_FILENAME):
-        tree.add([breezy.IGNORE_FILENAME])
+    if not tree.is_versioned(tree._format.ignore_filename):
+        tree.add([tree._format.ignore_filename])
 
=== modified file 'breezy/plugins/weave_fmt/workingtree.py'
--- breezy/plugins/weave_fmt/workingtree.py	2017-08-29 13:25:07 +0000
+++ breezy/plugins/weave_fmt/workingtree.py	2018-03-04 23:18:01 +0000
@@ -18,6 +18,8 @@
 
 from __future__ import absolute_import
 
+import breezy
+
 from ... import (
     conflicts as _mod_conflicts,
     errors,
@@ -65,6 +67,8 @@
 
     supports_versioned_directories = True
 
+    ignore_filename = '.bzrignore'
+
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""
         return "Working tree format 2"
 
=== modified file 'breezy/tests/per_workingtree/test_is_ignored.py'
--- breezy/tests/per_workingtree/test_is_ignored.py	2017-10-27 09:03:47 +0000
+++ breezy/tests/per_workingtree/test_is_ignored.py	2018-03-04 23:18:01 +0000
@@ -15,21 +15,24 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from breezy import config, ignores
+from breezy import config, ignores, tests
 from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
 
 class TestIsIgnored(TestCaseWithWorkingTree):
 
+    def setUp(self):
+        super(TestIsIgnored, self).setUp()
+        if self.workingtree_format.ignore_filename != '.bzrignore':
+            raise tests.TestNotApplicable(
+                'format does not use .bzrignore for ignore patterns')
+
     def _set_user_ignore_content(self, ignores):
         """Create user ignore file and set its content to ignores."""
         config.ensure_config_dir_exists()
         user_ignore_file = config.user_ignore_config_filename()
-        f = open(user_ignore_file, 'wb')
-        try:
+        with open(user_ignore_file, 'wb') as f:
             f.write(ignores)
-        finally:
-            f.close()
 
     def test_is_ignored(self):
         tree = self.make_branch_and_tree('.')
@@ -76,7 +79,7 @@
         self.assertEqual("path/from/ro?t", tree.is_ignored('path/from/root'))
         self.assertEqual("path/from/ro?t", tree.is_ignored('path/from/roat'))
         self.assertEqual(None, tree.is_ignored('roat'))
-        
+
         self.assertEqual('**/piffle.py', tree.is_ignored('piffle.py'))
         self.assertEqual('**/piffle.py', tree.is_ignored('a/piffle.py'))
         self.assertEqual(None, tree.is_ignored('b/piffle.py')) # exclusion
@@ -96,7 +99,7 @@
         self.assertEqual('*bar', tree.is_ignored(r'foo\nbar'))
         self.assertEqual('*bar', tree.is_ignored('bar'))
         self.assertEqual('*bar', tree.is_ignored('.bar'))
-        
+
         self.assertEqual(None, tree.is_ignored('bazbar')) # exclusion
 
         self.assertEqual('?foo', tree.is_ignored('afoo'))
@@ -110,7 +113,7 @@
 
         self.assertEqual('dir1/?f2', tree.is_ignored('dir1/ff2'))
         self.assertEqual('dir1/?f2', tree.is_ignored('dir1/.f2'))
-        
+
         self.assertEqual('RE:dir2/.*\.wombat', tree.is_ignored('dir2/foo.wombat'))
         self.assertEqual(None, tree.is_ignored('dir2/foo'))
 
 
=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2018-02-25 15:31:42 +0000
+++ breezy/workingtree.py	2018-03-04 23:18:01 +0000
@@ -1421,6 +1421,9 @@
 
     supports_righthand_parent_id_as_ghost = True
 
+    ignore_filename = None
+    """Name of file with ignore patterns, if any. """
+
     def initialize(self, controldir, revision_id=None, from_branch=None,
                    accelerator_tree=None, hardlink=False):
         """Initialize a new working tree in controldir.