update to bzr 2.4.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile    3 Nov 2011 22:13:23 -0000       1.19
+++ Makefile    22 Dec 2011 16:19:19 -0000
@@ -2,9 +2,8 @@
 
 COMMENT =      distributed version control system by Canonical
 
-MODPY_EGG_VERSION = 2.2.2
+MODPY_EGG_VERSION = 2.4.2
 DISTNAME =     bzr-${MODPY_EGG_VERSION}
-REVISION =     3
 CATEGORIES =   devel
 
 HOMEPAGE =     http://bazaar-vcs.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    10 Jan 2011 20:18:09 -0000      1.7
+++ distinfo    22 Dec 2011 16:19:19 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-2.2.2.tar.gz) = 0b+i/RqtKCxCPHjWLrrLIQ==
-RMD160 (bzr-2.2.2.tar.gz) = iI4PWciOD94mrfaXqUIu1zLMMyk=
-SHA1 (bzr-2.2.2.tar.gz) = nbjwYdlLo/C0jc1iPEc8botXC2o=
-SHA256 (bzr-2.2.2.tar.gz) = c07gw6ZOe4INZjKuDipL+RrdkI/evlyChlYYw4F1yOM=
-SIZE (bzr-2.2.2.tar.gz) = 6897175
+MD5 (bzr-2.4.2.tar.gz) = z8Bv3dNIRFxlokfAszoF2w==
+RMD160 (bzr-2.4.2.tar.gz) = R+z9FlHRCu6ijA3/MSTGN9u7k6s=
+SHA1 (bzr-2.4.2.tar.gz) = NmO4YtyPuXKfmq4kJ8urKvnJAa0=
+SHA256 (bzr-2.4.2.tar.gz) = pbjbd8YeVEUGgL79u0eV+Kly+loWcSN4Y2DYmLdSZW8=
+SIZE (bzr-2.4.2.tar.gz) = 7528721
Index: patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.4
diff -u -r1.4 patch-bzr
--- patches/patch-bzr   10 Jan 2011 20:18:09 -0000      1.4
+++ patches/patch-bzr   22 Dec 2011 16:19:19 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-bzr,v 1.4 2011/01/10 20:18:09 eric Exp $
---- bzr.orig   Mon Dec  6 17:49:57 2010
-+++ bzr        Mon Dec  6 17:50:14 2010
+--- bzr.orig   Thu Oct 27 15:21:20 2011
++++ bzr        Thu Dec 22 17:15:46 2011
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! ${MODPY_BIN}
  
- # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
+ # Copyright (C) 2005-2011 Canonical Ltd
  #
Index: patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.4
diff -u -r1.4 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py        10 Jan 2011 20:18:09 -0000      1.4
+++ patches/patch-bzrlib_diff_py        22 Dec 2011 16:19:19 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_diff_py,v 1.4 2011/01/10 20:18:09 eric Exp $
---- bzrlib/diff.py.orig        Mon Dec  6 17:51:40 2010
-+++ bzrlib/diff.py     Mon Dec  6 17:51:33 2010
-@@ -189,7 +189,7 @@ def external_diff(old_filename, oldlines, new_filename
+--- bzrlib/diff.py.orig        Thu Oct 27 15:21:20 2011
++++ bzrlib/diff.py     Thu Dec 22 17:15:46 2011
+@@ -187,7 +187,7 @@ def external_diff(old_filename, oldlines, new_filename
              # Since we are dealing with an ANSI api, use mbcs encoding
              old_filename = old_filename.encode('mbcs')
              new_filename = new_filename.encode('mbcs')
Index: patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_tests_test_diff_py,v
retrieving revision 1.3
diff -u -r1.3 patch-bzrlib_tests_test_diff_py
--- patches/patch-bzrlib_tests_test_diff_py     10 Jan 2011 20:18:09 -0000      
1.3
+++ patches/patch-bzrlib_tests_test_diff_py     22 Dec 2011 16:19:19 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.3 2011/01/10 20:18:09 eric Exp $
---- bzrlib/tests/test_diff.py.orig     Mon Dec  6 17:54:43 2010
-+++ bzrlib/tests/test_diff.py  Mon Dec  6 17:54:32 2010
-@@ -246,7 +246,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
+--- bzrlib/tests/test_diff.py.orig     Thu Oct 27 15:21:20 2011
++++ bzrlib/tests/test_diff.py  Thu Dec 22 17:15:46 2011
+@@ -237,7 +237,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
          # Make sure external_diff doesn't fail in the current LANG
          lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
  
@@ -10,7 +10,7 @@
          open('old', 'wb').write('\x00foobar\n')
          open('new', 'wb').write('foo\x00bar\n')
          pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-@@ -1352,7 +1352,7 @@ class TestDiffFromTool(tests.TestCaseWithTransport):
+@@ -1339,7 +1339,7 @@ class TestDiffFromTool(tests.TestCaseWithTransport):
  
      def test_execute(self):
          output = StringIO()
Index: patches/patch-bzrlib_transport_http__urllib2_wrappers_py
===================================================================
RCS file: patches/patch-bzrlib_transport_http__urllib2_wrappers_py
diff -N patches/patch-bzrlib_transport_http__urllib2_wrappers_py
--- patches/patch-bzrlib_transport_http__urllib2_wrappers_py    3 Aug 2011 
13:20:50 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-bzrlib_transport_http__urllib2_wrappers_py,v 1.1 2011/08/03 
13:20:50 dcoppa Exp $
-
-Unbreak bzr with python2.7 (xmlrpclib API change)
-https://bugs.launchpad.net/bzr/+bug/612096
-
---- bzrlib/transport/http/_urllib2_wrappers.py.orig    Thu Nov 25 16:59:33 2010
-+++ bzrlib/transport/http/_urllib2_wrappers.py Wed Aug  3 13:10:47 2011
-@@ -75,6 +75,26 @@ from bzrlib import (
-     )
- 
- 
-+class addinfourl(urllib2.addinfourl):
-+    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
-+
-+    In python-2.7, xmlrpclib expects that the response object that it receives
-+    has a getheader method.  httplib.HTTPResponse provides this but
-+    urllib2.addinfourl does not.  Add the necessary functions here, ported to
-+    use the internal data structures of addinfourl.
-+    '''
-+
-+    def getheader(self, name, default=None):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.getheader(name, default)
-+
-+    def getheaders(self):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.items()
-+
-+
- class _ReportingFileSocket(object):
- 
-     def __init__(self, filesock, report_activity=None):
-@@ -656,7 +676,7 @@ class AbstractHTTPHandler(urllib2.AbstractHTTPHandler)
-             r = response
-             r.recv = r.read
-             fp = socket._fileobject(r, bufsize=65536)
--            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
-+            resp = addinfourl(fp, r.msg, req.get_full_url())
-             resp.code = r.status
-             resp.msg = r.reason
-             resp.version = r.version
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py      10 Jan 2011 20:18:09 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2011/01/10 20:18:09 eric Exp $
---- setup.py.orig      Tue Dec  7 10:58:25 2010
-+++ setup.py   Tue Dec  7 10:58:53 2010
-@@ -731,7 +731,7 @@ else:
-         # easy_install one
-         DATA_FILES = [('man/man1', ['bzr.1'])]
- 
--    if sys.platform != 'win32':
-+    if False:
-         # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
-         #
-         # checking the paths and hardcoding the check for root is a bit gross,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST   10 Jan 2011 20:18:09 -0000      1.6
+++ pkg/PLIST   22 Dec 2011 16:19:19 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.6 2011/01/10 20:18:09 eric Exp $
 bin/bzr
-lib/python${MODPY_VERSION}/site-packages/bzr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/bzrlib/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.pyc
@@ -88,6 +88,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cache_utf8.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cache_utf8.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cethread.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cethread.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/check.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/check.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/chk_map.py
@@ -100,6 +102,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/clean_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cleanup.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cleanup.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_test_script.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_test_script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_version_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cmdline.py
@@ -108,10 +112,14 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/commit_signature_commands.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/commit_signature_commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/config.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/controldir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/controldir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/crash.py
@@ -122,8 +130,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.py
@@ -147,8 +153,18 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/autodoc_man.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/autodoc_rstx.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/autodoc_rstx.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/sphinx_conf.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/sphinx_conf.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/builders/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/builders/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/builders/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/builders/texinfo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/builders/texinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/conf.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/conf.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/writers/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/writers/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/writers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/writers/texinfo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/doc_generate/writers/texinfo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.py
@@ -162,6 +178,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/tar_exporter.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/zip_exporter.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/zip_exporter.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/export_pot.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/export_pot.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/externalcommand.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/externalcommand.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/fetch.py
@@ -206,6 +224,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/rules.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/i18n.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/i18n.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.py
@@ -256,6 +276,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mergetools.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mergetools.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.py
@@ -291,6 +313,16 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/test_bashcomp.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/test_bashcomp.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/changelog_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.pyc
@@ -298,6 +330,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_api.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_api.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_api_lite.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_api_lite.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_propose.py
@@ -308,6 +342,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_api.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_api.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_api_lite.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_api_lite.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_login.py
@@ -338,10 +374,31 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/test_news_merge.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/test_news_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/bzrdir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_bzrdir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_workingtree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/workingtree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/xml4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/weave_fmt/xml4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/push.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pyutils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pyutils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.py
@@ -359,12 +416,12 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/groupcompress_repo.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/groupcompress_repo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitpack_repo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitpack_repo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/revision.py
@@ -387,8 +444,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shelf_ui.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shellcomplete.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shellcomplete.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.pyc
@@ -466,8 +521,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_branch.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.py
@@ -484,6 +537,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_command_encoding.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_config.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_config.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_conflicts.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_conflicts.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_debug.py
@@ -564,12 +619,18 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reference.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reference.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remember_option.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remember_option.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove_tree.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_repair_workingtree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_repair_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_resolve.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_resolve.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revert.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revert.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revision_history.py
@@ -580,6 +641,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_rmbranch.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_rmbranch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_script.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.py
@@ -649,6 +712,19 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_revert.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/builders/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/builders/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/builders/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/builders/test_texinfo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/builders/test_texinfo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/writers/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/writers/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/writers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/writers/test_texinfo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/doc_generate/writers/test_texinfo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/fake_command.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/fake_command.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/features.py
@@ -738,15 +814,22 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_bzrdir.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_bzrdir.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_push.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_push.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/__init__.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_supported.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_supported.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_unsupported.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_unsupported.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_controldir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_controldir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_format.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_format.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/test_supported.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/test_supported.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/test_unsupported.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_controldir_colo/test_unsupported.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/__init__.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/__init__.pyc
@@ -759,14 +842,14 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_copy_content_into.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_copy_content_into.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_fetch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_fetch.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_get.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_get.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_pull.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_pull.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_push.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_push.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_update_revisions.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interrepository/
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interrepository/__init__.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interrepository/__init__.pyc
@@ -798,38 +881,30 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/__init__.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/helpers.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/helpers.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test__generate_text_key_index.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test__generate_text_key_index.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_add_fallback_repository.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_add_fallback_repository.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_add_inventory_by_delta.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_add_inventory_by_delta.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_break_lock.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_break_lock.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_check.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_check.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_check_reconcile.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_check_reconcile.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_commit_builder.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_commit_builder.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_fetch.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_fetch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_file_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_file_graph.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_fileid_involved.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_fileid_involved.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_find_text_key_references.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_find_text_key_references.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_get_parent_map.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_get_parent_map.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_has_revisions.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_has_revisions.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_has_same_location.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_has_same_location.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_is_write_locked.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_is_write_locked.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_iter_reverse_revision_history.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_locking.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_locking.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_merge_directive.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_merge_directive.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/test_pack.py
@@ -856,6 +931,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/__init__.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test__make_parents_provider.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test__make_parents_provider.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_add_inventory.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_add_inventory.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_add_revision.py
@@ -868,6 +945,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_break_lock.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_check.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_commit_with_stacking.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_commit_with_stacking.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_default_stacking.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_default_stacking.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_fetch.py
@@ -876,10 +955,35 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_get_record_stream.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_graph.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_initialize.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_initialize.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_unlock.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_reference/test_unlock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test__generate_text_key_index.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_check_reconcile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_check_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_fetch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_fetch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_find_text_key_references.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_find_text_key_references.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_reconcile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_write_group.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository_vf/test_write_group.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_transport.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/
@@ -887,6 +991,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_annotate_iter.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_annotate_iter.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_export.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_export.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_get_file_mtime.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_get_file_mtime.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_get_file_with_stat.py
@@ -897,6 +1003,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_get_symlink_target.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_inv.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_inv.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_is_executable.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_is_executable.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_iter_search_rules.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_iter_search_rules.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_list_files.py
@@ -937,6 +1045,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_changes_from.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_check.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_check_state.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_check_state.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_commit.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_commit.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_content_filters.py
@@ -1001,6 +1111,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_walkdirs.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_workingtree.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/scenarios.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/scenarios.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/script.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/
@@ -1018,6 +1130,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__annotator.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__bencode.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__bencode.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__btree_serializer.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__btree_serializer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chk_map.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chk_map.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chunks_to_lines.py
@@ -1062,6 +1176,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cache_utf8.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cache_utf8.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cethread.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cethread.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_chk_map.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_chk_map.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_chk_serializer.py
@@ -1084,6 +1200,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_controldir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_controldir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_crash.py
@@ -1094,8 +1212,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.py
@@ -1110,6 +1226,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_export.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_export.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_export_pot.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_export_pot.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.py
@@ -1148,6 +1266,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_i18n.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_i18n.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.py
@@ -1196,6 +1316,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mergetools.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mergetools.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.py
@@ -1250,6 +1372,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_plugins.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_progress.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_progress.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pyutils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pyutils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_read_bundle.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_read_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.py
@@ -1278,6 +1402,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sampler.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sampler.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_scenarios.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_scenarios.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_script.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_selftest.py
@@ -1322,6 +1448,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_test_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_test_server.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.py
@@ -1360,10 +1488,14 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_upgrade_stacked.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_urlutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_urlutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_utextwrap.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_utextwrap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_version.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_version_info.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_versionedfile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_versionedfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_weave.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_weave.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.py
@@ -1378,6 +1510,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/testui.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/testui.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.py
@@ -1472,13 +1606,13 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/upgrade.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/urlutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/urlutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/utextwrap.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/utextwrap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/_bencode_py.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/_bencode_py.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.pyc
@@ -1519,6 +1653,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_rio.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/versionedfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/versionedfile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/vf_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/vf_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/views.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/views.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave.py
@@ -1529,10 +1665,10 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_3.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_3.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.py

Reply via email to