Merge lp:~brz/loggerhead/breezy into lp:loggerhead

[Jelmer Vernooij]

Switch loggerhead over to using the Breezy rather than Bazaar APIs.

Switch loggerhead over to using the Breezy rather than Bazaar APIs.

[lp:~brz/loggerhead/breezy]

506. By Jelmer Vernooij on 2018-09-05

Add travis config.

507. By Jelmer Vernooij on 2018-09-05

Install simpletal from homepage.

508. By Jelmer Vernooij on 2018-09-08

s/Bazaar/Breezy.

509. By Jelmer Vernooij on 2018-09-08

s/Bazaar/Breezy/.

510. By Jelmer Vernooij on 2018-09-08

s/bazaar.conf/breezy.conf.

511. By Jelmer Vernooij on 2018-09-08

Fix local path serving in serve-branches.

512. By Jelmer Vernooij on 2018-09-08

Use bool_from_string.

513. By Jelmer Vernooij on 2018-09-08

Serving .bzr/ on remote branches (or readonly+ branches) works fine.

514. By Jelmer Vernooij on 2018-09-08

Determine public URL for branching from request URL.

515. By Jelmer Vernooij on 2018-09-08

Some fixes for working with git trees.

516. By Jelmer Vernooij on 2018-09-08

Fix remaining tests.

517. By Jelmer Vernooij on 2018-09-08

Use more standard breezy infrastructure.

518. By Jelmer Vernooij on 2018-09-08

Merge support for more columns.

519. By Jelmer Vernooij on 2018-10-20

Remove python path hackery.

520. By Jelmer Vernooij on 2018-10-20

Use setuptools.

521. By Jelmer Vernooij on 2018-10-20

Some python3 porting work.

522. By Jelmer Vernooij on 2018-10-20

Avoid using cStringIO.

523. By Jelmer Vernooij on 2018-10-20

Fix some more import errors.

524. By Jelmer Vernooij on 2018-10-20

Use bleach rather than simpleTAL's HTMLStructureCleaner.

525. By Jelmer Vernooij on 2018-10-20

More python3 porting work.

526. By Jelmer Vernooij on 2018-10-20

Set install_requires. I can't find an entry in pip for SimpleTAL. :(

527. By Jelmer Vernooij on 2018-10-20

Fix relative import.

528. By Jelmer Vernooij on 2018-10-20

More python3 porting work.

529. By Jelmer Vernooij on 2018-10-20

More python 3 work; down to 16 failing tests.

530. By Jelmer Vernooij on 2018-10-20

More python3 porting.

531. By Jelmer Vernooij on 2018-10-20

Fix some more tests on Python 3.

532. By Jelmer Vernooij on 2018-10-20

More python 3 fixes.

533. By Jelmer Vernooij on 2018-10-20

Finish python 3 port.

534. By Jelmer Vernooij on 2018-10-20

Run tests on python 3.

535. By Jelmer Vernooij on 2018-10-20

Add NEWS, drop info.py.

536. By Jelmer Vernooij on 2018-10-20

Rename serve-branches to loggerhead-serve.

537. By Jelmer Vernooij on 2018-10-20

Add dependency on bleach.

538. By Jelmer Vernooij on 2018-10-21

Fix loading when loggerhead is installed separately.

539. By Jelmer Vernooij on 2018-10-27

Don't unnecessarily encode paths.

540. By Jelmer Vernooij on 2018-10-27

Fix use of urllib.unquote.

541. By Jelmer Vernooij on 2018-11-01

Avoid use of file_ids.

542. By Jelmer Vernooij on 2018-11-01

Merge trunk.

543. By Jelmer Vernooij on 2018-11-01

Drop python 3.4 support on travis.

544. By Jelmer Vernooij on 2018-11-03

Don't install loggerhead.wsgi - it's not an executable.

545. By Jelmer Vernooij on 2018-11-03

Try local loggerhead first, then fall back to system one.

546. By Jelmer Vernooij on 2018-11-04

Add byov.conf.

547. By Vincent Ladeuil on 2018-11-04

Don't depend on python3-simpletal, which is not available in Ubuntu yet.

548. By Jelmer Vernooij on 2018-11-04

Install simpletal from the webz.

549. By Jelmer Vernooij on 2018-11-04

Add missing dependency on six in byov.conf.

550. By Jelmer Vernooij on 2018-11-04

Add dependency on fixtures.

551. By Jelmer Vernooij on 2018-11-27

Fix compatibility with newer versions of breezy.

[Colin Watson (cjwatson)]

Sorry for the long delay here; it took me a long time to get a suitable Breezy-using Launchpad branch set up so that I could test the integration.

As well as the minor comments here, https://code.launchpad.net/~cjwatson/loggerhead/more-no-file-ids/+merge/372951 is needed.

review: Approve

[lp:~brz/loggerhead/breezy]

552. By Jelmer Vernooij on 2019-09-18

Merge breezy changes.

553. By Jelmer Vernooij on 2019-09-18

Review comments.

[Jelmer Vernooij (jelmer)]

Can you please land? I don't have access to lp:loggerhead

[Colin Watson (cjwatson)]

Landed. Thanks!

=== modified file '.bzrignore'
--- .bzrignore	2011-07-10 22:53:59 +0000
+++ .bzrignore	2019-09-18 16:50:15 +0000
@@ -10,3 +10,5 @@
 tags
 .project
 .pydevproject
+.testrepository
+MANIFEST

=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2019-09-18 16:50:15 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=BRZ_PLUGINS_AT=loggerhead@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-brz} selftest -s bp.loggerhead. --subunit2 $IDOPTION $LISTOPT
+test_id_option=--load-list $IDFILE
+test_list_option=--list

=== added file '.travis.yml'
--- .travis.yml	1970-01-01 00:00:00 +0000
+++ .travis.yml	2019-09-18 16:50:15 +0000
@@ -0,0 +1,28 @@
+language: python
+addons:
+  apt:
+    update: true
+sudo: false
+cache: pip
+git:
+  depth: false
+
+matrix:
+  include:
+    - python: 2.7
+      env: TAL_VERSION=4.3
+    - python: 3.5
+      env: TAL_VERSION=5.2
+    - python: 3.6
+      env: TAL_VERSION=5.2
+
+script:
+  - python -m coverage run -p -m unittest loggerhead.tests.test_suite
+
+install:
+  - sudo apt install python-all subunit python-testtools adduser libjs-yui3-min
+  - travis_retry pip install -U setuptools
+  - travis_retry pip install -U pip coverage codecov flake8 testtools configobj cython testscenarios six docutils python-subunit dulwich bzr+lp:brz pygments simplejson paste http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-$TAL_VERSION.tar.gz bleach
+
+after_success:
+  - codecov

=== renamed file 'HACKING' => 'HACKING.rst'
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-02-08 00:25:23 +0000
+++ MANIFEST.in	2019-09-18 16:50:15 +0000
@@ -3,7 +3,7 @@
 include NEWS
 include README.txt
 include apache-loggerhead.conf
-include bazaar.conf
+include breezy.conf
 include loggerhead.conf.example
 include loggerheadd
 include Makefile

=== modified file 'Makefile'
--- Makefile	2011-03-14 08:47:03 +0000
+++ Makefile	2019-09-18 16:50:15 +0000
@@ -8,4 +8,4 @@
 	rm -rf dist/
 
 check:
-	BZR_PLUGINS_AT=loggerhead@$$(pwd) bzr selftest -s bp.loggerhead
+	BRZ_PLUGINS_AT=loggerhead@$$(pwd) brz selftest -s bp.loggerhead

=== modified file 'NEWS'
--- NEWS	2019-06-20 16:18:17 +0000
+++ NEWS	2019-09-18 16:50:15 +0000
@@ -1,9 +1,15 @@
 What's changed in loggerhead?
 =============================
 
-NEXT
+1.20.0
 ----
 
+    - Port to Breezy (https://www.breezy-vcs.org/). (Jelmer Vernooij)
+
+    - Port to Python 3. (Jelmer Vernooij)
+
+    - Serve-branches has been renamed to 'loggerhead-serve'. (Jelmer Vernooij)
+
     - Fixed weird icon in file lists (e.g. revision summaries) when a file or
       directory with a blank name was listed. (Cruz Bishop, #387337).
 

=== renamed file 'README' => 'README.rst'
--- README	2010-04-23 01:30:29 +0000
+++ README.rst	2019-09-18 16:50:15 +0000
@@ -4,8 +4,7 @@
 Overview
 --------
 
-Loggerhead is a web viewer for Bazaar branches. Its lets users do
-stuff like:
+Loggerhead is a web viewer for Breezy. Its lets users do stuff like:
 
 * navigate through branch history
 * view the files in a given revision
@@ -23,6 +22,8 @@
 Licensing
 ---------
 
-This software is (C) Copyright Canonical Limited 2006-10 under the
-GPL Version 2 or later. Please see the file COPYING.txt for the
-licence details.
+This software is licensed under the GPL Version 2 or later.
+Please see the file COPYING.txt for the licence details.
+
+ (C) Copyright Canonical Limited 2006-10
+ (C) Copyright Breezy Developers 2018

=== modified file '__init__.py'
--- __init__.py	2012-02-08 01:50:02 +0000
+++ __init__.py	2019-09-18 16:50:15 +0000
@@ -18,8 +18,8 @@
 # This file allows loggerhead to be treated as a plugin for bzr.
 #
 # XXX: Because loggerhead already contains a loggerhead directory, much of the
-# code is going to appear loaded at bzrlib.plugins.loggerhead.loggerhead.
-# This seems like the easiest thing, because bzrlib wants the top-level plugin
+# code is going to appear loaded at breezy.plugins.loggerhead.loggerhead.
+# This seems like the easiest thing, because breezy wants the top-level plugin
 # directory to be the module, but when it's used as a library people expect
 # the source directory to contain a directory called loggerhead.  -- mbp
 # 20090123
@@ -32,91 +32,85 @@
 
 import sys
 
-from info import (
-    bzr_plugin_version as version_info,
-    bzr_compatible_versions,
-    )
-
-if __name__ == 'bzrlib.plugins.loggerhead':
-    import bzrlib
-    from bzrlib.api import require_any_api
-    from bzrlib import commands
-
-    require_any_api(bzrlib, bzr_compatible_versions)
-
-    from bzrlib.transport import transport_server_registry
-
-    DEFAULT_HOST = '0.0.0.0'
-    DEFAULT_PORT = 8080
-    HELP = ('Loggerhead, a web-based code viewer and server. (default port: %d)' %
-            (DEFAULT_PORT,))
-
-    def _ensure_loggerhead_path():
-        """Ensure that you can 'import loggerhead' and get the root."""
-        # loggerhead internal code will try to 'import loggerhead', so
-        # let's put it on the path if we can't find it in the existing path
-        try:
-            import loggerhead.apps.transport
-        except ImportError:
-            import os.path, sys
-            sys.path.append(os.path.dirname(__file__))
-
-    def serve_http(transport, host=None, port=None, inet=None):
-        # TODO: if we supported inet to pass requests in and respond to them,
-        #       then it would be easier to test the full stack, but it probably
-        #       means routing around paste.httpserver.serve which probably
-        #       isn't testing the full stack
-        from paste.httpexceptions import HTTPExceptionHandler
-        from paste.httpserver import serve
-
-        _ensure_loggerhead_path()
-
+version_info = (1, 20, 0) # Keep in sync with loggerhead/__init__.py
+
+import breezy
+from breezy import commands
+
+from breezy.transport import transport_server_registry
+
+DEFAULT_HOST = '0.0.0.0'
+DEFAULT_PORT = 8080
+HELP = ('Loggerhead, a web-based code viewer and server. (default port: %d)' %
+        (DEFAULT_PORT,))
+
+
+def serve_http(transport, host=None, port=None, inet=None, client_timeout=None):
+    # TODO: if we supported inet to pass requests in and respond to them,
+    #       then it would be easier to test the full stack, but it probably
+    #       means routing around paste.httpserver.serve which probably
+    #       isn't testing the full stack
+    from paste.httpexceptions import HTTPExceptionHandler
+    from paste.httpserver import serve
+
+    try:
+        from .loggerhead.apps.http_head import HeadMiddleware
+        from .loggerhead.apps.transport import BranchesFromTransportRoot
+        from .loggerhead.config import LoggerheadConfig
+        from .loggerhead.main import setup_logging
+    except ImportError:
         from loggerhead.apps.http_head import HeadMiddleware
         from loggerhead.apps.transport import BranchesFromTransportRoot
         from loggerhead.config import LoggerheadConfig
         from loggerhead.main import setup_logging
 
-        if host is None:
-            host = DEFAULT_HOST
-        if port is None:
-            port = DEFAULT_PORT
-        argv = ['--host', host, '--port', str(port), '--', transport.base]
-        if not transport.is_readonly():
-            argv.insert(0, '--allow-writes')
-        config = LoggerheadConfig(argv)
-        setup_logging(config, init_logging=False, log_file=sys.stderr)
-        app = BranchesFromTransportRoot(transport.base, config)
-        # Bug #758618, HeadMiddleware seems to break HTTPExceptionHandler from
-        # actually sending appropriate return codes to the client. Since nobody
-        # desperately needs HeadMiddleware right now, just ignoring it.
-        # app = HeadMiddleware(app)
-        app = HTTPExceptionHandler(app)
-        serve(app, host=host, port=port)
-
-    transport_server_registry.register('http', serve_http, help=HELP)
-
-    class cmd_load_test_loggerhead(commands.Command):
-        """Run a load test against a live loggerhead instance.
-
-        Pass in the name of a script file to run. See loggerhead/load_test.py
-        for a description of the file format.
-        """
-
-        takes_args = ["filename"]
-
-        def run(self, filename):
-            from bzrlib.plugins.loggerhead.loggerhead import load_test
-            script = load_test.run_script(filename)
-            for thread_id in sorted(script._threads):
-                worker = script._threads[thread_id][0]
-                for url, success, time in worker.stats:
-                    self.outf.write(' %5.3fs %s %s\n'
-                                    % (time, str(success)[0], url))
-
-    commands.register_command(cmd_load_test_loggerhead)
-
-    def load_tests(standard_tests, module, loader):
-        _ensure_loggerhead_path()
-        standard_tests.addTests(loader.loadTestsFromModuleNames(
-            ['bzrlib.plugins.loggerhead.loggerhead.tests']))
-        return standard_tests
+    if host is None:
+        host = DEFAULT_HOST
+    if port is None:
+        port = DEFAULT_PORT
+    argv = ['--host', host, '--port', str(port), '--', transport.base]
+    if not transport.is_readonly():
+        argv.insert(0, '--allow-writes')
+    config = LoggerheadConfig(argv)
+    setup_logging(config, init_logging=False, log_file=sys.stderr)
+    app = BranchesFromTransportRoot(transport.base, config)
+    # Bug #758618, HeadMiddleware seems to break HTTPExceptionHandler from
+    # actually sending appropriate return codes to the client. Since nobody
+    # desperately needs HeadMiddleware right now, just ignoring it.
+    # app = HeadMiddleware(app)
+    app = HTTPExceptionHandler(app)
+    serve(app, host=host, port=port)
+
+transport_server_registry.register('http', serve_http, help=HELP)
+
+class cmd_load_test_loggerhead(commands.Command):
+    """Run a load test against a live loggerhead instance.
+
+    Pass in the name of a script file to run. See loggerhead/load_test.py
+    for a description of the file format.
+    """
+
+    hidden = True
+    takes_args = ["filename"]
+
+    def run(self, filename):
+        try:
+            from .loggerhead.loggerhead import load_test
+        except ImportError:
+            from loggerhead.loggerhead import load_test
+        script = load_test.run_script(filename)
+        for thread_id in sorted(script._threads):
+            worker = script._threads[thread_id][0]
+            for url, success, time in worker.stats:
+                self.outf.write(' %5.3fs %s %s\n'
+                                % (time, str(success)[0], url))
+
+commands.register_command(cmd_load_test_loggerhead)
+
+def load_tests(loader, basic_tests, pattern):
+    try:
+        from .loggerhead.tests import test_suite
+    except ImportError:
+        from loggerhead.tests import test_suite
+    basic_tests.addTest(test_suite())
+    return basic_tests

=== renamed file 'bazaar.conf' => 'breezy.conf'
=== added file 'byov.conf'
--- byov.conf	1970-01-01 00:00:00 +0000
+++ byov.conf	2019-09-18 16:50:15 +0000
@@ -0,0 +1,23 @@
+# Use lxd containers by default
+vm.class = lxd
+# Start with an up to date system by default
+vm.update = True
+# External sources dependencies, packages are not recent enough
+dulwich.clone = (git clone git://jelmer.uk/dulwich ../dulwich.git)
+dulwich.install = (cd ../dulwich.git && ./setup.py install --user)
+dulwich3.install = (cd ../dulwich.git && python3 ./setup.py install --user)
+simpletal3.install = pip3 install http://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-5.2.tar.gz
+
+[loggerhead]
+vm.release = xenial
+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-fastimport, python-dulwich, python-six, python3-six
+loggerhead.build_deps = python-setuptools, python3-setuptools, libjs-yui3-min, python-docutils, python3-docutils, python-pygments, python3-pygments, python-simplejson, python3-simplejson, python-paste, python3-paste, python-pastedeploy, python3-pastedeploy, python-simpletal, python-bleach, python3-bleach
+loggerhead.test_deps = python3-fixtures, python-fixtures
+vm.packages = {brz.build_deps}, {loggerhead.build_deps}, {loggerhead.test_deps}, bzr, python-junitxml, python3-pip
+brz.branch = (bzr branch lp:brz ../brz-trunk)
+brz.make = (cd ../brz-trunk && make)
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {brz.branch} && {brz.make})
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=loggerhead@`pwd` BRZ_PLUGIN_PATH=-site:-user python2 ../brz-trunk/brz selftest -v --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"
+[loggerhead-py3]
+byoci.setup.command = ({dulwich.clone} && {dulwich3.install} && {brz.branch} && {brz.make} && {simpletal3.install})
+byoci.tests.command = bash -o pipefail -c "bzr log -l2 && (BRZ_PLUGINS_AT=loggerhead@`pwd` BRZ_PLUGIN_PATH=-site:-user python3 ../brz-trunk/brz selftest -v --parallel=fork --subunit2 | subunit2junitxml -o ../results.xml -f | subunit2pyunit)"

=== modified file 'docs/index.rst'
--- docs/index.rst	2012-02-02 04:58:46 +0000
+++ docs/index.rst	2019-09-18 16:50:15 +0000
@@ -1,7 +1,7 @@
 Loggerhead:  A web viewer for ``bzr`` branches
 ==============================================
 
-Loggerhead is a web viewer for projects in Bazaar. It can be used to navigate 
+Loggerhead is a web viewer for projects in Breezy. It can be used to navigate
 a branch history, annotate files, view patches, perform searches, etc.
 Loggerhead is heavily based on `bazaar-webserve
 <https://launchpad.net/bzr-webserve>`_, which was, in turn, loosely
@@ -53,12 +53,12 @@
 ----------------------------------------
 
 After installing all the dependencies, you should be able to run
-:command:`serve-branches` with the branch you want to serve on the
+:command:`loggerhead-serve` with the branch you want to serve on the
 command line:
 
 .. code-block:: sh
 
-    ./serve-branches ~/path/to/branch
+    ./loggerhead-serve ~/path/to/branch
 
 By default, the script listens on port 8080, so head to
 http://localhost:8080/ in your browser to see the branch.
@@ -70,7 +70,7 @@
 Loggerhead will notice and refresh, and Bazaar uses its own branch
 locking to prevent corruption.
 
-See :doc:`serve-branches` for all command line options.
+See :doc:`loggerhead-serve` for all command line options.
 
 Running Loggerhead as a Daemon
 ------------------------------
@@ -84,7 +84,7 @@
    $ sudo cp ./loggerheadd /etc/init.d
 
 2) Edit the file to configure where your Loggerhead is installed, and which
-   serve-branches options you would like.
+   loggerhead-serve options you would like.
 
 .. code-block:: sh
 
@@ -101,16 +101,16 @@
    $ sudo chkconfig --add loggerheadd
 
 
-Using Loggerhead as a Bazaar Plugin
-------------------------------------
+Using Loggerhead as a Breezy Plugin
+-----------------------------------
 
-This branch contains experimental support for using Loggerhead as a Bazaar
+This branch contains experimental support for using Loggerhead as a Breezy
 plugin.  To use it, place the top-level Loggerhead directory (the one
-containing COPYING.txt) at ``~/.bazaar/plugins/loggerhead``.  E.g.:
+containing COPYING.txt) at ``~/.config/breezy/plugins/loggerhead``.  E.g.:
 
 .. code-block:: sh
 
-   $ bzr branch lp:loggerhead ~/.bazaar/plugins/loggerhead
+   $ bzr branch lp:loggerhead ~/.config/breezy/plugins/loggerhead
    $ cd ~/myproject
    $ bzr serve --http
 
@@ -118,7 +118,7 @@
 Using a Config File
 -------------------
 
-To hide branches from being displayed, add to ``~/.bazaar/locations.conf``,
+To hide branches from being displayed, add to ``~/.config/breezy/locations.conf``,
 under the branch's section:
 
 .. code-block:: ini
@@ -132,7 +132,7 @@
 Serving Loggerhead behind Apache
 --------------------------------
 
-If you want to view Bazaar branches from your existing Apache
+If you want to view Breezy branches from your existing Apache
 installation, you'll need to configure Apache to proxy certain
 requests to Loggerhead.  Adding lines like this to your Apache
 configuration is one way to do this:
@@ -144,7 +144,7 @@
         ProxyPassReverse http://127.0.0.1:8080/branches/
     </Location>
 
-If Paste Deploy is installed, the :command:`serve-branches` script can be
+If Paste Deploy is installed, the :command:`loggerhead-serve` script can be
 run behind a proxy at the root of a site, but if you're running it at
 some path into the site, you'll need to specify it using
 ``--prefix=/some_path``.
@@ -154,8 +154,8 @@
 
 A second method for using Loggerhead with apache is to have apache itself
 execute Loggerhead via mod_wsgi.  You need to add configuration for apache and
-for bazaar to make this work.  Example config files are in the Loggerhead doc
-directory as apache-loggerhead.conf and bazaar.conf.  You can copy them into
+for breezy to make this work.  Example config files are in the Loggerhead doc
+directory as apache-loggerhead.conf and breezy.conf.  You can copy them into
 place and use them as a starting point following these directions:
 
 1) Install mod_wsgi.  On Ubuntu and other Debian derived distros::
@@ -166,19 +166,20 @@
 
     su -c yum install mod_wsgi
 
-2) Copy the bazaar.conf file where apache will find it (May be done for you if
+2) Copy the breezy.conf file where apache will find it (May be done for you if
    you installed Loggerhead from a distribution package)::
 
     # install -d -o apache -g apache -m 0755 /etc/loggerhead
-    # cp -p /usr/share/doc/loggerhead*/bazaar.conf /etc/loggerhead/
-    # ln -s /etc/loggerhead /var/www/.bazaar
+    # cp -p /usr/share/doc/loggerhead*/breezy.conf /etc/loggerhead/
+    # mkdir -p /var/www/.config
+    # ln -s /etc/loggerhead /var/www/.config/breezy
 
 3) Create the cache directory (May be done for you if you installed Loggerhead
    from a distribution package)::
 
     # install -d -o apache -g apache -m 0700 /var/cache/loggerhead/
 
-4) Edit /etc/loggerhead/bazaar.conf.  You need to set http_root_dir to the filesystem
+4) Edit /etc/loggerhead/breezy.conf.  You need to set http_root_dir to the filesystem
    path that you will find your bzr branches under.  Note that normal
    directories under that path will also be visible in Loggerhead.
 
@@ -188,7 +189,7 @@
 
 6) Edit /etc/httpd/conf.d/loggerhead.conf to point to the url you desire to
    serve Loggerhead on.  This should match with the setting for
-   http_user_prefix in bazaar.conf
+   http_user_prefix in breezy.conf
 
 7) Restart apache and you should be able to start browsing
 
@@ -220,7 +221,7 @@
 .. toctree::
    :maxdepth: 2
 
-   serve-branches
+   loggerhead-serve
 
 
 Support

=== renamed file 'docs/serve-branches.rst' => 'docs/loggerhead-serve.rst'
--- docs/serve-branches.rst	2010-03-25 10:32:47 +0000
+++ docs/loggerhead-serve.rst	2019-09-18 16:50:15 +0000
@@ -1,17 +1,17 @@
-:command:`serve-branches`
+:command:`loggerhead-serve`
 =========================
 
-The :command:`serve-branches` script runs a standalone Loggerhead server in
+The :command:`loggerhead-serve` script runs a standalone Loggerhead server in
 the foreground.
 
-.. program:: serve-branches
+.. program:: loggerhead-serve
 
 Usage
 -----
 
 .. code-block:: sh
 
-   serve-branches [OPTIONS] <target directory>
+   loggerhead-serve [OPTIONS] <target directory>
 
 Options
 -------
@@ -76,7 +76,7 @@
 
 .. cmdoption:: --allow-writes
    
-    Allow writing to the Bazaar server.
+    Allow writing to the Breezy server.
     
     Setting this option keeps Loggerhead from adding a 'readonly+' prefix
     to the base URL of the branch.  The only effect of suppressing this prefix

=== removed file 'info.py'
--- info.py	2011-11-23 08:33:12 +0000
+++ info.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# API Info for loggerhead
-
-bzr_plugin_name = "loggerhead"
-
-bzr_plugin_version = (1, 18, 1)  # Keep in sync with loggerhead/__init__.py
-
-bzr_compatible_versions = [
-    (1, 17, 0), (1, 18, 0), (2, 0, 0), (2, 1, 0), (2, 2, 0), (2, 3, 0),
-    (2, 4, 0), (2, 5, 0),
-    ]
-
-bzr_minimum_version = bzr_compatible_versions[0]
-
-bzr_maximum_version = bzr_compatible_versions[-1]

=== renamed file 'serve-branches' => 'loggerhead-serve'
=== renamed file 'serve-branches.1' => 'loggerhead-serve.1'
--- serve-branches.1	2008-09-10 23:12:59 +0000
+++ loggerhead-serve.1	2019-09-18 16:50:15 +0000
@@ -2,14 +2,14 @@
 .SH NAME
 loggerhead \- run a loggerhead server
 .SH SYNOPSIS
-.B serve-branches
+.B loggerhead-serve
 [\fIoptions\fR] \fI<path>\fR
 .SH DESCRIPTION
-Loggerhead is a web viewer for projects in bazaar. It can be used to navigate 
+Loggerhead is a web viewer for projects in Breezy. It can be used to navigate 
 a branch history, annotate files, view patches, perform searches, etc. It's 
 heavily based on bazaar-webserve, which is itself based on hgweb for Mercurial.
 .PP
-The serve-branches command runs a standalone loggerhead server in the foreground.
+The loggerhead-serve command runs a standalone loggerhead server in the foreground.
 .SH OPTIONS
 .TP
 \fB\-h\fR, \fB\-\-help\fR

=== modified file 'loggerhead.wsgi'
--- loggerhead.wsgi	2012-02-08 01:50:02 +0000
+++ loggerhead.wsgi	2019-09-18 16:50:15 +0000
@@ -23,9 +23,10 @@
 from loggerhead.apps.transport import BranchesFromTransportRoot
 from loggerhead.apps.error import ErrorHandlerApp
 from loggerhead.config import LoggerheadConfig
-from bzrlib import config as bzrconfig
+from breezy import config as bzrconfig
+from breezy.sixish import PY3
 from paste.deploy.config import PrefixMiddleware
-from bzrlib.plugin import load_plugins
+from breezy.plugin import load_plugins
 
 class NotConfiguredError(Exception):
     pass
@@ -36,14 +37,18 @@
 prefix = config.get_option('user_prefix') or ''
 # Note we could use LoggerheadConfig here if it didn't fail when a
 # config option is not also a commandline option
-root_dir = bzrconfig.GlobalConfig().get_user_option('http_root_dir')
-if not root_dir:
-    raise NotConfiguredError('You must have a ~/.bazaar/bazaar.conf file for'
+root_dir = os.getenv('LOGGERHEAD_ROOT_DIR')
+if not root_dir:
+    root_dir = bzrconfig.GlobalConfig().get_user_option('http_root_dir')
+if not root_dir:
+    raise NotConfiguredError('You must set LOGGERHEAD_ROOT_DIR or have '
+            'a ~/.config/breezy/breezy.conf file for'
             ' %(user)s with http_root_dir set to the base directory you want'
             ' to serve bazaar repositories from' %
             {'user': pwd.getpwuid(os.geteuid()).pw_name})
-prefix = prefix.encode('utf-8', 'ignore')
-root_dir = root_dir.encode('utf-8', 'ignore')
+if not PY3:
+    prefix = prefix.encode('utf-8', 'ignore')
+    root_dir = root_dir.encode('utf-8', 'ignore')
 app = BranchesFromTransportRoot(root_dir, config)
 app = PrefixMiddleware(app, prefix=prefix)
 app = HTTPExceptionHandler(app)

=== modified file 'loggerhead/__init__.py'
--- loggerhead/__init__.py	2012-09-11 20:49:32 +0000
+++ loggerhead/__init__.py	2019-09-18 16:50:15 +0000
@@ -22,9 +22,9 @@
 
 import pkg_resources
 
-__version__ = '1.18.2'  # Keep in sync with ../info.py.
+__version__ = '1.20.0'  # Keep in sync with ../__init__.py.
 __revision__ = None
-required_bzrlib = (1, 17)
+required_breezy = (3, 0)
 
 pkg_resources.get_distribution('Paste>=1.6')
 try:
@@ -32,12 +32,3 @@
 except pkg_resources.DistributionNotFound:
     # No paste.deploy is OK, but an old paste.deploy is bad.
     pass
-
-try:
-    from bzrlib.branch import Branch
-    branch = Branch.open('./');
-
-    __revision__ = branch.revno()
-    
-except:
-    pass

=== modified file 'loggerhead/apps/__init__.py'
--- loggerhead/apps/__init__.py	2010-04-30 21:30:18 +0000
+++ loggerhead/apps/__init__.py	2019-09-18 16:50:15 +0000
@@ -4,7 +4,7 @@
 
 from paste import urlparser, fileapp
 
-from loggerhead.util import convert_file_errors
+from ..util import convert_file_errors
 
 static = os.path.join(
     os.path.dirname(os.path.dirname(__file__)), 'static')

=== modified file 'loggerhead/apps/branch.py'
--- loggerhead/apps/branch.py	2012-02-08 01:50:02 +0000
+++ loggerhead/apps/branch.py	2019-09-18 16:50:15 +0000
@@ -17,31 +17,33 @@
 """The WSGI application for serving a Bazaar branch."""
 
 import logging
-import urllib
 import sys
+import wsgiref.util
 
-import bzrlib.branch
-import bzrlib.errors
-from bzrlib.hooks import Hooks
-import bzrlib.lru_cache
+import breezy.branch
+import breezy.errors
+from breezy.hooks import Hooks
+import breezy.lru_cache
+from breezy.sixish import viewitems
+from breezy import urlutils
 
 from paste import request
 from paste import httpexceptions
 
-from loggerhead.apps import static_app
-from loggerhead.controllers.annotate_ui import AnnotateUI
-from loggerhead.controllers.view_ui import ViewUI
-from loggerhead.controllers.atom_ui import AtomUI
-from loggerhead.controllers.changelog_ui import ChangeLogUI
-from loggerhead.controllers.diff_ui import DiffUI
-from loggerhead.controllers.download_ui import DownloadUI, DownloadTarballUI
-from loggerhead.controllers.filediff_ui import FileDiffUI
-from loggerhead.controllers.inventory_ui import InventoryUI
-from loggerhead.controllers.revision_ui import RevisionUI
-from loggerhead.controllers.revlog_ui import RevLogUI
-from loggerhead.controllers.search_ui import SearchUI
-from loggerhead.history import History
-from loggerhead import util
+from ..apps import static_app
+from ..controllers.annotate_ui import AnnotateUI
+from ..controllers.view_ui import ViewUI
+from ..controllers.atom_ui import AtomUI
+from ..controllers.changelog_ui import ChangeLogUI
+from ..controllers.diff_ui import DiffUI
+from ..controllers.download_ui import DownloadUI, DownloadTarballUI
+from ..controllers.filediff_ui import FileDiffUI
+from ..controllers.inventory_ui import InventoryUI
+from ..controllers.revision_ui import RevisionUI
+from ..controllers.revlog_ui import RevLogUI
+from ..controllers.search_ui import SearchUI
+from ..history import History
+from .. import util
 
 
 _DEFAULT = object()
@@ -63,7 +65,7 @@
         self.branch_link = branch_link  # Currently only used in Launchpad
         self.log = logging.getLogger('loggerhead.%s' % (friendly_name,))
         if graph_cache is None:
-            graph_cache = bzrlib.lru_cache.LRUCache(10)
+            graph_cache = breezy.lru_cache.LRUCache(10)
         self.graph_cache = graph_cache
         self.is_root = is_root
         self.served_url = served_url
@@ -84,7 +86,7 @@
             # Only import the cache if we're going to use it.
             # This makes sqlite optional
             try:
-                from loggerhead.changecache import RevInfoDiskCache
+                from ..changecache import RevInfoDiskCache
             except ImportError:
                 self.log.debug("Couldn't load python-sqlite,"
                                " continuing without using a cache")
@@ -92,18 +94,32 @@
                 revinfo_disk_cache = RevInfoDiskCache(cache_path)
         return History(
             self.branch, self.graph_cache,
-            revinfo_disk_cache=revinfo_disk_cache, cache_key=self.friendly_name)
+            revinfo_disk_cache=revinfo_disk_cache,
+            cache_key=(self.friendly_name.encode('utf-8') if self.friendly_name else None))
+
+    # Before the addition of this method, clicking to sort by date from 
+    # within a branch caused a jump up to the top of that branch.
+    def sort_url(self, *args, **kw):
+        if isinstance(args[0], list):
+            args = args[0]
+        qs = []
+        for k, v in viewitems(kw):
+            if v is not None:
+                qs.append('%s=%s' % (k, urlutils.quote(v)))
+        qs = '&'.join(qs)
+        path_info = self._path_info.strip('/').split('?')[0]
+        path_info += '?' + qs
+        return self._url_base + '/' + path_info
 
     def url(self, *args, **kw):
         if isinstance(args[0], list):
             args = args[0]
         qs = []
-        for k, v in kw.iteritems():
+        for k, v in viewitems(kw):
             if v is not None:
-                qs.append('%s=%s' % (k, urllib.quote(v)))
+                qs.append('%s=%s' % (k, urlutils.quote(v)))
         qs = '&'.join(qs)
-        path_info = urllib.quote(
-            unicode('/'.join(args)).encode('utf-8'), safe='/~:')
+        path_info = urlutils.quote('/'.join(args), safe='/~:')
         if qs:
             path_info += '?' + qs
         return self._url_base + path_info
@@ -147,14 +163,15 @@
         return change.date
 
     def public_branch_url(self):
-        return self.branch.get_config().get_user_option('public_branch')
+        return self.branch.get_public_branch()
 
     def lookup_app(self, environ):
         # Check again if the branch is blocked from being served, this is
         # mostly for tests. It's already checked in apps/transport.py
-        if self.branch.get_config().get_user_option('http_serve') == 'False':
+        if not self.branch.get_config().get_user_option_as_bool('http_serve', default=True):
             raise httpexceptions.HTTPNotFound()
         self._url_base = environ['SCRIPT_NAME']
+        self._path_info = environ['PATH_INFO']
         self._static_url_base = environ.get('loggerhead.static.url')
         if self._static_url_base is None:
             self._static_url_base = self._url_base
@@ -164,13 +181,7 @@
             if public_branch is not None:
                 self.served_url = public_branch
             else:
-                # Loggerhead only supports serving .bzr/ on local branches, so
-                # we shouldn't suggest something that won't work.
-                try:
-                    util.local_path_from_url(self.branch.base)
-                    self.served_url = self.url([])
-                except bzrlib.errors.InvalidURL:
-                    self.served_url = None
+                self.served_url = wsgiref.util.application_uri(environ)
         for hook in self.hooks['controller']:
             controller = hook(self, environ)
             if controller is not None:
@@ -190,8 +201,7 @@
         raise httpexceptions.HTTPNotFound()
 
     def app(self, environ, start_response):
-        self.branch.lock_read()
-        try:
+        with self.branch.lock_read():
             try:
                 c = self.lookup_app(environ)
                 return c(environ, start_response)
@@ -199,8 +209,6 @@
                 environ['exc_info'] = sys.exc_info()
                 environ['branch'] = self
                 raise
-        finally:
-            self.branch.unlock()
 
 
 class BranchWSGIAppHooks(Hooks):
@@ -210,7 +218,7 @@
     def __init__(self):
         """Create the default hooks.
         """
-        Hooks.__init__(self, "bzrlib.plugins.loggerhead.apps.branch",
+        Hooks.__init__(self, "breezy.plugins.loggerhead.apps.branch",
             "BranchWSGIApp.hooks")
         self.add_hook('controller',
             "Invoked when looking for the controller to use for a "

=== modified file 'loggerhead/apps/error.py'
--- loggerhead/apps/error.py	2012-02-08 01:50:02 +0000
+++ loggerhead/apps/error.py	2019-09-18 16:50:15 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-from loggerhead.controllers.error_ui import ErrorUI
+from ..controllers.error_ui import ErrorUI
 
 
 class ErrorHandlerApp(object):

=== modified file 'loggerhead/apps/transport.py'
--- loggerhead/apps/transport.py	2012-02-08 01:50:02 +0000
+++ loggerhead/apps/transport.py	2019-09-18 16:50:15 +0000
@@ -18,28 +18,22 @@
 
 import threading
 
-from bzrlib import branch, errors, lru_cache, urlutils
-from bzrlib.config import LocationConfig
-from bzrlib.smart import request
-from bzrlib.transport import get_transport
-from bzrlib.transport.http import wsgi
+from breezy import branch, errors, lru_cache, urlutils
+from breezy.config import LocationConfig
+from breezy.bzr.smart import request
+import breezy.ui
+from breezy.transport import get_transport
+from breezy.transport.http import wsgi
 
 from paste.request import path_info_pop
 from paste import httpexceptions
 from paste import urlparser
 
-from loggerhead import util
-from loggerhead.apps.branch import BranchWSGIApp
-from loggerhead.apps import favicon_app, robots_app, static_app
-from loggerhead.controllers.directory_ui import DirectoryUI
+from .. import util
+from ..apps.branch import BranchWSGIApp
+from ..apps import favicon_app, robots_app, static_app
+from ..controllers.directory_ui import DirectoryUI
 
-# TODO: Use bzrlib.ui.bool_from_string(), added in bzr 1.18
-_bools = {
-    'yes': True, 'no': False,
-    'on': True, 'off': False,
-    '1': True, '0': False,
-    'true': True, 'false': False,
-    }
 
 class BranchesFromTransportServer(object):
 
@@ -103,10 +97,7 @@
                 return urlparser.make_static(None, path)
 
     def check_serveable(self, config):
-        value = config.get_user_option('http_serve')
-        if value is None:
-            return
-        elif not _bools.get(value.lower(), True):
+        if not config.get_user_option_as_bool('http_serve', default=True):
             raise httpexceptions.HTTPNotFound()
 
     def __call__(self, environ, start_response):

=== modified file 'loggerhead/changecache.py'
--- loggerhead/changecache.py	2012-02-08 01:50:02 +0000
+++ loggerhead/changecache.py	2019-09-18 16:50:15 +0000
@@ -26,7 +26,10 @@
 cached a change, it's good forever.
 """
 
-import cPickle
+try:
+    import cPickle as pickle
+except ImportError: # Python >= 3
+    import pickle
 import marshal
 import os
 import tempfile
@@ -73,10 +76,10 @@
         con.close()
 
     def _serialize(self, obj):
-        return dbapi2.Binary(cPickle.dumps(obj, protocol=2))
+        return dbapi2.Binary(pickle.dumps(obj, protocol=2))
 
     def _unserialize(self, data):
-        return cPickle.loads(str(data))
+        return pickle.loads(str(data))
 
     def get(self, revid):
         self.cursor.execute(
@@ -115,6 +118,10 @@
         self.cursor = self.connection.cursor()
 
     def get(self, key, revid):
+        if not isinstance(key, bytes):
+            raise TypeError(key)
+        if not isinstance(revid, bytes):
+            raise TypeError(revid)
         self.cursor.execute(
             "select revid, data from data where key = ?", (dbapi2.Binary(key),))
         row = self.cursor.fetchone()
@@ -126,13 +133,17 @@
             return marshal.loads(zlib.decompress(row[1]))
 
     def set(self, key, revid, data):
+        if not isinstance(key, bytes):
+            raise TypeError(key)
+        if not isinstance(revid, bytes):
+            raise TypeError(revid)
         try:
             self.cursor.execute(
                 'delete from data where key = ?', (dbapi2.Binary(key), ))
             blob = zlib.compress(marshal.dumps(data))
             self.cursor.execute(
                 "insert into data (key, revid, data) values (?, ?, ?)",
-                map(dbapi2.Binary, [key, revid, blob]))
+                list(map(dbapi2.Binary, [key, revid, blob])))
             self.connection.commit()
         except dbapi2.IntegrityError:
             # If another thread or process attempted to set the same key, we

=== modified file 'loggerhead/config.py'
--- loggerhead/config.py	2011-07-07 19:09:11 +0000
+++ loggerhead/config.py	2019-09-18 16:50:15 +0000
@@ -17,7 +17,7 @@
 import sys
 import tempfile
 
-from bzrlib import config
+from breezy import config
 
 _temporary_sql_dir = None
 
@@ -120,7 +120,7 @@
 
     def get_option(self, option):
         """Get the value for the config option, either
-        from ~/.bazaar/bazaar.conf or from the command line.
+        from ~/.config/breezy/breezy.conf or from the command line.
         All loggerhead-specific settings start with 'http_'
         """
         global_config = config.GlobalConfig().get_user_option('http_'+option)

=== modified file 'loggerhead/controllers/__init__.py'
--- loggerhead/controllers/__init__.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/__init__.py	2019-09-18 16:50:15 +0000
@@ -17,16 +17,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 
-import bzrlib.errors
+import breezy.errors
 import simplejson
 import time
 
+from breezy import osutils
+
 from paste.httpexceptions import HTTPNotFound, HTTPSeeOther
 from paste.request import path_info_pop, parse_querystring
 
-from loggerhead import util
-from loggerhead.templatefunctions import templatefunctions
-from loggerhead.zptsupport import load_template
+from .. import templates
+from .. import util
+from ..templatefunctions import templatefunctions
+from ..zptsupport import load_template
 
 
 class BufferingWriter(object):
@@ -39,7 +42,7 @@
         self.buf_limit = buf_limit
 
     def flush(self):
-        self.writefunc(''.join(self.buf))
+        self.writefunc(b''.join(self.buf))
         self.buf = []
         self.buflen = 0
 
@@ -53,7 +56,7 @@
 
 class TemplatedBranchView(object):
 
-    template_path = None
+    template_name = None
     supports_json = False
 
     def __init__(self, branch, history_callable):
@@ -81,7 +84,10 @@
 
         path = None
         if len(args) > 1:
-            path = unicode('/'.join(args[1:]), 'utf-8')
+            path = '/'.join(args[1:])
+            if isinstance(path, bytes):
+                # Python 2
+                path = path.decode('utf-8')
         self.args = args
         self.kwargs = kwargs
         return path
@@ -109,7 +115,7 @@
             headers['Content-Type'] = 'application/json'
         elif 'Content-Type' not in headers:
             headers['Content-Type'] = 'text/html'
-        writer = start_response("200 OK", headers.items())
+        writer = start_response("200 OK", list(headers.items()))
         if environ.get('REQUEST_METHOD') == 'HEAD':
             # No content for a HEAD request
             return []
@@ -117,10 +123,11 @@
         w = BufferingWriter(writer, 8192)
         if environ.get('loggerhead.as_json'):
             w.write(simplejson.dumps(values,
-                default=util.convert_to_json_ready))
+                default=util.convert_to_json_ready).encode('utf-8'))
         else:
             self.add_template_values(values)
-            template = load_template(self.template_path)
+            template = load_template(
+                    '%s.%s' % (templates.__name__, self.template_name))
             template.expand_into(w, **values)
         w.flush()
         self.log.info(
@@ -135,8 +142,11 @@
         if len(self.args) > 0 and self.args != ['']:
             try:
                 revid = h.fix_revid(self.args[0])
-            except bzrlib.errors.NoSuchRevision:
+            except breezy.errors.NoSuchRevision:
                 raise HTTPNotFound;
+            assert isinstance(revid, bytes)
         else:
             revid = h.last_revid
+        if revid is not None and not isinstance(revid, bytes):
+            raise TypeError(revid)
         return revid

=== modified file 'loggerhead/controllers/annotate_ui.py'
--- loggerhead/controllers/annotate_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/annotate_ui.py	2019-09-18 16:50:15 +0000
@@ -18,17 +18,22 @@
 
 import itertools
 
-from loggerhead.controllers.view_ui import ViewUI
-from loggerhead import util
+from ..controllers.view_ui import ViewUI
+from .. import util
 
 class AnnotateUI(ViewUI):
 
     def annotate_file(self, info):
         file_id = info['file_id']
         revid = info['change'].revid
-        
+        if not isinstance(file_id, bytes):
+            raise TypeError(file_id)
+        if not isinstance(revid, bytes):
+            raise TypeError(revid)
+        path = self._history.get_path(revid, file_id)
+
         tree = self.tree_for(file_id, revid)
-        
+
         change_cache = {}
         last_line_revid = None
         last_lineno = None
@@ -37,7 +42,7 @@
         revisions = {}
 
         lineno = 0
-        for (line_revid, text), lineno in zip(tree.annotate_iter(file_id), itertools.count(1)):
+        for (line_revid, text), lineno in zip(tree.annotate_iter(path, file_id), itertools.count(1)):
             if line_revid != last_line_revid:
                 last_line_revid = line_revid
 
@@ -70,9 +75,9 @@
         revisions[last_lineno].revspan = lineno - last_lineno + 1
 
         return revisions
-            
+
     def get_values(self, path, kwargs, headers):
         values = super(AnnotateUI, self).get_values(path, kwargs, headers)
         values['annotated'] = self.annotate_file(values)
-        
+
         return values

=== modified file 'loggerhead/controllers/atom_ui.py'
--- loggerhead/controllers/atom_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/atom_ui.py	2019-09-18 16:50:15 +0000
@@ -17,12 +17,12 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-from loggerhead.controllers import TemplatedBranchView
+from ..controllers import TemplatedBranchView
 
 
 class AtomUI (TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.atom'
+    template_name = 'atom'
 
     def get_values(self, path, kwargs, headers):
         history = self._history

=== modified file 'loggerhead/controllers/changelog_ui.py'
--- loggerhead/controllers/changelog_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/changelog_ui.py	2019-09-18 16:50:15 +0000
@@ -18,24 +18,26 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-import urllib
-
 import simplejson
 
 from paste.httpexceptions import HTTPServerError
 
-from loggerhead import util
-from loggerhead.controllers import TemplatedBranchView
+from breezy import osutils, urlutils
+
+from .. import util
+from ..controllers import TemplatedBranchView
 
 
 class ChangeLogUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.changelog'
+    template_name = 'changelog'
 
     def get_values(self, path, kwargs, headers):
         history = self._history
         revid = self.get_revid()
         filter_file_id = kwargs.get('filter_file_id', None)
+        if filter_file_id is not None:
+            filter_file_id = urlutils.unquote_to_bytes(osutils.safe_utf8(filter_file_id))
         query = kwargs.get('q', None)
         start_revid = history.fix_revid(kwargs.get('start_revid', None))
         orig_start_revid = start_revid
@@ -67,7 +69,7 @@
             data = {}
             for i, c in enumerate(changes):
                 c.index = i
-                data[str(i)] = urllib.quote(urllib.quote(c.revid, safe=''))
+                data[str(i)] = urlutils.quote(urlutils.quote_from_bytes(c.revid, safe=''))
         except:
             self.log.exception('Exception fetching changes')
             raise HTTPServerError('Could not fetch changes')

=== modified file 'loggerhead/controllers/diff_ui.py'
--- loggerhead/controllers/diff_ui.py	2012-07-31 20:25:42 +0000
+++ loggerhead/controllers/diff_ui.py	2019-09-18 16:50:15 +0000
@@ -16,15 +16,15 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-from cStringIO import StringIO
+from io import BytesIO
 import time
 
 from paste.request import path_info_pop, parse_querystring
 
-from bzrlib.diff import show_diff_trees
-from bzrlib.revision import NULL_REVISION
+from breezy.diff import show_diff_trees
+from breezy.revision import NULL_REVISION
 
-from loggerhead.controllers import TemplatedBranchView
+from ..controllers import TemplatedBranchView
 
 
 class DiffUI(TemplatedBranchView):
@@ -71,7 +71,7 @@
         revtree1 = repo.revision_tree(revid_to)
         revtree2 = repo.revision_tree(revid_from)
 
-        diff_content_stream = StringIO()
+        diff_content_stream = BytesIO()
         show_diff_trees(revtree1, revtree2, diff_content_stream,
                         old_label='', new_label='', context=numlines)
 

=== modified file 'loggerhead/controllers/directory_ui.py'
--- loggerhead/controllers/directory_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/directory_ui.py	2019-09-18 16:50:15 +0000
@@ -20,33 +20,33 @@
 import logging
 import stat
 
-from bzrlib import branch, errors
+from breezy import branch, errors, urlutils
 
-from loggerhead import util
-from loggerhead.controllers import TemplatedBranchView
+from .. import util
+from ..controllers import TemplatedBranchView
 
 
 class DirEntry(object):
 
     def __init__(self, dirname, parity, branch):
-        self.dirname = dirname
+        self.dirname = urlutils.unquote(dirname)
         self.parity = parity
         self.branch = branch
         if branch is not None:
             # If a branch is empty, bzr raises an exception when trying this
             try:
-                self.last_change = datetime.datetime.utcfromtimestamp(
-                    branch.repository.get_revision(
-                        branch.last_revision()).timestamp)
-            except:
-                self.last_change = None
+                self.last_revision = branch.repository.get_revision(branch.last_revision())
+                self.last_change_time = datetime.datetime.utcfromtimestamp(self.last_revision.timestamp)
+            except errors.NoSuchRevision:
+                self.last_revision = None
+                self.last_change_time = None
 
 
 class DirectoryUI(TemplatedBranchView):
     """
     """
 
-    template_path = 'loggerhead.templates.directory'
+    template_name = 'directory'
 
     def __init__(self, static_url_base, transport, name):
 
@@ -72,15 +72,17 @@
         for d in listing:
             try:
                 b = branch.Branch.open_from_transport(self.transport.clone(d))
-                if b.get_config().get_user_option('http_serve') == 'False':
-                    continue
             except:
+                # TODO(jelmer): don't catch all exceptions here
                 try:
                     if not stat.S_ISDIR(self.transport.stat(d).st_mode):
                         continue
                 except errors.NoSuchFile:
                     continue
                 b = None
+            else:
+                if not b.get_config().get_user_option_as_bool('http_serve', default=True):
+                    continue
             dirs.append(DirEntry(d, parity, b))
             parity = 1 - parity
         # Create breadcrumb trail

=== modified file 'loggerhead/controllers/download_ui.py'
--- loggerhead/controllers/download_ui.py	2012-03-22 14:09:52 +0000
+++ loggerhead/controllers/download_ui.py	2019-09-18 16:50:15 +0000
@@ -21,15 +21,15 @@
 import mimetypes
 import urllib
 
-from bzrlib.errors import (
+from breezy.errors import (
     NoSuchId,
     NoSuchRevision,
     )
+from breezy import osutils, urlutils
 from paste import httpexceptions
 from paste.request import path_info_pop
 
-from loggerhead.controllers import TemplatedBranchView
-from loggerhead.exporter import export_archive
+from ..controllers import TemplatedBranchView
 
 log = logging.getLogger("loggerhead.controllers")
 
@@ -38,7 +38,7 @@
 
     def encode_filename(self, filename):
 
-        return urllib.quote(filename.encode('utf-8'))
+        return urlutils.escape(filename)
 
     def get_args(self, environ):
         args = []
@@ -57,7 +57,7 @@
             raise httpexceptions.HTTPMovedPermanently(
                 self._branch.absolute_url('/changes'))
         revid = h.fix_revid(args[0])
-        file_id = args[1]
+        file_id = urlutils.unquote_to_bytes(osutils.safe_utf8(args[1]))
         try:
             path, filename, content = h.get_file(file_id, revid)
         except (NoSuchId, NoSuchRevision):
@@ -102,12 +102,13 @@
         # TODO: Perhaps set the tarball suggested mtime to the revision
         # mtime.
         root = self._branch.friendly_name or 'branch'
-        encoded_filename = self.encode_filename(
-            root + version_part + '.' + archive_format)
+        filename = root + version_part + '.' + archive_format
+        encoded_filename = self.encode_filename(filename)
         headers = [
             ('Content-Type', 'application/octet-stream'),
             ('Content-Disposition',
                 "attachment; filename*=utf-8''%s" % (encoded_filename,)),
             ]
         start_response('200 OK', headers)
-        return export_archive(history, root, revid, archive_format)
+        tree = history._branch.repository.revision_tree(revid)
+        return tree.archive(root=root, format=archive_format, name=filename)

=== modified file 'loggerhead/controllers/error_ui.py'
--- loggerhead/controllers/error_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/error_ui.py	2019-09-18 16:50:15 +0000
@@ -16,16 +16,16 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-from StringIO import StringIO
+from io import StringIO
 import traceback
 
-from loggerhead.controllers import TemplatedBranchView
-from loggerhead import util
+from ..controllers import TemplatedBranchView
+from .. import util
 
 
 class ErrorUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.error'
+    template_name = 'error'
 
     def __init__(self, branch, exc_info):
         super(ErrorUI, self).__init__(branch, lambda: None)

=== modified file 'loggerhead/controllers/filediff_ui.py'
--- loggerhead/controllers/filediff_ui.py	2015-03-19 14:48:47 +0000
+++ loggerhead/controllers/filediff_ui.py	2019-09-18 16:50:15 +0000
@@ -1,47 +1,52 @@
-from StringIO import StringIO
-import urllib
-
-from bzrlib import diff
-from bzrlib import errors
-from bzrlib import osutils
-
-from loggerhead import util
-from loggerhead.controllers import TemplatedBranchView
+from io import BytesIO
+
+from breezy import (
+    diff,
+    errors,
+    osutils,
+    urlutils,
+    )
+
+from .. import util
+from ..controllers import TemplatedBranchView
+
 
 def _process_diff(difftext):
     chunks = []
     chunk = None
+    def decode_line(line):
+        return line.decode('utf-8', 'replace')
     for line in difftext.splitlines():
         if len(line) == 0:
             continue
-        if line.startswith('+++ ') or line.startswith('--- '):
+        if line.startswith(b'+++ ') or line.startswith(b'--- '):
             continue
-        if line.startswith('@@ '):
+        if line.startswith(b'@@ '):
             # new chunk
             if chunk is not None:
                 chunks.append(chunk)
             chunk = util.Container()
             chunk.diff = []
-            split_lines = line.split(' ')[1:3]
-            lines = [int(x.split(',')[0][1:]) for x in split_lines]
+            split_lines = line.split(b' ')[1:3]
+            lines = [int(x.split(b',')[0][1:]) for x in split_lines]
             old_lineno = lines[0]
             new_lineno = lines[1]
-        elif line.startswith(' '):
+        elif line.startswith(b' '):
             chunk.diff.append(util.Container(old_lineno=old_lineno,
                                              new_lineno=new_lineno,
                                              type='context',
-                                             line=line[1:]))
+                                             line=decode_line(line[1:])))
             old_lineno += 1
             new_lineno += 1
-        elif line.startswith('+'):
+        elif line.startswith(b'+'):
             chunk.diff.append(util.Container(old_lineno=None,
                                              new_lineno=new_lineno,
-                                             type='insert', line=line[1:]))
+                                             type='insert', line=decode_line(line[1:])))
             new_lineno += 1
-        elif line.startswith('-'):
+        elif line.startswith(b'-'):
             chunk.diff.append(util.Container(old_lineno=old_lineno,
                                              new_lineno=None,
-                                             type='delete', line=line[1:]))
+                                             type='delete', line=decode_line(line[1:])))
             old_lineno += 1
         else:
             chunk.diff.append(util.Container(old_lineno=None,
@@ -60,17 +65,17 @@
     lines = {}
     args = []
     for r in (compare_revid, revid):
-        if r == 'null:':
+        if r == b'null:':
             lines[r] = []
         else:
             args.append((file_id, r, r))
     for r, bytes_iter in repository.iter_files_bytes(args):
-        lines[r] = osutils.split_lines(''.join(bytes_iter))
-    buffer = StringIO()
+        lines[r] = osutils.split_lines(b''.join(bytes_iter))
+    buffer = BytesIO()
     try:
         diff.internal_diff('', lines[compare_revid], '', lines[revid], buffer, context_lines=context_lines)
     except errors.BinaryFile:
-        difftext = ''
+        difftext = b''
     else:
         difftext = buffer.getvalue()
 
@@ -79,13 +84,13 @@
 
 class FileDiffUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.filediff'
+    template_name = 'filediff'
     supports_json = True
 
     def get_values(self, path, kwargs, headers):
-        revid = urllib.unquote(self.args[0])
-        compare_revid = urllib.unquote(self.args[1])
-        file_id = urllib.unquote(self.args[2])
+        revid = urlutils.unquote_to_bytes(self.args[0])
+        compare_revid = urlutils.unquote_to_bytes(self.args[1])
+        file_id = urlutils.unquote_to_bytes(self.args[2])
 
         try:
             context_lines = int(kwargs['context'])

=== modified file 'loggerhead/controllers/inventory_ui.py'
--- loggerhead/controllers/inventory_ui.py	2013-03-27 05:29:14 +0000
+++ loggerhead/controllers/inventory_ui.py	2019-09-18 16:50:15 +0000
@@ -24,60 +24,68 @@
 
 from paste.httpexceptions import HTTPNotFound, HTTPMovedPermanently
 
-from bzrlib import errors
-from bzrlib.revision import is_null as is_null_rev
+from breezy import (
+    errors,
+    osutils,
+    urlutils,
+    )
+from breezy.revision import is_null as is_null_rev
 
-from loggerhead import util
-from loggerhead.controllers import TemplatedBranchView
+from .. import util
+from ..controllers import TemplatedBranchView
 
 
 
 def dirname(path):
     if path is not None:
         path = path.rstrip('/')
-        path = urllib.quote(posixpath.dirname(path).encode('utf-8'))
+        path = urlutils.escape(posixpath.dirname(path))
     return path
 
 
 class InventoryUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.inventory'
+    template_name = 'inventory'
     supports_json = True
 
-    def get_filelist(self, inv, path, sort_type, revno_url):
+    def get_filelist(self, tree, path, sort_type, revno_url):
         """
         return the list of all files (and their attributes) within a given
         path subtree.
 
-        @param inv: The inventory.
-        @param path: The path of a directory within the inventory.
+        @param tree: The tree
+        @param path: The path of a directory within the tree.
         @param sort_type: How to sort the results... XXX.
         """
-        file_id = inv.path2id(path)
-        dir_ie = inv[file_id]
         file_list = []
 
-        if dir_ie.kind != 'directory':
+        if tree.kind(path) != 'directory':
             raise HTTPMovedPermanently(self._branch.context_url(['/view', revno_url, path]))
 
         revid_set = set()
 
-        for filename, entry in dir_ie.children.iteritems():
-            revid_set.add(entry.revision)
+        child_entries = []
+
+        for entry in tree.iter_child_entries(path):
+            child_path = osutils.pathjoin(path, entry.name)
+            child_revision = tree.get_file_revision(child_path)
+            revid_set.add(child_revision)
+            child_entries.append((child_path, entry, child_revision))
 
         change_dict = {}
         for change in self._history.get_changes(list(revid_set)):
             change_dict[change.revid] = change
 
-        for filename, entry in dir_ie.children.iteritems():
-            pathname = filename
+        for child_path, entry, child_revision in child_entries:
+            pathname = entry.name
+            contents_changed_rev = None
             if entry.kind == 'directory':
                 pathname += '/'
-            if path == '':
-                absolutepath = pathname
+                size = None
             else:
-                absolutepath = path + '/' + pathname
-            revid = entry.revision
+                size = entry.text_size
+
+            file_timestamp = change_dict[child_revision].timestamp
 
             # TODO: For the JSON rendering, this inlines the "change" aka
             # revision information attached to each file. Consider either
@@ -85,21 +93,26 @@
             # including the revision id and having a separate request to get
             # back the revision info.
             file = util.Container(
-                filename=filename, executable=entry.executable,
-                kind=entry.kind, absolutepath=absolutepath,
-                file_id=entry.file_id, size=entry.text_size, revid=revid,
-                change=change_dict[revid])
+                filename=entry.name, executable=entry.executable,
+                kind=entry.kind, absolutepath=child_path,
+                file_id=entry.file_id, size=size, revid=child_revision,
+                change=change_dict[child_revision], contents_changed_rev=contents_changed_rev)
             file_list.append(file)
 
         if sort_type == 'filename':
             file_list.sort(key=lambda x: x.filename.lower()) # case-insensitive
         elif sort_type == 'size':
-            file_list.sort(key=lambda x: x.size)
+            def size_key(x):
+                if x.size is None:
+                    return -1
+                return x.size
+            file_list.sort(key=size_key)
         elif sort_type == 'date':
-            file_list.sort(key=lambda x: x.change.date)
+            file_list.sort(key=lambda x: x.change.date, reverse=True)
 
-        # Always sort directories first.
-        file_list.sort(key=lambda x: x.kind != 'directory')
+        if sort_type != 'date':
+        # Don't always sort directories first.
+            file_list.sort(key=lambda x: x.kind != 'directory')
 
         return file_list
 
@@ -137,14 +150,14 @@
             updir = dirname(path)
 
         if not is_null_rev(revid):
-            change = history.get_changes([ revid ])[0]
+            change = history.get_changes([revid])[0]
             # If we're looking at the tip, use head: in the URL instead
             if revid == branch.last_revision():
                 revno_url = 'head:'
             else:
                 revno_url = history.get_revno(revid)
             history.add_branch_nicks(change)
-            filelist = self.get_filelist(rev_tree.inventory, path, sort_type, revno_url)
+            filelist = self.get_filelist(rev_tree, path, sort_type, revno_url)
 
         else:
             start_revid = None

=== modified file 'loggerhead/controllers/revision_ui.py'
--- loggerhead/controllers/revision_ui.py	2015-03-19 14:48:47 +0000
+++ loggerhead/controllers/revision_ui.py	2019-09-18 16:50:15 +0000
@@ -18,24 +18,25 @@
 #
 
 import simplejson
-import urllib
 
 from paste.httpexceptions import HTTPServerError
 
-from loggerhead import util
-from loggerhead.controllers import TemplatedBranchView
-from loggerhead.controllers.filediff_ui import diff_chunks_for_file
+from breezy import urlutils
+
+from .. import util
+from ..controllers import TemplatedBranchView
+from ..controllers.filediff_ui import diff_chunks_for_file
 
 
 DEFAULT_LINE_COUNT_LIMIT = 3000
 
 def dq(p):
-    return urllib.quote(urllib.quote(p, safe=''))
+    return urlutils.quote(urlutils.quote(p, safe=''))
 
 
 class RevisionUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.revision'
+    template_name = 'revision'
     supports_json = True
 
     def get_values(self, path, kwargs, headers):
@@ -88,7 +89,7 @@
             merged_in = None
 
         return {
-            'revid': revid,
+            'revid': revid.decode('utf-8'),
             'change': change,
             'file_changes': file_changes,
             'merged_in': merged_in,

=== modified file 'loggerhead/controllers/revlog_ui.py'
--- loggerhead/controllers/revlog_ui.py	2011-06-27 15:05:06 +0000
+++ loggerhead/controllers/revlog_ui.py	2019-09-18 16:50:15 +0000
@@ -1,17 +1,19 @@
 import urllib
 
-from loggerhead.controllers import TemplatedBranchView
+from breezy import osutils, urlutils
+
+from ..controllers import TemplatedBranchView
 
 
 class RevLogUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.revlog'
+    template_name = 'revlog'
     supports_json = True
 
     def get_values(self, path, kwargs, headers):
         history = self._history
 
-        revid = urllib.unquote(self.args[0])
+        revid = urlutils.unquote_to_bytes(osutils.safe_utf8(self.args[0]))
 
         change = history.get_changes([revid])[0]
         file_changes = history.get_file_changes(change)

=== modified file 'loggerhead/controllers/search_ui.py'
--- loggerhead/controllers/search_ui.py	2012-02-08 01:50:02 +0000
+++ loggerhead/controllers/search_ui.py	2019-09-18 16:50:15 +0000
@@ -16,8 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-from loggerhead.controllers import TemplatedBranchView
-from loggerhead import search
+from ..controllers import TemplatedBranchView
+from .. import search
 
 
 class SearchUI(TemplatedBranchView):
@@ -26,7 +26,7 @@
     Class to output progressive search result terms.
     """
 
-    template_path = 'loggerhead.templates.search'
+    template_name = 'search'
 
     def get_values(self, path, kwargs, response):
         """

=== modified file 'loggerhead/controllers/view_ui.py'
--- loggerhead/controllers/view_ui.py	2012-03-22 14:09:52 +0000
+++ loggerhead/controllers/view_ui.py	2019-09-18 16:50:15 +0000
@@ -19,13 +19,16 @@
 
 import os
 
-from bzrlib.errors import (
+from breezy.errors import (
     BinaryFile,
     NoSuchId,
     NoSuchRevision,
     )
-import bzrlib.textfile
-import bzrlib.osutils
+from breezy import (
+    osutils,
+    urlutils,
+    )
+import breezy.textfile
 
 from paste.httpexceptions import (
     HTTPBadRequest,
@@ -34,38 +37,47 @@
     HTTPServerError,
     )
 
-from loggerhead.controllers import TemplatedBranchView
+from ..controllers import TemplatedBranchView
 try:
-    from loggerhead.highlight import highlight
+    from ..highlight import highlight
 except ImportError:
     highlight = None
-from loggerhead import util
+from .. import util
 
 
 class ViewUI(TemplatedBranchView):
 
-    template_path = 'loggerhead.templates.view'
-    
+    template_name = 'view'
+
     def tree_for(self, file_id, revid):
-        file_revid = self._history.get_inventory(revid)[file_id].revision
+        if not isinstance(file_id, bytes):
+            raise TypeError(file_id)
+        if not isinstance(revid, bytes):
+            raise TypeError(revid)
+        rev_tree = self._history.revision_tree(revid)
+        file_revid = rev_tree.get_file_revision(rev_tree.id2path(file_id))
         return self._history._branch.repository.revision_tree(file_revid)
 
     def text_lines(self, file_id, revid):
-        file_name = os.path.basename(self._history.get_path(revid, file_id))
-        
+        path = self._history.get_path(revid, file_id)
+        file_name = os.path.basename(path)
+
         tree = self.tree_for(file_id, revid)
-        file_text = tree.get_file_text(file_id)
+        file_text = tree.get_file_text(path)
+
         encoding = 'utf-8'
         try:
-            file_text = file_text.decode(encoding)
+            file_text.decode(encoding)
         except UnicodeDecodeError:
             encoding = 'iso-8859-15'
-            file_text = file_text.decode(encoding)
-
-        file_lines = bzrlib.osutils.split_lines(file_text)
-        # This can throw bzrlib.errors.BinaryFile (which our caller catches).
-        bzrlib.textfile.check_text_lines(file_lines)
-        
+            file_text.decode(encoding)
+
+        file_lines = osutils.split_lines(file_text)
+        # This can throw breezy.errors.BinaryFile (which our caller catches).
+        breezy.textfile.check_text_lines(file_lines)
+
+        file_text = file_text.decode(encoding)
+
         if highlight is not None:
             hl_lines = highlight(file_name, file_text, encoding)
             # highlight strips off extra newlines at the end of the file.
@@ -73,8 +85,8 @@
             hl_lines.extend([u''] * extra_lines)
         else:
             hl_lines = map(util.html_escape, file_lines)
-        
-        return hl_lines;
+
+        return hl_lines
 
     def file_contents(self, file_id, revid):
         try:
@@ -89,8 +101,9 @@
         history = self._history
         branch = history._branch
         revid = self.get_revid()
-        revid = history.fix_revid(revid)
         file_id = kwargs.get('file_id', None)
+        if file_id is not None:
+            file_id = urlutils.unquote_to_bytes(osutils.safe_utf8(file_id))
         if (file_id is None) and (path is None):
             raise HTTPBadRequest('No file_id or filename '
                                  'provided to view')
@@ -119,20 +132,15 @@
                 self._branch.is_root,
                 'files'))
 
+        tree = history.revision_tree(revid)
+
         # Create breadcrumb trail for the path within the branch
-        try:
-            inv = history.get_inventory(revid)
-        except:
-            self.log.exception('Exception fetching changes')
-            raise HTTPServerError('Could not fetch changes')
-        branch_breadcrumbs = util.branch_breadcrumbs(path, inv, 'files')
+        branch_breadcrumbs = util.branch_breadcrumbs(path, tree, 'files')
 
-        try:
-            file = inv[file_id]
-        except NoSuchId:
+        if not tree.has_id(file_id):
             raise HTTPNotFound()
 
-        if file.kind == "directory":
+        if tree.kind(path) == "directory":
             raise HTTPMovedPermanently(self._branch.context_url(['/files', revno_url, path]))
 
         # no navbar for revisions

=== modified file 'loggerhead/daemon.py'
--- loggerhead/daemon.py	2009-05-13 14:03:48 +0000
+++ loggerhead/daemon.py	2019-09-18 16:50:15 +0000
@@ -16,7 +16,7 @@
 
     try:
         pid = os.fork()
-    except OSError, e:
+    except OSError as e:
         raise Exception("%s [%d]" % (e.strerror, e.errno))
 
     if pid == 0:      # The first child.
@@ -24,7 +24,7 @@
 
         try:
             pid = os.fork()     # Fork a second child.
-        except OSError, e:
+        except OSError as e:
             raise Exception("%s [%d]" % (e.strerror, e.errno))
 
         if pid == 0:  # The second child.

=== removed file 'loggerhead/exporter.py'
--- loggerhead/exporter.py	2011-11-24 07:46:41 +0000
+++ loggerhead/exporter.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# Copyright (C) 2011 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-"""Exports an archive from a bazaar branch"""
-
-from bzrlib.export import get_export_generator
-
-
-class ExporterFileObject(object):
-    """Shim that accumulates temporarily written out data.
-
-    There are python tarfile classes that want to write to a file like object.
-    We want to stream data.  But wsgi assumes it can pull data from the
-    handler, rather than having bytes pushed.
-
-    So this class holds the data temporarily, until it is pulled.  It 
-    should never buffer everything because as soon as a chunk is produced, 
-    wsgi will be given the chance to take it.
-    """
-
-    def __init__(self):
-        self._buffer = []
-
-    def write(self, s):
-        self._buffer.append(s)
-
-    def get_buffer(self):
-        try:
-            return ''.join(self._buffer)
-        finally:
-            self._buffer = []
-
-    def close(self):
-        pass
-
-
-def export_archive(history, root, revid, archive_format):
-    """Export tree contents to an archive
-
-    :param history: Instance of history to export
-    :param root: Root location inside the archive.
-    :param revid: Revision to export
-    :param archive_format: Format of the archive, eg 'tar.gz'.
-    """
-    fileobj = ExporterFileObject()
-    tree = history._branch.repository.revision_tree(revid)
-    for _ in get_export_generator(tree=tree, root=root, fileobj=fileobj,
-        format=archive_format):
-        yield fileobj.get_buffer()
-    # Might have additonal contents written
-    yield fileobj.get_buffer()

=== modified file 'loggerhead/highlight.py'
--- loggerhead/highlight.py	2012-02-08 01:50:02 +0000
+++ loggerhead/highlight.py	2019-09-18 16:50:15 +0000
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
-import bzrlib.osutils
+import breezy.osutils
 import cgi
 
 from pygments import highlight as _highlight_func
@@ -37,7 +37,7 @@
     """
 
     if len(text) > MAX_HIGHLIGHT_SIZE:
-        return map(cgi.escape,  bzrlib.osutils.split_lines(text))
+        return map(cgi.escape,  breezy.osutils.split_lines(text))
 
     formatter = HtmlFormatter(style=style, nowrap=True, classprefix='pyg-')
 
@@ -50,6 +50,6 @@
             lexer = TextLexer(encoding=encoding)
 
     hl_lines = _highlight_func(text, lexer, formatter)
-    hl_lines = bzrlib.osutils.split_lines(hl_lines)
+    hl_lines = breezy.osutils.split_lines(hl_lines)
 
     return hl_lines

=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2016-03-30 06:18:39 +0000
+++ loggerhead/history.py	2019-09-18 16:50:15 +0000
@@ -35,23 +35,28 @@
 import threading
 import tarfile
 
-from bzrlib import tag
-import bzrlib.branch
-import bzrlib.delta
-import bzrlib.errors
-import bzrlib.foreign
-import bzrlib.revision
+from breezy import tag
+import breezy.branch
+import breezy.delta
+import breezy.errors
+import breezy.foreign
+import breezy.osutils
+import breezy.revision
+from breezy.sixish import (
+    text_type,
+    viewvalues,
+    )
 
-from loggerhead import search
-from loggerhead import util
-from loggerhead.wholehistory import compute_whole_history_data
+from . import search
+from . import util
+from .wholehistory import compute_whole_history_data
 
 
 def is_branch(folder):
     try:
-        bzrlib.branch.Branch.open(folder)
+        breezy.branch.Branch.open(folder)
         return True
-    except:
+    except breezy.errors.NotBranchError:
         return False
 
 
@@ -108,20 +113,22 @@
 
 class FileChangeReporter(object):
 
-    def __init__(self, old_inv, new_inv):
+    def __init__(self, old_tree, new_tree):
         self.added = []
         self.modified = []
         self.renamed = []
         self.removed = []
         self.text_changes = []
-        self.old_inv = old_inv
-        self.new_inv = new_inv
+        self.old_tree = old_tree
+        self.new_tree = new_tree
 
-    def revid(self, inv, file_id):
+    def revid(self, tree, file_id):
         try:
-            return inv[file_id].revision
-        except bzrlib.errors.NoSuchId:
-            return 'null:'
+            path = tree.id2path(file_id)
+        except breezy.errors.NoSuchId:
+            return b'null:'
+        else:
+            return tree.get_file_revision(path)
 
     def report(self, file_id, paths, versioned, renamed, modified,
                exe_change, kind):
@@ -132,8 +139,8 @@
                 filename = rich_filename(paths[1], kind[1])
             self.text_changes.append(util.Container(
                 filename=filename, file_id=file_id,
-                old_revision=self.revid(self.old_inv, file_id),
-                new_revision=self.revid(self.new_inv, file_id)))
+                old_revision=self.revid(self.old_tree, file_id),
+                new_revision=self.revid(self.new_tree, file_id)))
         if versioned == 'added':
             self.added.append(util.Container(
                 filename=rich_filename(paths[1], kind), kind=kind[1]))
