Rev 4937: Bring in the latest module-available changes in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension
John Arbash Meinel
john at arbash-meinel.com
Tue Dec 22 17:11:31 GMT 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension
------------------------------------------------------------
revno: 4937 [merge]
revision-id: john at arbash-meinel.com-20091222171118-eh9bthlxka07rhcz
parent: john at arbash-meinel.com-20091222164736-ls9zqdmea3otz11h
parent: john at arbash-meinel.com-20091222170913-hj6a1i7kvr9xk8i8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-permute-for-extension
timestamp: Tue 2009-12-22 11:11:18 -0600
message:
Bring in the latest module-available changes
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- 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/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py 2009-12-22 16:40:48 +0000
+++ b/bzrlib/tests/test_osutils.py 2009-12-22 17:09:13 +0000
@@ -989,7 +989,7 @@
def test_osutils_binding(self):
from bzrlib.tests import test__chunks_to_lines
- if test__chunks_to_lines.compiled_chunkstolines.available():
+ if test__chunks_to_lines.compiled_chunkstolines_feature.available():
from bzrlib._chunks_to_lines_pyx import chunks_to_lines
else:
from bzrlib._chunks_to_lines_py import chunks_to_lines
@@ -1181,14 +1181,14 @@
def test_force_walkdirs_utf8_nt(self):
# Disabled because the thunk of the whole walkdirs api is disabled.
- self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
+ self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
self._save_platform_info()
win32utils.winver = 'Windows NT'
from bzrlib._walkdirs_win32 import Win32ReadDir
self.assertDirReaderIs(Win32ReadDir)
def test_force_walkdirs_utf8_98(self):
- self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
+ self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
self._save_platform_info()
win32utils.winver = 'Windows 98'
self.assertDirReaderIs(osutils.UnicodeDirReader)
@@ -1345,7 +1345,7 @@
self.assertEqual(expected_dirblocks, result)
def test__walkdirs_utf8_win32readdir(self):
- self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
+ self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
self.requireFeature(tests.UnicodeFilenameFeature)
from bzrlib._walkdirs_win32 import Win32ReadDir
self._save_platform_info()
@@ -1402,7 +1402,7 @@
def test__walkdirs_utf_win32_find_file_stat_file(self):
"""make sure our Stat values are valid"""
- self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
+ self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
self.requireFeature(tests.UnicodeFilenameFeature)
from bzrlib._walkdirs_win32 import Win32ReadDir
name0u = u'0file-\xb6'
@@ -1426,7 +1426,7 @@
def test__walkdirs_utf_win32_find_file_stat_directory(self):
"""make sure our Stat values are valid"""
- self.requireFeature(test__walkdirs_win32.Win32ReadDirFeature)
+ self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
self.requireFeature(tests.UnicodeFilenameFeature)
from bzrlib._walkdirs_win32 import Win32ReadDir
name0u = u'0dir-\u062c\u0648'
=== 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
More information about the bazaar-commits
mailing list