Rev 3621: Disable .bzrrules in-tree lookup for now. in http://people.ubuntu.com/~robertc/baz2.0/rules.disable

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/rules.disable

------------------------------------------------------------
revno: 3621
revision-id: robertc at robertcollins.net-20080813233044-84ad8vlkzl1lhnw2
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: rules.disable
timestamp: Thu 2008-08-14 09:30:44 +1000
message:
  Disable .bzrrules in-tree lookup for now.
modified:
  bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
=== modified file 'bzrlib/tests/tree_implementations/test_iter_search_rules.py'
--- a/bzrlib/tests/tree_implementations/test_iter_search_rules.py	2008-06-26 06:53:18 +0000
+++ b/bzrlib/tests/tree_implementations/test_iter_search_rules.py	2008-08-13 23:30:44 +0000
@@ -32,6 +32,7 @@
     def make_tree_with_rules(self, text):
         tree = self.make_branch_and_tree('.')
         if text is not None:
+            self.fail("No method for in-tree rules agreed on yet.")
             text_utf8 = text.encode('utf-8')
             self.build_tree_contents([(rules.RULES_TREE_FILENAME, text_utf8)])
             tree.add(rules.RULES_TREE_FILENAME)
@@ -51,7 +52,7 @@
         self.assertEquals((('foo', 'baz'),), result[0])
         self.assertEquals((('foo', 'bar'), ('a', 'True')), result[1])
 
-    def test_iter_search_rules_just_tree(self):
+    def _disabled_test_iter_search_rules_just_tree(self):
         per_user = self.make_per_user_searcher('')
         tree = self.make_tree_with_rules(
             "[name ./a.txt]\n"
@@ -64,7 +65,7 @@
         self.assertEquals((('foo', 'baz'),), result[0])
         self.assertEquals((('foo', 'bar'), ('a', 'True')), result[1])
 
-    def test_iter_search_rules_tree_and_per_user(self):
+    def _disabled_test_iter_search_rules_tree_and_per_user(self):
         per_user = self.make_per_user_searcher(
             "[name ./a.txt]\nfoo=baz\n"
             "[name *.txt]\nfoo=bar\na=True\n")

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2008-08-01 18:19:44 +0000
+++ b/bzrlib/tree.py	2008-08-13 23:30:44 +0000
@@ -557,11 +557,6 @@
     def _get_rules_searcher(self, default_searcher):
         """Get the RulesSearcher for this tree given the default one."""
         searcher = default_searcher
-        file_id = self.path2id(rules.RULES_TREE_FILENAME)
-        if file_id is not None:
-            ini_file = self.get_file(file_id)
-            searcher = rules._StackedRulesSearcher(
-                [rules._IniBasedRulesSearcher(ini_file), default_searcher])
         return searcher
 
 

=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- a/doc/en/user-guide/configuring_bazaar.txt	2008-06-25 07:32:46 +0000
+++ b/doc/en/user-guide/configuring_bazaar.txt	2008-08-13 23:30:44 +0000
@@ -53,7 +53,7 @@
 
 Some commands and plugins provide custom processing on files matching
 certain patterns. Branch-specific and per-user rule-based preferences
-are defined in ``.bzrrules`` and ``BZR_HOME/rules`` respectively.
+are defined in ``BZR_HOME/rules`` respectively.
 
 For further information on how rules are searched and the detailed syntax of
 the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_