← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Michael Hudson
  • Date: 2009-03-31 15:23:54 UTC
  • Revision ID: michael.hudson@canonical.com-20090331152354-49pk82qw3xup0mad
display nick of merged revisions sensibly

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
36
36
    import bzrlib
37
37
    from bzrlib.api import require_any_api
38
38
 
39
 
    require_any_api(bzrlib, [(1, 11, 0), (1, 13, 0), (1, 15, 0)])
 
39
    require_any_api(bzrlib, [(1, 11, 0), (1, 13, 0)])
40
40
 
41
41
    # TODO: This should provide a new type of server that can be used by bzr
42
42
    # serve, maybe through a registry, rather than overriding the command.  Though
71
71
                import os.path, sys
72
72
                sys.path.append(os.path.dirname(__file__))
73
73
 
74
 
                from loggerhead.apps.transport import BranchesFromTransportRoot
 
74
                from loggerhead.apps.filesystem import BranchesFromFileSystemRoot
75
75
                from paste.httpexceptions import HTTPExceptionHandler
76
76
                from paste.httpserver import serve
77
 
                a = HTTPExceptionHandler(BranchesFromTransportRoot('.'))
 
77
                a = HTTPExceptionHandler(BranchesFromFileSystemRoot('.'))
78
78
                port = kw.get('port', DEFAULT_PORT)
79
79
                # port might be an int already...
80
80
                if isinstance(port, basestring) and ':' in port: