← Back to branch summary

~mnordhoff/loggerhead/cheezum

« back to all changes in this revision

Viewing changes to loggerhead/apps/transport.py

  • Committer: John Arbash Meinel
  • Date: 2010-04-26 18:17:26 UTC
  • mto: (164.152.1 all)
  • mto: This revision was merged to the branch mainline in revision 465.
  • Revision ID: john@arbash-meinel.com-20100426181726-qvz8oroi9dxqk6ck
Turn show_merge_points into a config setting.

Today it doesn't cost a whole lot, but with the caching changes, it will
start to cost a bit more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/transport.py
1
 
# Copyright (C) 2008, 2009 Canonical Ltd.
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
import threading
20
20
 
21
 
from bzrlib import branch, errors, lru_cache, urlutils
 
21
from bzrlib import branch, errors, lru_cache, ui, urlutils
22
22
from bzrlib.config import LocationConfig
23
23
from bzrlib.smart import request
24
24
from bzrlib.transport import get_transport
55
55
        else:
56
56
            name = self.name
57
57
            is_root = False
 
58
        show_merge_points = self._config.get_option('show_merge_points')
 
59
        show_merge_points = ui.bool_from_string(show_merge_points)
 
60
        if show_merge_points is None:
 
61
            show_merge_points = True
58
62
        branch_app = BranchWSGIApp(
59
63
            branch,
60
64
            name,
61
 
            {'cachepath': self._config.SQL_DIR},
 
65
            {'cachepath': self._config.SQL_DIR,
 
66
             'show_merge_points': show_merge_points},
62
67
            self.root.graph_cache,
63
68
            is_root=is_root,
64
69
            use_cdn=self._config.get_option('use_cdn'),