@@ -299,7 +306,7 @@
 
     @property
     def has_revisions(self):
-        return not bzrlib.revision.is_null(self.last_revid)
+        return not breezy.revision.is_null(self.last_revid)
 
     def get_config(self):
         return self._branch.get_config()
@@ -320,7 +327,7 @@
         if revid_list is None:
             # Just yield the mainline, starting at start_revid
             revid = start_revid
-            is_null = bzrlib.revision.is_null
+            is_null = breezy.revision.is_null
             while not is_null(revid):
                 yield revid
                 parents = self._rev_info[self._rev_indices[revid]][2]
@@ -341,7 +348,7 @@
                 i += 1
             return r
         while revid_set:
-            if bzrlib.revision.is_null(revid):
+            if breezy.revision.is_null(revid):
                 return
             rev_introduced = introduced_revisions(revid)
             matching = rev_introduced.intersection(revid_set)
@@ -360,11 +367,11 @@
         possible_keys = [(file_id, revid) for revid in self._rev_indices]
         get_parent_map = self._branch.repository.texts.get_parent_map
         # We chunk the requests as this works better with GraphIndex.
-        # See _filter_revisions_touching_file_id in bzrlib/log.py
+        # See _filter_revisions_touching_file_id in breezy/log.py
         # for more information.
         revids = []
         chunk_size = 1000
-        for start in xrange(0, len(possible_keys), chunk_size):
+        for start in range(0, len(possible_keys), chunk_size):
             next_keys = possible_keys[start:start + chunk_size]
             revids += [k[1] for k in get_parent_map(next_keys)]
         del possible_keys, next_keys
@@ -405,8 +412,6 @@
         # ignore the passed-in revid_list
         revid = self.fix_revid(query)
         if revid is not None:
-            if isinstance(revid, unicode):
-                revid = revid.encode('utf-8')
             changes = self.get_changes([revid])
             if (changes is not None) and (len(changes) > 0):
                 return [revid]
@@ -448,13 +453,17 @@
         # if a "revid" is actually a dotted revno, convert it to a revid
         if revid is None:
             return revid
+        if not isinstance(revid, (str, text_type)):
+            raise TypeError(revid)
         if revid == 'head:':
             return self.last_revid
         try:
             if self.revno_re.match(revid):
                 revid = self._revno_revid[revid]
         except KeyError:
-            raise bzrlib.errors.NoSuchRevision(self._branch_nick, revid)
+            raise breezy.errors.NoSuchRevision(self._branch_nick, revid)
+        if not isinstance(revid, bytes):
+            revid = revid.encode('utf-8')
         return revid
 
     def get_file_view(self, revid, file_id):
@@ -564,16 +573,13 @@
             # search index.
             return None, None, []
 
-    def get_inventory(self, revid):
-        if revid not in self._inventory_cache:
-            self._inventory_cache[revid] = (
-                self._branch.repository.get_inventory(revid))
-        return self._inventory_cache[revid]
+    def revision_tree(self, revid):
+        return self._branch.repository.revision_tree(revid)
 
     def get_path(self, revid, file_id):
         if (file_id is None) or (file_id == ''):
             return ''
-        path = self.get_inventory(revid).id2path(file_id)
+        path = self.revision_tree(revid).id2path(file_id)
         if (len(path) > 0) and not path.startswith('/'):
             path = '/' + path
         return path
@@ -581,7 +587,7 @@
     def get_file_id(self, revid, path):
         if (len(path) > 0) and not path.startswith('/'):
             path = '/' + path
-        return self.get_inventory(revid).path2id(path)
+        return self.revision_tree(revid).path2id(path)
 
     def get_merge_point_list(self, revid):
         """
@@ -618,7 +624,7 @@
             else:
                 d[revnos] = (revnolast, revid)
 
-        return [revid for (_, revid) in d.itervalues()]
+        return [revid for (_, revid) in viewvalues(d)]
 
     def add_branch_nicks(self, change):
         """
@@ -631,7 +637,7 @@
         for p in change.merge_points:
             fetch_set.add(p.revid)
         p_changes = self.get_changes(list(fetch_set))
-        p_change_dict = dict([(c.revid, c) for c in p_changes])
+        p_change_dict = {c.revid: c for c in p_changes}
         for p in change.parents:
             if p.revid in p_change_dict:
                 p.branch_nick = p_change_dict[p.revid].branch_nick
@@ -648,6 +654,9 @@
 
         Revisions not present and NULL_REVISION will be ignored.
         """
+        for revid in revid_list:
+            if not isinstance(revid, bytes):
+                raise TypeError(revid_list)
         changes = self.get_changes_uncached(revid_list)
         if len(changes) == 0:
             return changes
@@ -674,8 +683,8 @@
 
     def get_changes_uncached(self, revid_list):
         # FIXME: deprecated method in getting a null revision
-        revid_list = filter(lambda revid: not bzrlib.revision.is_null(revid),
-                            revid_list)
+        revid_list = list(filter(lambda revid: not breezy.revision.is_null(revid),
+                            revid_list))
         parent_map = self._branch.repository.get_graph().get_parent_map(
                          revid_list)
         # We need to return the answer in the same order as the input,
@@ -688,7 +697,7 @@
 
     def _change_from_revision(self, revision):
         """
-        Given a bzrlib Revision, return a processed "change" for use in
+        Given a breezy Revision, return a processed "change" for use in
         templates.
         """
         message, short_message = clean_message(revision.message)
@@ -712,6 +721,7 @@
             'revid': revision.revision_id,
             'date': datetime.datetime.fromtimestamp(revision.timestamp),
             'utc_date': datetime.datetime.utcfromtimestamp(revision.timestamp),
+            'timestamp': revision.timestamp,
             'committer': revision.committer,
             'authors': revision.get_apparent_authors(),
             'branch_nick': revision.properties.get('branch-nick', None),
@@ -722,15 +732,15 @@
             'bugs': [bug.split()[0] for bug in revision.properties.get('bugs', '').splitlines()],
             'tags': revtags,
         }
-        if isinstance(revision, bzrlib.foreign.ForeignRevision):
+        if isinstance(revision, breezy.foreign.ForeignRevision):
             foreign_revid, mapping = (
                 revision.foreign_revid, revision.mapping)
-        elif ":" in revision.revision_id:
+        elif b":" in revision.revision_id:
             try:
                 foreign_revid, mapping = \
-                    bzrlib.foreign.foreign_vcs_registry.parse_revision_id(
+                    breezy.foreign.foreign_vcs_registry.parse_revision_id(
                         revision.revision_id)
-            except bzrlib.errors.InvalidRevisionId:
+            except breezy.errors.InvalidRevisionId:
                 foreign_revid = None
                 mapping = None
         else:
@@ -744,7 +754,7 @@
         if entry.parents:
             old_revid = entry.parents[0].revid
         else:
-            old_revid = bzrlib.revision.NULL_REVISION
+            old_revid = breezy.revision.NULL_REVISION
         return self.file_changes_for_revision_ids(old_revid, entry.revid)
 
     def add_changes(self, entry):
@@ -753,13 +763,17 @@
 
     def get_file(self, file_id, revid):
         """Returns (path, filename, file contents)"""
-        inv = self.get_inventory(revid)
-        inv_entry = inv[file_id]
-        rev_tree = self._branch.repository.revision_tree(inv_entry.revision)
-        path = inv.id2path(file_id)
-        if not path.startswith('/'):
+        if not isinstance(file_id, bytes):
+            raise TypeError(file_id)
+        if not isinstance(revid, bytes):
+            raise TypeError(revid)
+        rev_tree = self._branch.repository.revision_tree(revid)
+        path = rev_tree.id2path(file_id)
+        display_path = path
+        if not display_path.startswith('/'):
             path = '/' + path
-        return path, inv_entry.name, rev_tree.get_file_text(file_id)
+        return (display_path, breezy.osutils.basename(path),
+                rev_tree.get_file_text(path))
 
     def file_changes_for_revision_ids(self, old_revid, new_revid):
         """
@@ -775,17 +789,17 @@
             text_changes: list((filename, file_id)),
         """
         repo = self._branch.repository
-        if (bzrlib.revision.is_null(old_revid) or
-            bzrlib.revision.is_null(new_revid) or
-            old_revid == new_revid):
+        if (breezy.revision.is_null(old_revid) or
+                breezy.revision.is_null(new_revid) or
+                old_revid == new_revid):
             old_tree, new_tree = map(
                 repo.revision_tree, [old_revid, new_revid])
         else:
             old_tree, new_tree = repo.revision_trees([old_revid, new_revid])
 
-        reporter = FileChangeReporter(old_tree.inventory, new_tree.inventory)
+        reporter = FileChangeReporter(old_tree, new_tree)
 
-        bzrlib.delta.report_changes(new_tree.iter_changes(old_tree), reporter)
+        breezy.delta.report_changes(new_tree.iter_changes(old_tree), reporter)
 
         return util.Container(
             added=sorted(reporter.added, key=lambda x: x.filename),

=== modified file 'loggerhead/load_test.py'
--- loggerhead/load_test.py	2012-02-08 01:50:02 +0000
+++ loggerhead/load_test.py	2019-09-18 16:50:15 +0000
@@ -65,17 +65,21 @@
 
 import threading
 import time
-import Queue
+try:
+    from queue import Queue, Empty
+except ImportError:  # Python < 3
+    from Queue import Queue, Empty
 
 import simplejson
 
-from bzrlib import (
+from breezy import (
     errors,
     transport,
     urlutils,
     )
+from breezy.sixish import viewvalues
 
-# This code will be doing multi-threaded requests against bzrlib.transport
+# This code will be doing multi-threaded requests against breezy.transport
 # code. We want to make sure to load everything ahead of time, so we don't get
 # lazy-import failures
 _ = transport.get_transport('http://example.com')
@@ -96,7 +100,7 @@
 
     def __init__(self, identifier, blocking_time=1.0, _queue_size=1):
         self.identifier = identifier
-        self.queue = Queue.Queue(_queue_size)
+        self.queue = Queue(_queue_size)
         self.start_time = self.end_time = None
         self.stats = []
         self.blocking_time = blocking_time
@@ -118,7 +122,7 @@
         while not stop_event.isSet():
             try:
                 self.step_next()
-            except Queue.Empty:
+            except Empty:
                 pass
 
     def process(self, url):
@@ -189,7 +193,7 @@
 
     def finish_queues(self):
         """Wait for all queues of all children to finish."""
-        for h, t in self._threads.itervalues():
+        for h, t in viewvalues(self._threads):
             h.queue.join()
 
     def stop_and_join(self):
@@ -198,7 +202,7 @@
         This will stop even if workers still have work items.
         """
         self.stop_event.set()
-        for h, t in self._threads.itervalues():
+        for h, t in viewvalues(self._threads):
             # Signal the queue that it should stop blocking, we don't have to
             # wait for the queue to empty, because we may see stop_event before
             # we see the <noop>

=== modified file 'loggerhead/lsprof.py'
--- loggerhead/lsprof.py	2009-07-07 23:52:24 +0000
+++ loggerhead/lsprof.py	2019-09-18 16:50:15 +0000
@@ -6,7 +6,10 @@
 # instead of just the Stats object
 
 import sys
-import thread
+try:
+    from threading import get_ident
+except ImportError: # python < 3
+    from thread import get_ident
 import threading
 from _lsprof import Profiler, profiler_entry
 
@@ -19,7 +22,7 @@
     # we lose the first profile point for a new thread in order to trampoline
     # a new Profile object into place
     global _g_threadmap
-    thr = thread.get_ident()
+    thr = get_ident()
     _g_threadmap[thr] = p = Profiler()
     # this overrides our sys.setprofile hook:
     p.enable(subcalls=True, builtins=True)

=== modified file 'loggerhead/main.py'
--- loggerhead/main.py	2012-02-08 01:50:02 +0000
+++ loggerhead/main.py	2019-09-18 16:50:15 +0000
@@ -21,25 +21,26 @@
 import os
 import sys
 
-from bzrlib.plugin import load_plugins
+from breezy.plugin import load_plugins
+from breezy.transport import location_to_url
 
 from paste import httpserver
 from paste.httpexceptions import HTTPExceptionHandler, HTTPInternalServerError
 from paste.translogger import TransLogger
 
-from loggerhead import __version__
-from loggerhead.apps.transport import (
+from . import __version__
+from .apps.transport import (
     BranchesFromTransportRoot, UserBranchesFromTransportRoot)
-from loggerhead.config import LoggerheadConfig
-from loggerhead.util import Reloader
-from loggerhead.apps.error import ErrorHandlerApp
-
-
-def get_config_and_path(args):
+from .config import LoggerheadConfig
+from .util import Reloader
+from .apps.error import ErrorHandlerApp
+
+
+def get_config_and_base(args):
     config = LoggerheadConfig(args)
 
     if config.get_option('show_version'):
-        print "loggerhead %s" % (__version__,)
+        print("loggerhead %s" % (__version__,))
         sys.exit(0)
 
     if config.arg_count > 1:
@@ -50,6 +51,8 @@
     else:
         base = '.'
 
+    base = location_to_url(base)
+
     if not config.get_option('allow_writes'):
         base = 'readonly+' + base
 
@@ -70,9 +73,9 @@
     else:
         if config.get_option('log_folder'):
             logfile_path = os.path.join(
-                config.get_option('log_folder'), 'serve-branches.log')
+                config.get_option('log_folder'), 'loggerhead-serve.log')
         else:
-            logfile_path = 'serve-branches.log'
+            logfile_path = 'loggerhead-serve.log'
         handler = logging.FileHandler(logfile_path, 'a')
         formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(name)s:'
                                       ' %(message)s')
@@ -92,9 +95,9 @@
     return logger
 
 
-def make_app_for_config_and_path(config, base):
+def make_app_for_config_and_base(config, base):
     if config.get_option('trunk_dir') and not config.get_option('user_dirs'):
-        print "--trunk-dir is only valid with --user-dirs"
+        print("--trunk-dir is only valid with --user-dirs")
         sys.exit(1)
 
     if config.get_option('reload'):
@@ -105,7 +108,7 @@
 
     if config.get_option('user_dirs'):
         if not config.get_option('trunk_dir'):
-            print "You didn't specify a directory for the trunk directories."
+            print("You didn't specify a directory for the trunk directories.")
             sys.exit(1)
         app = UserBranchesFromTransportRoot(base, config)
     else:
@@ -141,6 +144,9 @@
                     raise exc
                 return app(environ, start_response)
             return wrapped
+        logging.warning(
+                'PasteDeploy not available; unable to support '
+                'access through a reverse proxy.')
         app = check_not_proxied(app)
     else:
         app = PrefixMiddleware(app, prefix=prefix)
@@ -155,9 +161,9 @@
 def main(args):
     load_plugins()
 
-    config, path = get_config_and_path(args)
+    config, base = get_config_and_base(args)
 
-    app = make_app_for_config_and_path(config, path)
+    app = make_app_for_config_and_base(config, base)
 
     if not config.get_option('user_port'):
         port = '8080'
@@ -184,6 +190,6 @@
         elif protocol == 'ajp':
             from flup.server.ajp import WSGIServer
         else:
-            print 'Unknown protocol: %s.' % (protocol)
+            print('Unknown protocol: %s.' % (protocol))
             sys.exit(1)
         WSGIServer(app, bindAddress=(host, int(port))).run()

=== modified file 'loggerhead/middleware/profile.py'
--- loggerhead/middleware/profile.py	2009-10-17 08:47:38 +0000
+++ loggerhead/middleware/profile.py	2019-09-18 16:50:15 +0000
@@ -2,7 +2,7 @@
 
 import threading
 
-from bzrlib.lsprof import profile
+from breezy.lsprof import profile
 
 
 class LSProfMiddleware(object):

=== modified file 'loggerhead/search.py'
--- loggerhead/search.py	2012-02-08 01:50:02 +0000
+++ loggerhead/search.py	2019-09-18 16:50:15 +0000
@@ -24,9 +24,9 @@
     if _mod_index is not None:
         return
     try:
-        from bzrlib.plugins.search import errors
-        from bzrlib.plugins.search import index as _mod_index
-        from bzrlib.plugins.search.index import FileTextHit, RevisionHit
+        from breezy.plugins.search import errors
+        from breezy.plugins.search import index as _mod_index
+        from breezy.plugins.search.index import FileTextHit, RevisionHit
     except ImportError:
         _mod_index = None
 

=== modified file 'loggerhead/static/css/global.css'
--- loggerhead/static/css/global.css	2015-03-17 11:38:32 +0000
+++ loggerhead/static/css/global.css	2019-09-18 16:50:15 +0000
@@ -230,11 +230,11 @@
     }
 th.datecell,
 td.date {
-    width: 180px;
+    width: 100px;
     }
 th.timedate,
 td.timedate2 {
-    width: 80px;
+    width: 60px;
     }
 th.downloadcell,
 td.downr {

=== modified file 'loggerhead/static/css/view.css'
--- loggerhead/static/css/view.css	2019-06-20 16:18:17 +0000
+++ loggerhead/static/css/view.css	2019-09-18 16:50:15 +0000
@@ -5,8 +5,7 @@
     }
 .viewRev {
     border-right: none;
-    white-space: nowrap;
-    width: 1px;
+    width: 20%;
     padding: .3em .6em;
     }
 .viewComm,

=== modified file 'loggerhead/templatefunctions.py'
--- loggerhead/templatefunctions.py	2012-05-02 22:23:34 +0000
+++ loggerhead/templatefunctions.py	2019-09-18 16:50:15 +0000
@@ -15,15 +15,18 @@
 #
 
 import os
-import urllib
 
 import pkg_resources
 
-import bzrlib
+import breezy
+from breezy import urlutils
 
-import loggerhead
-from loggerhead.zptsupport import zpt
-from loggerhead.util import html_format
+from . import (
+    __version__,
+    __revision__,
+    )
+from .zptsupport import zpt
+from .util import html_format
 
 
 templatefunctions = {}
@@ -52,18 +55,18 @@
             if currently_showing and filename == currently_showing:
                 return html_format(
                     '<b><a href="#%s">%s</a></b>',
-                    urllib.quote(filename.encode('utf-8')), filename)
+                    urlutils.quote(filename), filename)
             else:
                 return revision_link(
                     url, entry.revno, filename,
-                    '#' + urllib.quote(filename.encode('utf-8')))
+                    '#' + urlutils.quote(filename))
     else:
         def file_link(filename):
             return html_format(
                 '<a href="%s%s" title="View changes to %s in revision %s">'
                 '%s</a>',
                 url(['/revision', entry.revno]),
-                '#' + urllib.quote(filename.encode('utf-8')),
+                '#' + urlutils.quote(filename),
                 filename, entry.revno, filename)
     return _pt('revisionfilechanges').expand(
         entry=entry, file_changes=file_changes, file_link=file_link, **templatefunctions)
@@ -71,7 +74,7 @@
 
 @templatefunc
 def revisioninfo(url, branch, entry, file_changes=None, currently_showing=None, merged_in=None):
-    from loggerhead import util
+    from . import util
     return _pt('revisioninfo').expand(
         url=url, change=entry, branch=branch, util=util,
         file_changes=file_changes, currently_showing=currently_showing,
@@ -142,11 +145,11 @@
 
 @templatefunc
 def loggerhead_version():
-    return loggerhead.__version__
-    
+    return __version__
+
 @templatefunc
 def loggerhead_revision():
-    return loggerhead.__revision__
+    return __revision__
 
 _cached_generator_string = None
 
@@ -159,13 +162,13 @@
         # TODO: Errors -- e.g. from a missing/invalid __version__ attribute, or
         # ValueError accessing Distribution.version -- should be non-fatal.
 
-        versions.append(('Loggerhead', loggerhead.__version__))
+        versions.append(('Loggerhead', __version__))
 
         import sys
-        python_version = bzrlib._format_version_tuple(sys.version_info)
+        python_version = breezy._format_version_tuple(sys.version_info)
         versions.append(('Python', python_version))
 
-        versions.append(('Bazaar', bzrlib.__version__))
+        versions.append(('Breezy', breezy.__version__))
 
         Paste = pkg_resources.get_distribution('Paste')
         versions.append(('Paste', Paste.version))
@@ -188,11 +191,11 @@
             versions.append(('Pygments', pygments.__version__))
 
         try:
-            from bzrlib.plugins import search
+            from breezy.plugins import search
         except ImportError:
             pass
         else:
-            bzr_search_version = bzrlib._format_version_tuple(
+            bzr_search_version = breezy._format_version_tuple(
                 search.version_info)
             versions.append(('bzr-search', bzr_search_version))
 

=== modified file 'loggerhead/templates/directory.pt'
--- loggerhead/templates/directory.pt	2011-02-17 19:51:25 +0000
+++ loggerhead/templates/directory.pt	2019-09-18 16:50:15 +0000
@@ -2,6 +2,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" >
   <head>
     <title tal:content="string:Browsing ${name}"></title>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+    <meta name="generator"
+          tal:attributes="content generator_string" />
+
+
     <link rel="stylesheet"
           tal:attributes="href python:static_url('/static/css/global.css')" />
     <link rel="shortcut icon"
@@ -17,16 +22,16 @@
       <div >
         <table id="logentries">
           <tr class="logheader">
-            <th class="summarycell" colspan="2">Filename</th>
-            <th class="datecell">Latest Rev</th>
+            <th class="datecell">Filename</th>
+            <th class="timedate">Latest Rev</th>
             <th class="datecell">Last Changed</th>
+            <th class="datecell">Committer</th>
+            <th class="summarycell">Comment</th>
           </tr>
 
           <tr class="blueRow0" tal:condition="python:name != '/'">
-            <td class="icocell">
+            <td class="summcell" colspan="5">
                 <a href="../"><img tal:attributes="src python:static_url('/static/images/ico_folder_up.gif')" /></a>
-            </td>
-            <td class="summcell" colspan="3">
                 <a href="../">..</a>
             </td>
           </tr>
@@ -34,37 +39,42 @@
 
             <tal:branch-row tal:condition="dir/branch">
               <tr tal:attributes="class string:blueRow${dir/parity}">
-                <td class="icocell">
+                <td class="date">
                     <a tal:attributes="href string:${dir/dirname}/files">
                         <img tal:attributes="src python:static_url('/static/images/ico_branch.gif')" alt="Branch" />
                     </a>
-                </td>
-                <td class="autcell">
                   <a tal:attributes="href string:${dir/dirname}/files" tal:content="dir/dirname" /></td>
                 <td class="date">
                   <a tal:attributes="href string:${dir/dirname}/revision/${dir/branch/revno};
                                      title string:Show revision ${dir/branch/revno}"
                      tal:content="dir/branch/revno"></a>
                 </td>
-                <td class="date" tal:content="python:util.date_time(dir.last_change)"></td>
+                <td class="date" tal:content="python:util._approximatedate(dir.last_change_time)"></td>
+                <td class="date" tal:content="python:util.hide_email(dir.last_revision.committer) if dir.last_revision is not None else 'Nobody'"></td>
+                <td class="autcell" tal:content="python:dir.last_revision.message[:50] if dir.last_revision is not None else ''"></td>
               </tr>
+
             </tal:branch-row>
             <tal:non-branch-row tal:condition="not:dir/branch">
               <tr tal:attributes="class string:blueRow${dir/parity}">
-                <td class="icocell">
+                <td class="date">
                     <a tal:attributes="href string:${dir/dirname}/">
                         <img tal:attributes="src python:static_url('/static/images/ico_folder.gif')" alt="Folder" />
                     </a>
-                </td>
-                <td class="autcell">
                   <a tal:attributes="href string:${dir/dirname}/" tal:content="dir/dirname" /></td>
                 <td class="date"></td>
-                <td class="date" tal:content="dir/last_change"></td>
+                <td class="date" colspan="4" tal:content="dir/last_change"></td>
               </tr>
             </tal:non-branch-row>
           </tal:block>
         </table>
       </div>
+
+      <p id="footer" class="fl">
+          Loggerhead is a web-based interface for <a href="https://www.breezy-vcs.org/">Breezy</a>
+          <br />
+          Version: <tal:version content="loggerhead_version" /><span tal:condition="loggerhead_revision">, Revision: <tal:revision content="loggerhead_revision" /></span>
+      </p>
     </div>
   </body>
 </html>

=== modified file 'loggerhead/templates/inventory.pt'
--- loggerhead/templates/inventory.pt	2012-02-02 07:42:24 +0000
+++ loggerhead/templates/inventory.pt	2019-09-18 16:50:15 +0000
@@ -30,7 +30,7 @@
           <tal:no-link condition="not: branch/branch_link">
             <span metal:use-macro="breadcrumbs/directory"></span>
           </tal:no-link>
-          <span>: <span metal:use-macro="breadcrumbs/branch" /> (revision <tal:revno content="change/revno"></tal:revno>)</span>
+          <span>: <span metal:use-macro="breadcrumbs/branch" /> (Revision <tal:revno content="change/revno"></tal:revno>)</span>
         </div>
       </tal:block>
 
@@ -54,10 +54,12 @@
 
           <table id="logentries">
             <tr class="logheader">
-              <th class="summarycell"><a tal:attributes="href python:url(['/files', revid], sort='filename')">Filename</a></th>
-              <th class="datecell">Latest Rev</th>
-              <th class="datecell"><a tal:attributes="href python:url(['/files', revid], sort='date')">Last Changed</a></th>
-              <th class="timedate"><a tal:attributes="href python:url(['/files', revid], sort='size')">Size</a></th>
+              <th class="datecell"><a tal:attributes="href python:branch.sort_url(['/files', revid], sort='filename')">Filename</a></th>
+              <th class="timedate">Latest Rev</th>
+              <th class="datecell"><a tal:attributes="href python:branch.sort_url(['/files', revid], sort='date')">Last Changed</a></th>
+              <th class="datecell">Committer</th>
+              <th class="summarycell">Comment</th>
+              <th class="timedate"><a tal:attributes="href python:branch.sort_url(['/files', revid], sort='size')">Size</a></th>
               <th class="expandcell"></th>
               <th class="expandcell"></th>
             </tr>
@@ -68,11 +70,15 @@
                         <img tal:attributes="src python:branch.static_url('/static/images/ico_folder_up.gif')" />..</a>
                 </td>
             </tr>
+          <tr class="blueRow0" tal:condition="python:updir is None">
+            <td class="summcell" colspan="6">
+                <a tal:attributes="href python:'/'.join(branch.friendly_name.split('/')[:-1])"><img tal:attributes="src python:static_url('/static/images/ico_folder_up.gif')" />..</a></td>
+          </tr>
 
             <!-- Show this if it's a directory -->
             <tal:block repeat="file filelist">
             <tr tal:attributes="class string:blueRow${repeat/file/even}" tal:condition="python:file.kind=='directory'">
-                <td class="autcell"><a tal:attributes="href python:url(['/files', revno_url, file.absolutepath])">
+                <td class="date"><a tal:attributes="href python:url(['/files', revno_url, file.absolutepath])">
                         <img tal:attributes="src python:branch.static_url('/static/images/ico_folder.gif');
                                              title string:Go to ${file/filename}" />
                     </a>
@@ -84,8 +90,10 @@
                                                      title string:Show revision ${file/change/revno}"
                                      tal:content="file/change/revno"></a>
                  </td>
-                 <td class="date" tal:content="python:util.date_time(file.change.utc_date)"></td>
-                 <td class="timedate2"></td>
+                 <td class="date" tal:content="python:util._approximatedate(file.change.utc_date)"></td> 
+                 <td class="date" tal:content="python:util.hide_email(file.change.committer)"></td>
+                 <td class="autcell" tal:content="python:file.change.comment[:50]"></td>
+                 <td class="timedate2"></td><!-- not showing sizes of folders -->
                  <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_file_id=file.file_id);
                                                      title string:Show revision ${file/change/revno}">
                                       <img tal:attributes="src python:branch.static_url('/static/images/ico_planilla.gif')" alt="Diff" />
@@ -96,7 +104,7 @@
 
             <!-- Show this if it's a symlink -->
             <tr tal:attributes="class string:blueRow${repeat/file/even}" tal:condition="python:file.kind=='symlink'">
-                <td class="autcell"><a tal:attributes="href python:url(['/view', change.revno, file.absolutepath])">
+                <td class="date"><a tal:attributes="href python:url(['/view', change.revno, file.absolutepath])">
                         <img tal:attributes="src python:branch.static_url('/static/images/ico_file_flecha.gif')" alt="Symlink" />
                     </a>
 
@@ -107,7 +115,9 @@
                                                      title string:Show revision ${file/change/revno}"
                                      tal:content="file/change/revno"></a>
                  </td>
-                 <td class="date" tal:content="python:util.date_time(file.change.utc_date)"></td>
+                 <td class="date" tal:content="python:util._approximatedate(file.change.utc_date)"></td> 
+                 <td class="date" tal:content="python:util.hide_email(file.change.committer)"></td>
+                 <td class="autcell" tal:content="python:file.change.comment[:50]"></td>
                  <td class="timedate2">.</td>
                  <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_file_id=file.file_id);
                                                         title string:Show revision ${file/change/revno}">
@@ -120,7 +130,7 @@
 
             <!-- Show this if it's a regular file -->
             <tr tal:attributes="class string:blueRow${repeat/file/even}" tal:condition="python:file.kind=='file'">
-                <td class="autcell"><a tal:attributes="href python:url(['/view', revno_url, file.absolutepath])">
+                <td class="date"><a tal:attributes="href python:url(['/view', revno_url, file.absolutepath])">
                         <img tal:attributes="src python:branch.static_url('/static/images/ico_file.gif');
                                              title string:View ${file/filename}"
                              tal:condition="python:file.executable is False" />
@@ -136,7 +146,10 @@
                                                   title string:Show revision ${file/change/revno}"
                                   tal:content="file/change/revno"></a>
               </td>
-              <td class="date" tal:content="python:util.date_time(file.change.utc_date)"></td>
+                 <td class="date" tal:content="python:util._approximatedate(file.change.utc_date)"></td> 
+                 <td class="date" tal:content="python:util.hide_email(file.change.committer)"></td>
+                 <td class="autcell" tal:content="python:file.change.comment[:50]"></td>
+
               <td class="timedate2" tal:content="python:util.human_size(file.size)"></td>
               <td class="expcell"><a tal:attributes="href python:url(['/view', revno_url, file.absolutepath]);
                                                      title string:View ${file/filename}">
@@ -144,7 +157,7 @@
                                      </a>
               </td>
               <td class="expcell">
-                 <a tal:attributes="href python:url(['/download', file.revid, file.file_id, file.filename]);
+                 <a tal:attributes="href python:url(['/download', file.revid.decode('utf-8'), file.file_id.decode('utf-8'), file.filename]);
                                     title string:Download ${file/filename} at revision ${file/change/revno}">
                    <img tal:attributes="src python:branch.static_url('/static/images/ico_file_download.gif')" alt="Download File" />
                  </a>

=== modified file 'loggerhead/templates/macros.pt'
--- loggerhead/templates/macros.pt	2012-05-03 21:39:50 +0000
+++ loggerhead/templates/macros.pt	2019-09-18 16:50:15 +0000
@@ -60,7 +60,7 @@
         <div metal:define-slot="content"></div>
 
         <p id="footer" class="fl">
-            Loggerhead is a web-based interface for <a href="http://bazaar-vcs.org/">Bazaar</a> branches
+            Loggerhead is a web-based interface for <a href="https://www.breezy-vcs.org/">Breezy</a>
             <br />
             Version: <tal:version content="loggerhead_version" /><span tal:condition="loggerhead_revision">, Revision: <tal:revision content="loggerhead_revision" /></span>
         </p>

=== modified file 'loggerhead/tests/__init__.py'
--- loggerhead/tests/__init__.py	2011-09-08 00:33:28 +0000
+++ loggerhead/tests/__init__.py	2019-09-18 16:50:15 +0000
@@ -15,8 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-def load_tests(standard_tests, module, loader):
-    standard_tests.addTests(loader.loadTestsFromModuleNames([
+from __future__ import absolute_import
+
+
+def test_suite():
+    import unittest
+    loader = unittest.TestLoader()
+    return loader.loadTestsFromNames([
         (__name__ + '.' + x) for x in [
             'test_controllers',
             'test_corners',
@@ -27,5 +32,4 @@
             'test_revision_ui',
             'test_templating',
             'test_util',
-        ]]))
-    return standard_tests
+        ]])

=== modified file 'loggerhead/tests/fixtures.py'
--- loggerhead/tests/fixtures.py	2011-11-25 02:28:56 +0000
+++ loggerhead/tests/fixtures.py	2019-09-18 16:50:15 +0000
@@ -37,7 +37,7 @@
         self.testcase.build_tree_contents(
             (filename, self.filecontents) for filename in filenames)
         for filename in filenames:
-            self.tree.add(filename, '%s-id' % filename)
+            self.tree.add(filename, ('%s-id' % filename).encode('utf-8'))
         self.fileid = self.tree.path2id('myfilename')
         self.msg = 'a very exciting commit message <'
         self.revid = self.tree.commit(message=self.msg)

=== modified file 'loggerhead/tests/test_controllers.py'
--- loggerhead/tests/test_controllers.py	2016-09-04 15:13:21 +0000
+++ loggerhead/tests/test_controllers.py	2019-09-18 16:50:15 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+from __future__ import absolute_import
+
 import tarfile
 import tempfile
 
@@ -27,10 +29,10 @@
     Mismatch,
     )
 
-from loggerhead.apps.branch import BranchWSGIApp
-from loggerhead.controllers.annotate_ui import AnnotateUI
-from loggerhead.controllers.inventory_ui import InventoryUI
-from loggerhead.tests.test_simple import (
+from ..apps.branch import BranchWSGIApp
+from ..controllers.annotate_ui import AnnotateUI
+from ..controllers.inventory_ui import InventoryUI
+from .test_simple import (
     BasicTests,
     consume_app,
     TestWithSimpleTree,
@@ -55,8 +57,8 @@
     def test_get_filelist(self):
         bzrbranch, inv_ui = self.make_bzrbranch_and_inventory_ui_for_tree_shape(
             ['filename'])
-        inv = bzrbranch.repository.get_inventory(bzrbranch.last_revision())
-        self.assertEqual(1, len(inv_ui.get_filelist(inv, '', 'filename', 'head')))
+        revtree = bzrbranch.repository.revision_tree(bzrbranch.last_revision())
+        self.assertEqual(1, len(inv_ui.get_filelist(revtree, '', 'filename', 'head')))
 
     def test_smoke(self):
         bzrbranch, inv_ui = self.make_bzrbranch_and_inventory_ui_for_tree_shape(
@@ -65,23 +67,29 @@
             {'SCRIPT_NAME': '/files', 'PATH_INFO': ''})
         self.assertEqual(('200 OK', [('Content-Type', 'text/html')], None),
                          start)
-        self.assertContainsRe(content, 'filename')
+        self.assertContainsRe(content, b'filename')
 
     def test_no_content_for_HEAD(self):
         bzrbranch, inv_ui = self.make_bzrbranch_and_inventory_ui_for_tree_shape(
             ['filename'])
         start, content = consume_app(inv_ui,
             {'SCRIPT_NAME': '/files', 'PATH_INFO': '',
-             'REQUEST_METHOD': 'HEAD'})
+             'REQUEST_METHOD': 'HEAD',
+             'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'})
         self.assertEqual(('200 OK', [('Content-Type', 'text/html')], None),
                          start)
-        self.assertEqual('', content)
+        self.assertEqual(b'', content)
 
     def test_get_values_smoke(self):
         branch = self.make_bzrbranch_for_tree_shape(['a-file'])
         branch_app = self.make_branch_app(branch)
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/files',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         inv_ui = branch_app.lookup_app(env)
         inv_ui.parse_args(env)
         values = inv_ui.get_values('', {}, {})
@@ -91,7 +99,10 @@
         branch = self.make_bzrbranch_for_tree_shape(['a-file'])
         branch_app = self.make_branch_app(branch)
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/files',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         inv_ui = branch_app.lookup_app(env)
         self.assertOkJsonResponse(inv_ui, env)
 
@@ -102,10 +113,10 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents(shape1)
         tree.smart_add([])
-        tree.commit('msg 1', rev_id='rev-1')
+        tree.commit('msg 1', rev_id=b'rev-1')
         self.build_tree_contents(shape2)
         tree.smart_add([])
-        tree.commit('msg 2', rev_id='rev-2')
+        tree.commit('msg 2', rev_id=b'rev-2')
         branch = tree.branch
         self.addCleanup(branch.lock_read().unlock)
         return self.make_branch_app(branch)
@@ -113,18 +124,24 @@
     def test_get_values(self):
         branch_app = self.make_branch_app_for_revision_ui([], [])
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/revision/2',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         rev_ui = branch_app.lookup_app(env)
         rev_ui.parse_args(env)
         self.assertIsInstance(rev_ui.get_values('', {}, []), dict)
 
     def test_add_template_values(self):
         branch_app = self.make_branch_app_for_revision_ui(
-                [('file', 'content\n')], [('file', 'new content\n')])
+                [('file', b'content\n')], [('file', b'new content\n')])
         env = {'SCRIPT_NAME': '/',
                'PATH_INFO': '/revision/1/non-existent-file',
                'QUERY_STRING':'start_revid=1',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         revision_ui = branch_app.lookup_app(env)
         path = revision_ui.parse_args(env)
         values = revision_ui.get_values(path, revision_ui.kwargs, {})
@@ -133,11 +150,14 @@
 
     def test_get_values_smoke(self):
         branch_app = self.make_branch_app_for_revision_ui(
-                [('file', 'content\n'), ('other-file', 'other\n')],
-                [('file', 'new content\n')])
+                [('file', b'content\n'), ('other-file', b'other\n')],
+                [('file', b'new content\n')])
         env = {'SCRIPT_NAME': '/',
                'PATH_INFO': '/revision/head:',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         revision_ui = branch_app.lookup_app(env)
         revision_ui.parse_args(env)
         values = revision_ui.get_values('', {}, {})
@@ -149,10 +169,13 @@
 
     def test_json_render_smoke(self):
         branch_app = self.make_branch_app_for_revision_ui(
-                [('file', 'content\n'), ('other-file', 'other\n')],
-                [('file', 'new content\n')])
+                [('file', b'content\n'), ('other-file', b'other\n')],
+                [('file', b'new content\n')])
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/revision/head:',
-                'REQUEST_METHOD': 'GET'}
+                'REQUEST_METHOD': 'GET',
+                'wsgi.url_scheme': 'http',
+                'SERVER_NAME': 'localhost',
+                'SERVER_PORT': '80'}
         revision_ui = branch_app.lookup_app(env)
         self.assertOkJsonResponse(revision_ui, env)
 
@@ -172,8 +195,8 @@
         return AnnotateUI(branch_app, branch_app.get_history)
 
     def test_annotate_file(self):
-        history = [('rev1', 'old\nold\n', '.'), ('rev2', 'new\nold\n', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history('file_id', history)
+        history = [(b'rev1', b'old\nold\n', '.'), (b'rev2', b'new\nold\n', '.')]
+        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
         # A lot of this state is set up by __call__, but we'll do it directly
         # here.
         ann_ui.args = ['rev2']
@@ -186,8 +209,8 @@
 
     def test_annotate_empty_comment(self):
         # Testing empty comment handling without breaking
-        history = [('rev1', 'old\nold\n', '.'), ('rev2', 'new\nold\n', '')]
-        ann_ui = self.make_annotate_ui_for_file_history('file_id', history)
+        history = [(b'rev1', b'old\nold\n', '.'), (b'rev2', b'new\nold\n', '')]
+        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
         ann_ui.args = ['rev2']
         ann_ui.get_values(
             'filename', kwargs={'file_id': 'file_id'}, headers={})
@@ -195,8 +218,8 @@
     def test_annotate_file_zero_sized(self):
         # Test against a zero-sized file without breaking. No annotation
         # must be present.
-        history = [('rev1', '', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history('file_id', history)
+        history = [(b'rev1', b'', '.')]
+        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
         ann_ui.args = ['rev1']
         annotate_info = ann_ui.get_values('filename',
             kwargs={'file_id': 'file_id'}, headers={})
@@ -204,15 +227,15 @@
         self.assertEqual(0, len(annotated))
 
     def test_annotate_nonexistent_file(self):
-        history = [('rev1', '', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history('file_id', history)
+        history = [(b'rev1', b'', '.')]
+        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
         ann_ui.args = ['rev1']
         self.assertRaises(
             HTTPNotFound, ann_ui.get_values, 'not-filename', {}, {})
 
     def test_annotate_nonexistent_rev(self):
-        history = [('rev1', '', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history('file_id', history)
+        history = [(b'rev1', b'', '.')]
+        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
         ann_ui.args = ['norev']
         self.assertRaises(
             HTTPNotFound, ann_ui.get_values, 'not-filename', {}, {})
@@ -223,22 +246,25 @@
     def make_branch_app_for_filediff_ui(self):
         builder = self.make_branch_builder('branch')
         builder.start_series()
-        builder.build_snapshot('rev-1-id', None, [
-            ('add', ('', 'root-id', 'directory', '')),
-            ('add', ('filename', 'f-id', 'file', 'content\n'))],
+        rev1 = builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', '')),
+            ('add', ('filename', b'f-id', 'file', b'content\n'))],
             message="First commit.")
-        builder.build_snapshot('rev-2-id', None, [
-            ('modify', ('f-id', 'new content\n'))])
+        rev2 = builder.build_snapshot(None, [
+             ('modify', ('filename', b'new content\n'))])
         builder.finish_series()
         branch = builder.get_branch()
         self.addCleanup(branch.lock_read().unlock)
-        return self.make_branch_app(branch)
+        return self.make_branch_app(branch), (rev1, rev2)
 
     def test_get_values_smoke(self):
-        branch_app = self.make_branch_app_for_filediff_ui()
+        branch_app, (rev1, rev2) = self.make_branch_app_for_filediff_ui()
         env = {'SCRIPT_NAME': '/',
-               'PATH_INFO': '/+filediff/rev-2-id/rev-1-id/f-id',
-               'REQUEST_METHOD': 'GET'}
+               'PATH_INFO': '/+filediff/%s/%s/f-id' % (rev2.decode('utf-8'), rev1.decode('utf-8')),
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         filediff_ui = branch_app.lookup_app(env)
         filediff_ui.parse_args(env)
         values = filediff_ui.get_values('', {}, {})
@@ -247,10 +273,13 @@
         self.assertEqual('new content', chunks[0].diff[1].line)
 
     def test_json_render_smoke(self):
-        branch_app = self.make_branch_app_for_filediff_ui()
+        branch_app, (rev1, rev2) = self.make_branch_app_for_filediff_ui()
         env = {'SCRIPT_NAME': '/',
-               'PATH_INFO': '/+json/+filediff/rev-2-id/rev-1-id/f-id',
-               'REQUEST_METHOD': 'GET'}
+               'PATH_INFO': '/+json/+filediff/%s/%s/f-id' % (rev2.decode('utf-8'), rev1.decode('utf-8')),
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         filediff_ui = branch_app.lookup_app(env)
         self.assertOkJsonResponse(filediff_ui, env)
 
@@ -260,20 +289,23 @@
     def make_branch_app_for_revlog_ui(self):
         builder = self.make_branch_builder('branch')
         builder.start_series()
-        builder.build_snapshot('rev-id', None, [
-            ('add', ('', 'root-id', 'directory', '')),
-            ('add', ('filename', 'f-id', 'file', 'content\n'))],
+        revid = builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', '')),
+            ('add', ('filename', b'f-id', 'file', b'content\n'))],
             message="First commit.")
         builder.finish_series()
         branch = builder.get_branch()
         self.addCleanup(branch.lock_read().unlock)
-        return self.make_branch_app(branch)
+        return self.make_branch_app(branch), revid
 
     def test_get_values_smoke(self):
-        branch_app = self.make_branch_app_for_revlog_ui()
+        branch_app, revid = self.make_branch_app_for_revlog_ui()
         env = {'SCRIPT_NAME': '/',
-               'PATH_INFO': '/+revlog/rev-id',
-               'REQUEST_METHOD': 'GET'}
+               'PATH_INFO': '/+revlog/%s' % revid.decode('utf-8'),
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         revlog_ui = branch_app.lookup_app(env)
         revlog_ui.parse_args(env)
         values = revlog_ui.get_values('', {}, {})
@@ -281,9 +313,12 @@
         self.assertEqual(values['entry'].comment, "First commit.")
 
     def test_json_render_smoke(self):
-        branch_app = self.make_branch_app_for_revlog_ui()
-        env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/+revlog/rev-id',
-               'REQUEST_METHOD': 'GET'}
+        branch_app, revid = self.make_branch_app_for_revlog_ui()
+        env = {'SCRIPT_NAME': '', 'PATH_INFO': '/+json/+revlog/%s' % revid.decode('utf-8'),
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         revlog_ui = branch_app.lookup_app(env)
         self.assertOkJsonResponse(revlog_ui, env)
 
@@ -295,7 +330,10 @@
         # A hook that returns None doesn't influence the searching for
         # a controller.
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         myhook = lambda app, environ: None
         branch = self.make_branch('.')
         self.addCleanup(branch.lock_read().unlock)
@@ -308,7 +346,10 @@
     def test_working_hook(self):
         # A hook can provide an app to use for a particular request.
         env = {'SCRIPT_NAME': '', 'PATH_INFO': '/custom',
-               'REQUEST_METHOD': 'GET'}
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
         myhook = lambda app, environ: "I am hooked"
         branch = self.make_branch('.')
         self.addCleanup(branch.lock_read().unlock)
@@ -348,7 +389,7 @@
         app = self.setUpLoggerhead()
         response = app.get('/download/1/myfilename-id/myfilename')
         self.assertEqual(
-            'some\nmultiline\ndata\nwith<htmlspecialchars\n', response.body)
+            b'some\nmultiline\ndata\nwith<htmlspecialchars\n', response.body)
         self.assertThat(
             response,
             MatchesDownloadHeaders('myfilename', 'application/octet-stream'))

=== modified file 'loggerhead/tests/test_corners.py'
--- loggerhead/tests/test_corners.py	2009-04-02 20:32:12 +0000
+++ loggerhead/tests/test_corners.py	2019-09-18 16:50:15 +0000
@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 import os
 
-from loggerhead.tests.test_simple import BasicTests
+from .test_simple import BasicTests
 
 
 class TestCornerCases(BasicTests):
@@ -26,19 +28,19 @@
         self.addFileAndCommit('myfilename', msg)
 
         # Make a commit that changes the execute bit of 'myfilename'.
-        os.chmod('myfilename', 0755)
+        os.chmod('myfilename', 0o755)
         newrevid = self.tree.commit(message='make something executable')
 
         # Check that it didn't break things.
         app = self.setUpLoggerhead()
-        res = app.get('/revision/'+newrevid)
-        res.mustcontain('executable')
+        res = app.get('/revision/'+newrevid.decode('utf-8'))
+        res.mustcontain(b'executable')
 
     def test_revision_escapes_commit_message(self):
         """XXX."""
         self.createBranch()
 
-        msg = '<b>hi</b>'
+        msg = b'<b>hi</b>'
         self.addFileAndCommit('myfilename', msg)
         app = self.setUpLoggerhead()
         res = app.get('/revision/1')

=== modified file 'loggerhead/tests/test_history.py'
--- loggerhead/tests/test_history.py	2011-03-25 13:09:10 +0000
+++ loggerhead/tests/test_history.py	2019-09-18 16:50:15 +0000
@@ -17,16 +17,16 @@
 
 """Direct tests of the loggerhead/history.py module"""
 
-from bzrlib.foreign import (
+from breezy.foreign import (
     ForeignRevision,
     ForeignVcs,
     VcsMapping,
     )
 
 from datetime import datetime
-from bzrlib import tag, tests
+from breezy import tag, tests
 
-from loggerhead import history as _mod_history
+from .. import history as _mod_history
 
 
 class TestCaseWithExamples(tests.TestCaseWithMemoryTransport):
@@ -40,26 +40,27 @@
         # rev-1
         builder = self.make_branch_builder('branch')
         builder.start_series()
-        builder.build_snapshot('rev-1', None, [
-            ('add', ('', 'root-id', 'directory', None))])
-        builder.build_snapshot('rev-2', ['rev-1'], [])
-        builder.build_snapshot('rev-3', ['rev-2'], [])
+        rev1 = builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', None))])
+        rev2 = builder.build_snapshot([rev1], [])
+        rev3 = builder.build_snapshot([rev2], [])
         builder.finish_series()
         b = builder.get_branch()
         self.addCleanup(b.lock_read().unlock)
-        return _mod_history.History(b, {})
+        return _mod_history.History(b, {}), [rev1, rev2, rev3]
 
     def make_long_linear_ancestry(self):
         builder = self.make_branch_builder('branch')
+        revs = []
         builder.start_series()
-        builder.build_snapshot('A', None, [
-            ('add', ('', 'root-id', 'directory', None))])
+        revs.append(builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', None))]))
         for r in "BCDEFGHIJKLMNOPQRSTUVWXYZ":
-            builder.build_snapshot(r, None, [])
+            revs.append(builder.build_snapshot(None, []))
         builder.finish_series()
         b = builder.get_branch()
         self.addCleanup(b.lock_read().unlock)
-        return _mod_history.History(b, {})
+        return _mod_history.History(b, {}), revs
 
     def make_merged_ancestry(self):
         # Time goes up
@@ -70,14 +71,14 @@
         # rev-1
         builder = self.make_branch_builder('branch')
         builder.start_series()
-        builder.build_snapshot('rev-1', None, [
-            ('add', ('', 'root-id', 'directory', None))])
-        builder.build_snapshot('rev-2', ['rev-1'], [])
-        builder.build_snapshot('rev-3', ['rev-1', 'rev-2'], [])
+        rev1 = builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', None))])
+        rev2 = builder.build_snapshot([rev1], [])
+        rev3 = builder.build_snapshot([rev1, rev2], [])
         builder.finish_series()
         b = builder.get_branch()
         self.addCleanup(b.lock_read().unlock)
-        return _mod_history.History(b, {})
+        return _mod_history.History(b, {}), [rev1, rev2, rev3]
 
     def make_deep_merged_ancestry(self):
         # Time goes up
@@ -92,17 +93,18 @@
         # A
         builder = self.make_branch_builder('branch')
         builder.start_series()
-        builder.build_snapshot('A', None, [
-            ('add', ('', 'root-id', 'directory', None))])
-        builder.build_snapshot('B', ['A'], [])
-        builder.build_snapshot('C', ['A'], [])
-        builder.build_snapshot('D', ['C'], [])
-        builder.build_snapshot('E', ['C', 'D'], [])
-        builder.build_snapshot('F', ['B', 'E'], [])
+        rev_a = builder.build_snapshot(None, [
+            ('add', ('', b'root-id', 'directory', None))])
+        rev_b = builder.build_snapshot([rev_a], [])
+        rev_c = builder.build_snapshot([rev_a], [])
+        rev_d = builder.build_snapshot([rev_c], [])
+        rev_e = builder.build_snapshot([rev_c, rev_d], [])
+        rev_f = builder.build_snapshot([rev_b, rev_e], [])
         builder.finish_series()
         b = builder.get_branch()
         self.addCleanup(b.lock_read().unlock)
-        return _mod_history.History(b, {})
+        return (_mod_history.History(b, {}),
+                [rev_a, rev_b, rev_c, rev_d, rev_e, rev_f])
 
     def assertRevidsFrom(self, expected, history, search_revs, tip_rev):
         self.assertEqual(expected,
@@ -136,59 +138,58 @@
 class TestHistoryGetRevidsFrom(TestCaseWithExamples):
 
     def test_get_revids_from_simple_mainline(self):
-        history = self.make_linear_ancestry()
-        self.assertRevidsFrom(['rev-3', 'rev-2', 'rev-1'],
-                              history, None, 'rev-3')
+        history, revs = self.make_linear_ancestry()
+        self.assertRevidsFrom(list(reversed(revs)), history, None, revs[2])
 
     def test_get_revids_from_merged_mainline(self):
-        history = self.make_merged_ancestry()
-        self.assertRevidsFrom(['rev-3', 'rev-1'],
-                              history, None, 'rev-3')
+        history, revs = self.make_merged_ancestry()
+        self.assertRevidsFrom([revs[2], revs[0]],
+                              history, None, revs[2])
 
     def test_get_revids_given_one_rev(self):
-        history = self.make_merged_ancestry()
+        history, revs = self.make_merged_ancestry()
         # rev-3 was the first mainline revision to see rev-2.
-        self.assertRevidsFrom(['rev-3'], history, ['rev-2'], 'rev-3')
+        self.assertRevidsFrom([revs[2]], history, [revs[1]], revs[2])
 
     def test_get_revids_deep_ancestry(self):
-        history = self.make_deep_merged_ancestry()
-        self.assertRevidsFrom(['F'], history, ['F'], 'F')
-        self.assertRevidsFrom(['F'], history, ['E'], 'F')
-        self.assertRevidsFrom(['F'], history, ['D'], 'F')
-        self.assertRevidsFrom(['F'], history, ['C'], 'F')
-        self.assertRevidsFrom(['B'], history, ['B'], 'F')
-        self.assertRevidsFrom(['A'], history, ['A'], 'F')
+        history, revs = self.make_deep_merged_ancestry()
+        self.assertRevidsFrom([revs[-1]], history, [revs[-1]], revs[-1])
+        self.assertRevidsFrom([revs[-1]], history, [revs[-2]], revs[-1])
+        self.assertRevidsFrom([revs[-1]], history, [revs[-3]], revs[-1])
+        self.assertRevidsFrom([revs[-1]], history, [revs[-4]], revs[-1])
+        self.assertRevidsFrom([revs[1]], history, [revs[-5]], revs[-1])
+        self.assertRevidsFrom([revs[0]], history, [revs[-6]], revs[-1])
 
     def test_get_revids_doesnt_over_produce_simple_mainline(self):
         # get_revids_from shouldn't walk the whole ancestry just to get the
         # answers for the first few revisions.
-        history = self.make_long_linear_ancestry()
+        history, revs = self.make_long_linear_ancestry()
         accessed = track_rev_info_accesses(history)
-        result = history.get_revids_from(None, 'Z')
-        self.assertEqual(set(), accessed)
-        self.assertEqual('Z', result.next())
-        # We already know 'Z' because we passed it in.
-        self.assertEqual(set(), accessed)
-        self.assertEqual('Y', result.next())
-        self.assertEqual(set([history._rev_indices['Z']]), accessed)
+        result = history.get_revids_from(None, revs[-1])
+        self.assertEqual(set(), accessed)
+        self.assertEqual(revs[-1], next(result))
+        # We already know revs[-1] because we passed it in.
+        self.assertEqual(set(), accessed)
+        self.assertEqual(revs[-2], next(result))
+        self.assertEqual(set([history._rev_indices[revs[-1]]]), accessed)
 
     def test_get_revids_doesnt_over_produce_for_merges(self):
         # get_revids_from shouldn't walk the whole ancestry just to get the
         # answers for the first few revisions.
-        history = self.make_long_linear_ancestry()
+        history, revs = self.make_long_linear_ancestry()
         accessed = track_rev_info_accesses(history)
-        result = history.get_revids_from(['X', 'V'], 'Z')
+        result = history.get_revids_from([revs[-3], revs[-5]], revs[-1])
         self.assertEqual(set(), accessed)
-        self.assertEqual('X', result.next())
+        self.assertEqual(revs[-3], next(result))
         # We access 'W' because we are checking that W wasn't merged into X.
         # The important bit is that we aren't getting the whole ancestry.
-        self.assertEqual(set([history._rev_indices[x] for x in 'ZYXW']),
-                         accessed)
-        self.assertEqual('V', result.next())
-        self.assertEqual(set([history._rev_indices[x] for x in 'ZYXWVU']),
-                         accessed)
-        self.assertRaises(StopIteration, result.next)
-        self.assertEqual(set([history._rev_indices[x] for x in 'ZYXWVU']),
+        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:4]]),
+                         accessed)
+        self.assertEqual(revs[-5], next(result))
+        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
+                         accessed)
+        self.assertRaises(StopIteration, next, result)
+        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
                          accessed)
 
 
@@ -291,32 +292,32 @@
     def test_get_view_limited_history(self):
         # get_view should only load enough history to serve the result, not all
         # history.
-        history = self.make_long_linear_ancestry()
+        history, revs = self.make_long_linear_ancestry()
         accessed = track_rev_info_accesses(history)
-        revid, start_revid, revid_list = history.get_view('Z', 'Z', None,
+        revid, start_revid, revid_list = history.get_view(revs[-1], revs[-1], None,
                                                       extra_rev_count=5)
-        self.assertEqual(['Z', 'Y', 'X', 'W', 'V', 'U'], revid_list)
-        self.assertEqual('Z', revid)
-        self.assertEqual('Z', start_revid)
-        self.assertEqual(set([history._rev_indices[x] for x in 'ZYXWVU']),
+        self.assertEqual(list(reversed(revs))[:6], revid_list)
+        self.assertEqual(revs[-1], revid)
+        self.assertEqual(revs[-1], start_revid)
+        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
                          accessed)
 
 
 class TestHistoryGetChangedUncached(TestCaseWithExamples):
 
     def test_native(self):
-        history = self.make_linear_ancestry()
-        changes = history.get_changes_uncached(['rev-1', 'rev-2'])
+        history, revs = self.make_linear_ancestry()
+        changes = history.get_changes_uncached([revs[0], revs[1]])
         self.assertEquals(2, len(changes))
-        self.assertEquals('rev-1', changes[0].revid)
-        self.assertEquals('rev-2', changes[1].revid)
+        self.assertEquals(revs[0], changes[0].revid)
+        self.assertEquals(revs[1], changes[1].revid)
         self.assertIs(None, getattr(changes[0], 'foreign_vcs', None))
         self.assertIs(None, getattr(changes[0], 'foreign_revid', None))
 
     def test_foreign(self):
         # Test with a mocked foreign revision, as it's not possible
         # to rely on any foreign plugins being installed.
-        history = self.make_linear_ancestry()
+        history, revs = self.make_linear_ancestry()
         foreign_vcs = ForeignVcs(None, "vcs")
         foreign_vcs.show_foreign_revid = repr
         foreign_rev = ForeignRevision(("uuid", 1234), VcsMapping(foreign_vcs),

=== modified file 'loggerhead/tests/test_http_head.py'
--- loggerhead/tests/test_http_head.py	2011-02-10 02:33:15 +0000
+++ loggerhead/tests/test_http_head.py	2019-09-18 16:50:15 +0000
@@ -16,17 +16,17 @@
 
 """Tests for the HeadMiddleware app."""
 
-from cStringIO import StringIO
-
-from bzrlib import tests
-
-from loggerhead.apps import http_head
-
-
-content = ["<html>",
-           "<head><title>Listed</title></head>",
-           "<body>Content</body>",
-           "</html>",
+from io import BytesIO
+
+from breezy import tests
+
+from ..apps import http_head
+
+
+content = [b"<html>",
+           b"<head><title>Listed</title></head>",
+           b"<body>Content</body>",
+           b"</html>",
           ]
 headers = {'X-Ignored-Header': 'Value'}
 
@@ -51,7 +51,7 @@
 class TestHeadMiddleware(tests.TestCase):
 
     def _trap_start_response(self, status, response_headers, exc_info=None):
-        self._write_buffer = StringIO()
+        self._write_buffer = BytesIO()
         self._start_response_passed = (status, response_headers, exc_info)
         return self._write_buffer.write
 
@@ -64,13 +64,13 @@
         app = http_head.HeadMiddleware(app)
         self._consume_app(app, 'GET')
         self.assertEqual(('200 OK', headers, None), self._start_response_passed)
-        self.assertEqualDiff(''.join(content), self._write_buffer.getvalue())
+        self.assertEqualDiff(b''.join(content), self._write_buffer.getvalue())
 
     def _verify_head_no_body(self, app):
         app = http_head.HeadMiddleware(app)
         self._consume_app(app, 'HEAD')
         self.assertEqual(('200 OK', headers, None), self._start_response_passed)
-        self.assertEqualDiff('', self._write_buffer.getvalue())
+        self.assertEqualDiff(b'', self._write_buffer.getvalue())
 
     def test_get_passthrough_yielding(self):
         self._verify_get_passthrough(yielding_app)

=== modified file 'loggerhead/tests/test_load_test.py'
--- loggerhead/tests/test_load_test.py	2011-04-14 14:10:04 +0000
+++ loggerhead/tests/test_load_test.py	2019-09-18 16:50:15 +0000
@@ -15,12 +15,15 @@
 import socket
 import time
 import threading
-import Queue
-
-from bzrlib import tests
-from bzrlib.tests import http_server
-
-from loggerhead import load_test
+try:
+    from queue import Empty
+except ImportError:  # Python < 3
+    from Queue import Empty
+
+from breezy import tests
+from breezy.tests import http_server
+
+from .. import load_test
 
 
 empty_script = """{
@@ -90,7 +93,7 @@
     def test_step_next_will_timeout(self):
         # We don't want step_next to block forever
         rt = NoopRequestWorker('id', blocking_time=0.001)
-        self.assertRaises(Queue.Empty, rt.step_next)
+        self.assertRaises(Empty, rt.step_next)
 
     def test_run_stops_for_stop_event(self):
         rt = NoopRequestWorker('id', blocking_time=0.001, _queue_size=2)

=== modified file 'loggerhead/tests/test_revision_ui.py'
--- loggerhead/tests/test_revision_ui.py	2011-03-16 12:37:17 +0000
+++ loggerhead/tests/test_revision_ui.py	2019-09-18 16:50:15 +0000
@@ -15,8 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+from __future__ import absolute_import
 
-from loggerhead.tests.test_simple import BasicTests
+from .test_simple import BasicTests
 
 
 class TestRevisionUI(BasicTests):
@@ -43,4 +44,4 @@
         # and the Authors are connected. However, that requires asserting the
         # exact HTML connections, which I wanted to avoid.
         res.mustcontain('Committer', 'Joe Example')
-        self.assertFalse('Author(s)' in res.body)
+        self.assertFalse(b'Author(s)' in res.body)

=== modified file 'loggerhead/tests/test_simple.py'
--- loggerhead/tests/test_simple.py	2011-11-25 02:28:56 +0000
+++ loggerhead/tests/test_simple.py	2019-09-18 16:50:15 +0000
@@ -15,25 +15,27 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+from __future__ import absolute_import
+
 import cgi
 import logging
 import re
 import simplejson
-from cStringIO import StringIO
+from io import BytesIO
 
-from bzrlib.tests import TestCaseWithTransport
+from breezy.tests import TestCaseWithTransport
 try:
-    from bzrlib.util.configobj.configobj import ConfigObj
+    from breezy.util.configobj.configobj import ConfigObj
 except ImportError:
     from configobj import ConfigObj
-from bzrlib import config
+from breezy import config
 
-from loggerhead.apps.branch import BranchWSGIApp
-from loggerhead.apps.http_head import HeadMiddleware
+from ..apps.branch import BranchWSGIApp
+from ..apps.http_head import HeadMiddleware
 from paste.fixture import TestApp
 from paste.httpexceptions import HTTPExceptionHandler, HTTPMovedPermanently
 
-from loggerhead.tests.fixtures import (
+from .fixtures import (
     SampleBranch,
     )
 
@@ -105,12 +107,6 @@
         self.failUnless("To get this branch, use:" in res)
         self.failUnless("lp:loggerhead" in res)
 
-    def test_no_empty_download_location(self):
-        """With no served_url, no instructions how to get it"""
-        app = self.setUpLoggerhead()
-        res = app.get('/changes')
-        self.failIf("To get this branch, use:" in res)
-
     def test_changes_search(self):
         app = self.setUpLoggerhead()
         res = app.get('/changes', params={'q': 'foo'})
@@ -127,10 +123,10 @@
         # '<span class='pyg-n'>with</span><span class='pyg-o'>&lt;</span>'
         # '<span class='pyg-n'>htmlspecialchars</span>
         # So we pre-filter the body, to make sure remove spans of that type.
-        body_no_span = re.sub(r'<span class="pyg-.">', '', res.body)
-        body_no_span = body_no_span.replace('</span>', '')
+        body_no_span = re.sub(b'<span class="pyg-.">', b'', res.body)
+        body_no_span = body_no_span.replace(b'</span>', b'')
         for line in self.filecontents.splitlines():
-            escaped = cgi.escape(line)
+            escaped = cgi.escape(line).encode('utf-8')
             self.assertTrue(escaped in body_no_span,
                             "did not find %r in %r" % (escaped, body_no_span))
 
@@ -144,7 +140,7 @@
         res.mustcontain('myfilename')
         res = app.get('/files/1/')
         res.mustcontain('myfilename')
-        res = app.get('/files/1/?file_id=' + self.tree.path2id(''))
+        res = app.get('/files/1/?file_id=' + self.tree.path2id('').decode('utf-8'))
         res.mustcontain('myfilename')
 
     def test_inventory_bad_rev_404(self):
@@ -192,10 +188,18 @@
     def setUp(self):
         BasicTests.setUp(self)
         self.createBranch()
-        locations = config.locations_config_filename()
-        config.ensure_config_dir_exists()
-        open(locations, 'wb').write('[%s]\nhttp_serve = False'
-                                    % (self.tree.branch.base,))
+        try:
+            locations = config.locations_config_filename()
+        except AttributeError:
+            from breezy import bedding
+            locations = bedding.locations_config_path()
+            ensure_config_dir_exists = bedding.ensure_config_dir_exists
+        else:
+            ensure_config_dir_exists = config.ensure_config_dir_exists
+        ensure_config_dir_exists()
+        with open(locations, 'w') as f:
+            f.write('[%s]\nhttp_serve = False' % (
+                self.tree.branch.base,))
 
     def test_no_access(self):
         app = self.setUpLoggerhead()
@@ -252,11 +256,11 @@
         app = self.setUpLoggerhead()
         res = app.get('/changes', extra_environ={'REQUEST_METHOD': 'HEAD'})
         self.assertEqual('text/html', res.header('Content-Type'))
-        self.assertEqualDiff('', res.body)
+        self.assertEqualDiff(b'', res.body)
 
 
 def consume_app(app, env):
-    body = StringIO()
+    body = BytesIO()
     start = []
     def start_response(status, headers, exc_info=None):
         start.append((status, headers, exc_info))

=== modified file 'loggerhead/tests/test_templating.py'
--- loggerhead/tests/test_templating.py	2008-10-24 02:26:05 +0000
+++ loggerhead/tests/test_templating.py	2019-09-18 16:50:15 +0000
@@ -1,4 +1,4 @@
-from loggerhead.zptsupport import load_template
+from ..zptsupport import load_template
 
 RENDERED = u"<html>\n<head>\n<title>%s</title>\n</head>\n\
 <body>\n<div>Hello, %s</div>\n</body>\n</html>"

=== modified file 'loggerhead/tests/test_util.py'
--- loggerhead/tests/test_util.py	2011-09-08 00:33:28 +0000
+++ loggerhead/tests/test_util.py	2019-09-18 16:50:15 +0000
@@ -14,9 +14,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from bzrlib import tests
+from breezy import tests
 
-from loggerhead.util import html_escape, html_format
+from ..util import html_escape, html_format
 
 
 class TestHTMLEscaping(tests.TestCase):

=== modified file 'loggerhead/util.py'
--- loggerhead/util.py	2012-04-28 00:57:06 +0000
+++ loggerhead/util.py	2019-09-18 16:50:15 +0000
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
 #
 
+from __future__ import print_function
+
 import base64
 import datetime
 import logging
@@ -30,14 +32,19 @@
 import os
 import subprocess
 
+from breezy.sixish import (
+    text_type,
+    viewitems,
+    )
+
 try:
     from xml.etree import ElementTree as ET
 except ImportError:
     from elementtree import ElementTree as ET
 
-from bzrlib import urlutils
+from breezy import urlutils
 
-from simpletal.simpleTALUtils import HTMLStructureCleaner
+import bleach
 
 log = logging.getLogger("loggerhead.controllers")
 
@@ -73,20 +80,27 @@
 
 
 def _approximatedate(date):
-    delta = datetime.datetime.now() - date
-    if abs(delta) > datetime.timedelta(1, 0, 0):
-        # far in the past or future, display the date
-        return date_day(date)
+    if date is None:
+        return 'Never'
+    delta = datetime.datetime.utcnow() - date
     future = delta < datetime.timedelta(0, 0, 0)
     delta = abs(delta)
+    years = delta.days // 365
+    months = delta.days // 30 # This is approximate.
     days = delta.days
-    hours = delta.seconds / 3600
+    hours = delta.seconds // 3600
     minutes = (delta.seconds - (3600*hours)) / 60
     seconds = delta.seconds % 60
     result = ''
     if future:
         result += 'in '
-    if days != 0:
+    if years != 0:
+        amount = years
+        unit = 'year'
+    elif months != 0:
+        amount = months
+        unit = 'month'
+    elif days != 0:
         amount = days
         unit = 'day'
     elif hours != 0:
@@ -100,10 +114,10 @@
         unit = 'second'
     if amount != 1:
         unit += 's'
-    result += '%s %s' % (amount, unit)
+    result += '%s %s' % (int(amount), unit)
     if not future:
         result += ' ago'
-        return result
+    return result
 
 
 def _wrap_with_date_time_title(date, formatted_date):
@@ -126,14 +140,14 @@
     def __init__(self, _dict=None, **kw):
         self._properties = {}
         if _dict is not None:
-            for key, value in _dict.iteritems():
+            for key, value in viewitems(_dict):
                 setattr(self, key, value)
-        for key, value in kw.iteritems():
+        for key, value in viewitems(kw):
             setattr(self, key, value)
 
     def __repr__(self):
         out = '{ '
-        for key, value in self.__dict__.iteritems():
+        for key, value in viewitems(self.__dict__):
             if key.startswith('_') or (getattr(self.__dict__[key],
                                        '__call__', None) is not None):
                 continue
@@ -262,21 +276,24 @@
         return s
     elif not s.strip():
         return '&nbsp;'
-    else:
+    elif isinstance(s, bytes):
         try:
             s = s.decode('utf-8')
         except UnicodeDecodeError:
             s = s.decode('iso-8859-15')
         return s
+    elif isinstance(s, text_type):
+        return s
+    else:
+        return repr(s)
 
-HSC = HTMLStructureCleaner()
 
 def fixed_width(s):
     """
     expand tabs and turn spaces into "non-breaking spaces", so browsers won't
     chop up the string.
     """
-    if not isinstance(s, unicode):
+    if not isinstance(s, text_type):
         # this kinda sucks.  file contents are just binary data, and no
         # encoding metadata is stored, so we need to guess.  this is probably
         # okay for most code, but for people using things like KOI-8, this
@@ -289,7 +306,7 @@
 
     s = html_escape(s).expandtabs().replace(' ', NONBREAKING_SPACE)
 
-    return HSC.clean(s).replace('\n', '<br/>')
+    return bleach.clean(s).replace('\n', '<br/>')
 
 
 def fake_permissions(kind, executable):
@@ -456,7 +473,7 @@
     return breadcrumbs
 
 
-def branch_breadcrumbs(path, inv, view):
+def branch_breadcrumbs(path, tree, view):
     """
     Generate breadcrumb information from the branch path given
 
@@ -464,7 +481,7 @@
 
     Arguments:
     path -- The path to convert into breadcrumbs
-    inv -- Inventory to get file information from
+    tree -- Tree to get file information from
     view -- The type of view we are showing (files, changes etc)
     """
     dir_parts = path.strip('/').split('/')
@@ -497,7 +514,7 @@
 def lsprof(f):
 
     def _f(*a, **kw):
-        from loggerhead.lsprof import profile
+        from .loggerhead.lsprof import profile
         import cPickle
         z = time.time()
         ret, stats = profile(f, *a, **kw)
@@ -548,7 +565,7 @@
 
 
 def set_context(map):
-    t_context.map = dict((k, v) for (k, v) in map.iteritems() if k in _valid)
+    t_context.map = dict((k, v) for (k, v) in viewitems(map) if k in _valid)
 
 
 def get_context(**overrides):
@@ -567,7 +584,7 @@
         map['remember'] = t_context.map.get('remember', None)
     else:
         map.update(t_context.map)
-    overrides = dict((k, v) for (k, v) in overrides.iteritems() if k in _valid)
+    overrides = dict((k, v) for (k, v) in viewitems(overrides) if k in _valid)
     map.update(overrides)
     return map
 
@@ -605,7 +622,7 @@
     @classmethod
     def restart_with_reloader(cls):
         """Based on restart_with_monitor from paste.script.serve."""
-        print 'Starting subprocess with file monitor'
+        print('Starting subprocess with file monitor')
         while True:
             args = [sys.executable] + sys.argv
             new_environ = os.environ.copy()
@@ -618,7 +635,7 @@
                     exit_code = proc.wait()
                     proc = None
                 except KeyboardInterrupt:
-                    print '^C caught in monitor process'
+                    print('^C caught in monitor process')
                     return 1
             finally:
                 if (proc is not None
@@ -633,7 +650,7 @@
             # a monitor, any exit code will restart
             if exit_code != 3:
                 return exit_code
-            print '-'*20, 'Restarting', '-'*20
+            print('-'*20, 'Restarting', '-'*20)
 
 
 def convert_file_errors(application):
@@ -641,7 +658,7 @@
     def new_application(environ, start_response):
         try:
             return application(environ, start_response)
-        except (IOError, OSError), e:
+        except (IOError, OSError) as e:
             import errno
             from paste import httpexceptions
             if e.errno == errno.ENOENT:

=== modified file 'loggerhead/wholehistory.py'
--- loggerhead/wholehistory.py	2012-02-08 01:50:02 +0000
+++ loggerhead/wholehistory.py	2019-09-18 16:50:15 +0000
@@ -20,19 +20,23 @@
 import logging
 import time
 
-from bzrlib.revision import is_null, NULL_REVISION
-from bzrlib.tsort import merge_sort
+from breezy.revision import is_null, NULL_REVISION
+from breezy.sixish import (
+    viewitems,
+    viewkeys,
+    )
+from breezy.tsort import merge_sort
 
 
 def _strip_NULL_ghosts(revision_graph):
     """
-    Copied over from bzrlib meant as a temporary workaround for
+    Copied over from breezy meant as a temporary workaround for
     deprecated methods.
     """
     # Filter ghosts, and null:
     if NULL_REVISION in revision_graph:
         del revision_graph[NULL_REVISION]
-    for key, parents in revision_graph.iteritems():
+    for key, parents in viewitems(revision_graph):
         revision_graph[key] = tuple(parent for parent in parents if parent
             in revision_graph)
     return revision_graph
@@ -72,7 +76,7 @@
         _rev_indices[revid] = len(_rev_info)
         _rev_info.append([(seq, revid, merge_depth, revno_str, end_of_merge), (), parents])
 
-    for revid in _revision_graph.iterkeys():
+    for revid in viewkeys(_revision_graph):
         if _rev_info[_rev_indices[revid]][0][2] == 0:
             continue
         for parent in _revision_graph[revid]:

=== modified file 'loggerhead/zptsupport.py'
--- loggerhead/zptsupport.py	2012-02-08 01:50:02 +0000
+++ loggerhead/zptsupport.py	2019-09-18 16:50:15 +0000
@@ -19,7 +19,9 @@
 import os
 import pkg_resources
 import re
-import StringIO
+from io import StringIO
+
+from breezy.sixish import viewitems
 
 from simpletal import simpleTAL, simpleTALES
 
@@ -30,7 +32,8 @@
     tinstance = _zpt_cache.get(tfile)
     stat = os.stat(tfile)
     if tinstance is None or tinstance.stat != stat:
-        text = open(tfile).read()
+        with open(tfile) as tf:
+            text = tf.read()
         text = re.sub(r'\s*\n\s*', '\n', text)
         text = re.sub(r'[ \t]+', ' ', text)
         tinstance = _zpt_cache[tfile] = TemplateWrapper(
@@ -47,17 +50,17 @@
 
     def expand(self, **info):
         context = simpleTALES.Context(allowPythonPath=1)
-        for k, v in info.iteritems():
+        for k, v in viewitems(info):
             context.addGlobal(k, v)
-        s = StringIO.StringIO()
+        s = StringIO()
         self.template.expandInline(context, s)
         return s.getvalue()
 
     def expand_into(self, f, **info):
         context = simpleTALES.Context(allowPythonPath=1)
-        for k, v in info.iteritems():
+        for k, v in viewitems(info):
             context.addGlobal(k, v)
-        self.template.expand(context, f, 'utf-8')
+        self.template.expand(context, f, outputEncoding='utf-8')
 
     @property
     def macros(self):

=== modified file 'loggerheadd'
--- loggerheadd	2009-04-30 10:39:05 +0000
+++ loggerheadd	2019-09-18 16:50:15 +0000
@@ -22,8 +22,8 @@
     SUDO="sudo -H -u $LHUSER"
 fi
 
-# If serve-branches is not in your path, you will need to specify the full path:
-SERVE_BRANCHES_CMD=serve-branches
+# If loggerhead-serve is not in your path, you will need to specify the full path:
+SERVE_BRANCHES_CMD=loggerhead-serve
 
 LOG_FOLDER=/var/log/loggerhead
 LOG_FILE=$LOG_FOLDER/loggerheadd.log
@@ -33,7 +33,7 @@
 #please specify the base directory to serve:
 BZRROOT=/bzrroot
 
-# You can add additional options to serve-branches here:
+# You can add additional options to loggerhead-serve here:
 START_CMD="$SERVE_BRANCHES_CMD --prefix=$URL_PREFIX --log-folder=$LOG_FOLDER --port=$PORT $BZRROOT"
 
 

=== modified file 'setup.py'
--- setup.py	2015-03-17 11:23:13 +0000
+++ setup.py	2019-09-18 16:50:15 +0000
@@ -18,7 +18,7 @@
 
 """Loggerhead is a web viewer for projects in bazaar"""
 
-from distutils.core import setup
+from setuptools import setup
 
 import loggerhead
 
@@ -31,16 +31,15 @@
     maintainer = "Michael Hudson",
     maintainer_email = "[e-mail]",
     scripts = [
-        "serve-branches",
-        "loggerhead.wsgi",
+        "loggerhead-serve",
         ],
     packages = ["loggerhead",
                 "loggerhead/apps",
                 "loggerhead/controllers",
                 "loggerhead/middleware",
                 "loggerhead/templates",
-                "bzrlib.plugins.loggerhead"],
-    package_dir={'bzrlib.plugins.loggerhead':'.'},
+                "breezy.plugins.loggerhead"],
+    package_dir={'breezy.plugins.loggerhead':'.'},
     package_data = {"loggerhead": ["templates/*.pt",
                                    "static/css/*.css",
                                    "static/javascript/*.js",
@@ -68,9 +67,11 @@
                                    "static/javascript/yui/build/yui-base/*",
                                    "static/images/*"]},
     data_files = [
-        ('share/man/man1', ['serve-branches.1']),
+        ('share/man/man1', ['loggerhead-serve.1']),
         ('share/doc/loggerhead', ['apache-loggerhead.conf',
                                   'loggerheadd',
-                                  'bazaar.conf']),
+                                  'breezy.conf']),
         ],
+    install_requires=['simplejson', 'paste', 'bleach'],
+    testsuite='loggerhead.tests.test_suite',
     )