← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/apps/branch.py

  • Committer: Martin Albisetti
  • Date: 2008-08-14 22:45:52 UTC
  • mfrom: (212 trunk)
  • mto: (157.1.5 loggerhead)
  • mto: This revision was merged to the branch mainline in revision 423.
  • Revision ID: argentina@gmail.com-20080814224552-1wfbdgvsfo2h2469
Merge from trunk, resolved a gazillion conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/branch.py
17
17
from loggerhead.controllers.atom_ui import AtomUI
18
18
from loggerhead.controllers.download_ui import DownloadUI
19
19
from loggerhead.controllers.search_ui import SearchUI
 
20
from loggerhead.controllers.diff_ui import DiffUI
20
21
from loggerhead.history import History
21
22
from loggerhead import util
22
23
 
23
24
 
24
25
class BranchWSGIApp(object):
25
26
 
26
 
    def __init__(self, branch, friendly_name=None, config={}, graph_cache=None):
 
27
    def __init__(self, branch, friendly_name=None, config={},
 
28
                 graph_cache=None, branch_link=None):
27
29
        self.branch = branch
28
30
        self._config = config
29
31
        self.friendly_name = friendly_name
 
32
        self.branch_link = branch_link  # Currently only used in Launchpad
30
33
        self.log = logging.getLogger('loggerhead.%s' % (friendly_name,))
31
34
        if graph_cache is None:
32
35
            graph_cache = bzrlib.lru_cache.LRUCache()
76
79
        'download': DownloadUI,
77
80
        'atom': AtomUI,
78
81
        'search': SearchUI,
 
82
        'diff': DiffUI,
79
83
        }
80
84
 
81
85
    def last_updated(self):