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
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.
lp://staging/~brz/loggerhead/breezy updated
506. By Jelmer Vernooij

Add travis config.

507. By Jelmer Vernooij

Install simpletal from homepage.

508. By Jelmer Vernooij

s/Bazaar/Breezy.

509. By Jelmer Vernooij

s/Bazaar/Breezy/.

510. By Jelmer Vernooij

s/bazaar.conf/breezy.conf.

511. By Jelmer Vernooij

Fix local path serving in serve-branches.

512. By Jelmer Vernooij

Use bool_from_string.

513. By Jelmer Vernooij

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

514. By Jelmer Vernooij

Determine public URL for branching from request URL.

515. By Jelmer Vernooij

Some fixes for working with git trees.

516. By Jelmer Vernooij

Fix remaining tests.

517. By Jelmer Vernooij

Use more standard breezy infrastructure.

518. By Jelmer Vernooij

Merge support for more columns.

519. By Jelmer Vernooij

Remove python path hackery.

520. By Jelmer Vernooij

Use setuptools.

521. By Jelmer Vernooij

Some python3 porting work.

522. By Jelmer Vernooij

Avoid using cStringIO.

523. By Jelmer Vernooij

Fix some more import errors.

524. By Jelmer Vernooij

Use bleach rather than simpleTAL's HTMLStructureCleaner.

525. By Jelmer Vernooij

More python3 porting work.

526. By Jelmer Vernooij

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

527. By Jelmer Vernooij

Fix relative import.

528. By Jelmer Vernooij

More python3 porting work.

529. By Jelmer Vernooij

More python 3 work; down to 16 failing tests.

530. By Jelmer Vernooij

More python3 porting.

531. By Jelmer Vernooij

Fix some more tests on Python 3.

532. By Jelmer Vernooij

More python 3 fixes.

533. By Jelmer Vernooij

Finish python 3 port.

534. By Jelmer Vernooij

Run tests on python 3.

535. By Jelmer Vernooij

Add NEWS, drop info.py.

536. By Jelmer Vernooij

Rename serve-branches to loggerhead-serve.

537. By Jelmer Vernooij

Add dependency on bleach.

538. By Jelmer Vernooij

Fix loading when loggerhead is installed separately.

539. By Jelmer Vernooij

Don't unnecessarily encode paths.

540. By Jelmer Vernooij

Fix use of urllib.unquote.

541. By Jelmer Vernooij

Avoid use of file_ids.

542. By Jelmer Vernooij

Merge trunk.

543. By Jelmer Vernooij

Drop python 3.4 support on travis.

544. By Jelmer Vernooij

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

545. By Jelmer Vernooij

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

546. By Jelmer Vernooij

Add byov.conf.

547. By Vincent Ladeuil

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

548. By Jelmer Vernooij

Install simpletal from the webz.

549. By Jelmer Vernooij

Add missing dependency on six in byov.conf.

550. By Jelmer Vernooij

Add dependency on fixtures.

551. By Jelmer Vernooij

Fix compatibility with newer versions of breezy.

Revision history for this message
Colin Watson (cjwatson) wrote :

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://staging/~brz/loggerhead/breezy updated
552. By Jelmer Vernooij

Merge breezy changes.

553. By Jelmer Vernooij

Review comments.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

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

Revision history for this message
Colin Watson (cjwatson) wrote :

Landed. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches