3 files changed, 76 insertions, 73 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 1bfc315183b5..bee1bbca1c66 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpad.net/bzr/1.7/${PORTVERSION}/+download/ \
+MASTER_SITES=	https://launchpad.net/bzr/1.8/${PORTVERSION}/+download/ \
 		http://bazaar-vcs.org/releases/src/
 DISTNAME=	bzr-${PORTVERSION}
 
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 4b88652e891d..50295b83b945 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.7.1.tar.gz) = 40b9219e59d6cd747906a35ff10d0aba
-SHA256 (bzr-1.7.1.tar.gz) = 481af979ecff9f47e77683e65354da932a364d6911bdb155245329429c2c83ab
-SIZE (bzr-1.7.1.tar.gz) = 3750181
+MD5 (bzr-1.8.tar.gz) = 96da15954049dfa72b927d96134a55d4
+SHA256 (bzr-1.8.tar.gz) = b796dd81ca22381fc4f59d7b1132f96f544e2905e3ce46861aaa6519511767c9
+SIZE (bzr-1.8.tar.gz) = 3818860
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 760a237b8c18..ca082f48676b 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -915,6 +915,72 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/helpers.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/helpers.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test__generate_text_key_index.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test__generate_text_key_index.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test__generate_text_key_index.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_add_fallback_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_add_fallback_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_add_fallback_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_check_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_commit_builder.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_commit_builder.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_commit_builder.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fileid_involved.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fileid_involved.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_fileid_involved.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_find_text_key_references.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_find_text_key_references.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_find_text_key_references.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_get_parent_map.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_get_parent_map.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_get_parent_map.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_revisions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_revisions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_revisions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_same_location.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_same_location.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_has_same_location.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_is_write_locked.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_is_write_locked.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_is_write_locked.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_iter_reverse_revision_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_pack.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_pack.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_pack.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_revision.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_revision.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_statistics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_statistics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_statistics.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_write_group.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_write_group.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository/test_write_group.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/__init__.pyo
@@ -936,72 +1002,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/helpers.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_add_fallback_repository.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_add_fallback_repository.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_add_fallback_repository.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check_reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_check_reconcile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_find_text_key_references.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_get_parent_map.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_get_parent_map.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_get_parent_map.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_revisions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_revisions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_revisions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_has_same_location.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_is_write_locked.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_is_write_locked.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_is_write_locked.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_pack.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_pack.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_pack.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_write_group.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_write_group.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_write_group.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
@@ -1514,6 +1514,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
@@ -1831,8 +1834,8 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations