4 files changed, 74 insertions, 53 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 9717cd078347..e359559f24aa 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.11
+PORTVERSION=	0.12
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 MASTER_SITE_SUBDIR=	gnu-arch
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index aaabd6acc981..9ddf3b163c89 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.11.tar.gz) = 94fced266d6da6ed298e4738ca7414e0
-SHA256 (bzr-0.11.tar.gz) = f2e30edef95caeb91db9c568fc8f1a7cff628e7417c4f6d025908499970bbc17
-SIZE (bzr-0.11.tar.gz) = 1040731
+MD5 (bzr-0.12.tar.gz) = 68bf4e425a93bdf5961af9c3c35229bf
+SHA256 (bzr-0.12.tar.gz) = cd4b860b1bbdf6577877b99f3f8ba93d4eb03235d06ee9f877ca846a1022f620
+SIZE (bzr-0.12.tar.gz) = 1088557
diff --git a/devel/bzr/files/patch-bzrlib_osutils.py b/devel/bzr/files/patch-bzrlib_osutils.py
deleted file mode 100644
index 89bf04814851..000000000000
--- a/devel/bzr/files/patch-bzrlib_osutils.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- bzrlib/osutils.py.orig	Fri Oct 28 11:30:13 2005
-+++ bzrlib/osutils.py	Fri Oct 28 11:30:38 2005
-@@ -448,10 +448,10 @@
- except (NotImplementedError, AttributeError):
-     # If python doesn't have os.urandom, or it doesn't work,
-     # then try to first pull random data from /dev/urandom
--    if os.path.exists("/dev/urandom"):
-+    try:
-         rand_bytes = file('/dev/urandom', 'rb').read
-     # Otherwise, use this hack as a last resort
--    else:
-+    except:
-         # not well seeded, but better than nothing
-         def rand_bytes(n):
-             import random
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 9837f2c093e6..039f0a3af917 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -33,6 +33,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.py
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.py
@@ -52,6 +53,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/registry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
@@ -68,8 +70,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
@@ -90,14 +92,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_cache_utf8.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_startup.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.py
@@ -105,26 +110,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/heavily_merged.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/kernel_like.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/many_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/heavily_merged.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/kernel_like.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/many_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/heavily_merged.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/kernel_like.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/many_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_cache_utf8.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_startup.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyc
@@ -132,14 +143,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_cache_utf8.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_startup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyo
@@ -151,10 +165,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
@@ -185,6 +202,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
@@ -251,6 +274,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
@@ -262,7 +286,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
@@ -271,16 +294,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
@@ -296,9 +320,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.py
@@ -480,7 +505,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
@@ -574,6 +598,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
@@ -583,6 +608,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
@@ -591,6 +618,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
@@ -600,6 +628,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
@@ -608,6 +638,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
@@ -617,6 +648,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff
@@ -641,11 +674,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/patchtext.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
@@ -674,6 +708,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
@@ -685,7 +720,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
@@ -694,16 +728,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
@@ -712,16 +747,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyc
@@ -729,8 +765,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
@@ -768,6 +804,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
@@ -779,7 +816,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
@@ -788,16 +824,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
@@ -813,9 +850,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyo
@@ -874,12 +912,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
@@ -936,10 +968,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
@@ -953,13 +985,14 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
@@ -972,6 +1005,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/registry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
@@ -982,15 +1016,14 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
@@ -1002,13 +1035,14 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -1041,6 +1075,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyo
@@ -1060,6 +1095,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/registry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
@@ -1076,8 +1112,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo