← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 329.1.9.

Committer: Matt Nordhoff
Date: 2009-04-30 10:27:43 UTC
mfrom: (334 trunk)
mto: (389.2.2 pep8-2009-10)
mto: This revision was merged to the branch mainline in revision 392.
Revision ID: mnordhoff@mattnordhoff.com-20090430102743-76rqdslvx4f8y1up

Merge trunk, fixing conflicts.

files added:
loggerhead.conf.example

loggerhead/apps/config.py

loggerhead/templates/browse.pt

loggerhead/trace.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

files removed:
HACKING

apache-loggerhead.conf

bazaar.conf

docs

docs/Makefile

docs/_build

docs/_static

docs/_templates

docs/conf.py

docs/index.rst

docs/make.bat

docs/serve-branches.rst

info.py

load_test_scripts

load_test_scripts/multiple_instances.script

load_test_scripts/simple.script

loggerhead.wsgi

loggerhead/apps/http_head.py

loggerhead/controllers/annotate_ui.py

loggerhead/exporter.py

loggerhead/load_test.py

loggerhead/static/downloads

loggerhead/static/images/favicon.png

loggerhead/static/images/ico_bug.png

loggerhead/static/images/ico_tag.gif

loggerhead/static/images/notification-private.png

loggerhead/tests/fixtures.py

loggerhead/tests/test_history.py

loggerhead/tests/test_http_head.py

loggerhead/tests/test_load_test.py

loggerhead/tests/test_revision_ui.py

loggerhead/tests/test_util.py

serve-branches

files renamed:
README => README.txt

loggerhead/apps/transport.py => loggerhead/apps/filesystem.py

loggerhead/controllers/view_ui.py => loggerhead/controllers/annotate_ui.py

loggerhead/static/css/view.css => loggerhead/static/css/annotate.css

loggerhead/templates/view.pt => loggerhead/templates/annotate.pt

loggerhead/main.py => serve-branches *

files modified:
.bzrignore

MANIFEST.in

Makefile

NEWS

__init__.py

loggerhead/__init__.py

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/error.py

loggerhead/changecache.py

loggerhead/config.py

loggerhead/controllers/__init__.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/diff_ui.py

loggerhead/controllers/directory_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/error_ui.py

loggerhead/controllers/filediff_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/controllers/revlog_ui.py

loggerhead/daemon.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/lsprof.py

loggerhead/middleware/profile.py

loggerhead/static/css/diff.css

loggerhead/static/css/files.css

loggerhead/static/css/global.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/static/javascript/custom.js

loggerhead/templatefunctions.py

loggerhead/templates/atom.pt

loggerhead/templates/branchinfo.pt

loggerhead/templates/breadcrumbs.pt

loggerhead/templates/changelog.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisionfilechanges.pt

loggerhead/templates/revisioninfo.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_simple.py

loggerhead/util.py

loggerhead/wholehistory.py

loggerhead/zptsupport.py

loggerheadd

setup.py *

Show diffs side-by-side

added added

removed removed

apache-loggerhead.conf

docs/_templates/

docs/serve-branches.rst

load_test_scripts/

load_test_scripts/multiple_instances.script

load_test_scripts/simple.script

loggerhead.conf.example

loggerhead.wsgi

loggerhead/__init__.py

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/error.py

loggerhead/apps/filesystem.py

loggerhead/apps/http_head.py

loggerhead/changecache.py

loggerhead/config.py

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/atom_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/diff_ui.py

loggerhead/controllers/directory_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/error_ui.py

loggerhead/controllers/filediff_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/controllers/revlog_ui.py

loggerhead/daemon.py

loggerhead/exporter.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/load_test.py

loggerhead/lsprof.py

loggerhead/middleware/profile.py

loggerhead/static/css/annotate.css

loggerhead/static/css/diff.css

loggerhead/static/css/files.css

loggerhead/static/css/global.css

loggerhead/static/downloads/

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/static/images/favicon.png

loggerhead/static/images/ico_bug.png

loggerhead/static/images/ico_tag.gif

loggerhead/static/images/notification-private.png

loggerhead/static/javascript/custom.js

loggerhead/templatefunctions.py

loggerhead/templates/annotate.pt

loggerhead/templates/atom.pt

loggerhead/templates/branchinfo.pt

loggerhead/templates/breadcrumbs.pt

loggerhead/templates/browse.pt

loggerhead/templates/changelog.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisionfilechanges.pt

loggerhead/templates/revisioninfo.pt

loggerhead/tests/__init__.py

loggerhead/tests/fixtures.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_history.py

loggerhead/tests/test_http_head.py

loggerhead/tests/test_load_test.py

loggerhead/tests/test_revision_ui.py

loggerhead/tests/test_simple.py

loggerhead/tests/test_util.py

loggerhead/trace.py

loggerhead/util.py

loggerhead/wholehistory.py

loggerhead/zptsupport.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

Older »