Merge lp://staging/~brz/loggerhead/breezy into lp://staging/loggerhead
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Merged at revision: | 494 |
Proposed branch: | lp://staging/~brz/loggerhead/breezy |
Merge into: | lp://staging/loggerhead |
Diff against target: |
4166 lines (+984/-812) 66 files modified
.bzrignore (+2/-0) .testr.conf (+4/-0) .travis.yml (+28/-0) MANIFEST.in (+1/-1) Makefile (+1/-1) NEWS (+7/-1) README.rst (+6/-5) __init__.py (+79/-85) byov.conf (+23/-0) docs/index.rst (+22/-21) docs/loggerhead-serve.rst (+5/-5) info.py (+0/-15) loggerhead-serve.1 (+3/-3) loggerhead.wsgi (+12/-7) loggerhead/__init__.py (+2/-11) loggerhead/apps/__init__.py (+1/-1) loggerhead/apps/branch.py (+48/-40) loggerhead/apps/error.py (+1/-1) loggerhead/apps/transport.py (+11/-20) loggerhead/changecache.py (+15/-4) loggerhead/config.py (+2/-2) loggerhead/controllers/__init__.py (+21/-11) loggerhead/controllers/annotate_ui.py (+12/-7) loggerhead/controllers/atom_ui.py (+2/-2) loggerhead/controllers/changelog_ui.py (+8/-6) loggerhead/controllers/diff_ui.py (+5/-5) loggerhead/controllers/directory_ui.py (+14/-12) loggerhead/controllers/download_ui.py (+9/-8) loggerhead/controllers/error_ui.py (+4/-4) loggerhead/controllers/filediff_ui.py (+32/-27) loggerhead/controllers/inventory_ui.py (+43/-30) loggerhead/controllers/revision_ui.py (+8/-7) loggerhead/controllers/revlog_ui.py (+5/-3) loggerhead/controllers/search_ui.py (+3/-3) loggerhead/controllers/view_ui.py (+40/-32) loggerhead/daemon.py (+2/-2) loggerhead/exporter.py (+0/-60) loggerhead/highlight.py (+3/-3) loggerhead/history.py (+70/-56) loggerhead/load_test.py (+11/-7) loggerhead/lsprof.py (+5/-2) loggerhead/main.py (+24/-18) loggerhead/middleware/profile.py (+1/-1) loggerhead/search.py (+3/-3) loggerhead/static/css/global.css (+2/-2) loggerhead/static/css/view.css (+1/-2) loggerhead/templatefunctions.py (+20/-17) loggerhead/templates/directory.pt (+23/-13) loggerhead/templates/inventory.pt (+26/-13) loggerhead/templates/macros.pt (+1/-1) loggerhead/tests/__init__.py (+8/-4) loggerhead/tests/fixtures.py (+1/-1) loggerhead/tests/test_controllers.py (+98/-57) loggerhead/tests/test_corners.py (+7/-5) loggerhead/tests/test_history.py (+70/-69) loggerhead/tests/test_http_head.py (+14/-14) loggerhead/tests/test_load_test.py (+10/-7) loggerhead/tests/test_revision_ui.py (+3/-2) loggerhead/tests/test_simple.py (+27/-23) loggerhead/tests/test_templating.py (+1/-1) loggerhead/tests/test_util.py (+2/-2) loggerhead/util.py (+43/-26) loggerhead/wholehistory.py (+9/-5) loggerhead/zptsupport.py (+9/-6) loggerheadd (+3/-3) setup.py (+8/-7) |
To merge this branch: | bzr merge lp://staging/~brz/loggerhead/breezy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+348498@code.staging.launchpad.net |
Commit message
Switch loggerhead over to using the Breezy rather than Bazaar APIs.
Description of the change
Switch loggerhead over to using the Breezy rather than Bazaar APIs.
To post a comment you must log in.
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.