Rev 4938: Some helpers were accessing a feature that got renamed. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

------------------------------------------------------------
revno: 4938
revision-id: john at arbash-meinel.com-20091222170547-xqxlcoii5s85i30j
parent: john at arbash-meinel.com-20091222164048-hp13oi0wck4mg5sq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Tue 2009-12-22 11:05:47 -0600
message:
  Some helpers were accessing a feature that got renamed.
-------------- next part --------------
=== modified file 'bzrlib/benchmarks/bench_dirstate.py'
--- a/bzrlib/benchmarks/bench_dirstate.py	2009-12-21 17:51:17 +0000
+++ b/bzrlib/benchmarks/bench_dirstate.py	2009-12-22 17:05:47 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
     tests,
     )
 from bzrlib.tests.test__dirstate_helpers import (
-    compiled_dirstate_helpers,
+    compiled_dirstate_helpers_feature,
     )
 
 
@@ -206,7 +206,7 @@
             state.unlock()
 
     def test__read_dirblocks_20k_tree_0_parents_pyx(self):
-        self.requireFeature(compiled_dirstate_helpers)
+        self.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import _read_dirblocks
         state = self.build_20k_dirstate()
         state.lock_read()
@@ -231,7 +231,7 @@
             state.unlock()
 
     def test__read_dirblocks_20k_tree_1_parent_pyx(self):
-        self.requireFeature(compiled_dirstate_helpers)
+        self.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import _read_dirblocks
         state = self.build_20k_dirstate_with_parents(1)
         state.lock_read()
@@ -256,7 +256,7 @@
             state.unlock()
 
     def test__read_dirblocks_20k_tree_2_parents_pyx(self):
-        self.requireFeature(compiled_dirstate_helpers)
+        self.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import _read_dirblocks
         state = self.build_20k_dirstate_with_parents(2)
         state.lock_read()
@@ -337,7 +337,7 @@
             state.unlock()
 
     def test_bisect_dirblock_pyx(self):
-        self.requireFeature(compiled_dirstate_helpers)
+        self.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import bisect_dirblock
         state = self.build_10k_dirstate_dirs()
         state.lock_read()
@@ -420,7 +420,7 @@
                              [(3, 1), (3, 1), (3, 1), (3, 2)])
 
     def test_cmp_by_dirs_pyrex(self):
-        self.requireFeature(compiled_dirstate_helpers)
+        self.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
         self.compareAllPaths(cmp_by_dirs,
                              [(3, 1), (3, 1), (3, 1), (3, 2)])

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2009-12-21 17:51:17 +0000
+++ b/bzrlib/workingtree_4.py	2009-12-22 17:05:47 +0000
@@ -1977,10 +1977,8 @@
     def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
                                                   target):
         from bzrlib.tests.test__dirstate_helpers import \
-            compiled_dirstate_helpers
-        if not compiled_dirstate_helpers.available():
-            from bzrlib.tests import UnavailableFeature
-            raise UnavailableFeature(compiled_dirstate_helpers)
+            compiled_dirstate_helpers_feature
+        test_case.requireFeature(compiled_dirstate_helpers_feature)
         from bzrlib._dirstate_helpers_pyx import ProcessEntryC
         result = klass.make_source_parent_tree(source, target)
         result[1]._iter_changes = ProcessEntryC