← Back to branch summary

~jelmer/loggerhead/breezy-compat

« back to all changes in this revision

Viewing changes to loggerhead/templatefunctions.py

  • Committer: Colin Watson
  • Date: 2019-09-19 08:10:36 UTC
  • mfrom: (491.2.62 breezy)
  • Revision ID: cjwatson@canonical.com-20190919081036-q1symc2h2iedtlh3
[r=cjwatson] Switch loggerhead over to using the Breezy rather than Bazaar APIs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templatefunctions.py
15
15
#
16
16
 
17
17
import os
18
 
import urllib
19
18
 
20
19
import pkg_resources
21
20
 
22
 
import bzrlib
 
21
import breezy
 
22
from breezy import urlutils
23
23
 
24
 
import loggerhead
25
 
from loggerhead.zptsupport import zpt
26
 
from loggerhead.util import html_format
 
24
from . import (
 
25
    __version__,
 
26
    __revision__,
 
27
    )
 
28
from .zptsupport import zpt
 
29
from .util import html_format
27
30
 
28
31
 
29
32
templatefunctions = {}
52
55
            if currently_showing and filename == currently_showing:
53
56
                return html_format(
54
57
                    '<b><a href="#%s">%s</a></b>',
55
 
                    urllib.quote(filename.encode('utf-8')), filename)
 
58
                    urlutils.quote(filename), filename)
56
59
            else:
57
60
                return revision_link(
58
61
                    url, entry.revno, filename,
59
 
                    '#' + urllib.quote(filename.encode('utf-8')))
 
62
                    '#' + urlutils.quote(filename))
60
63
    else:
61
64
        def file_link(filename):
62
65
            return html_format(
63
66
                '<a href="%s%s" title="View changes to %s in revision %s">'
64
67
                '%s</a>',
65
68
                url(['/revision', entry.revno]),
66
 
                '#' + urllib.quote(filename.encode('utf-8')),
 
69
                '#' + urlutils.quote(filename),
67
70
                filename, entry.revno, filename)
68
71
    return _pt('revisionfilechanges').expand(
69
72
        entry=entry, file_changes=file_changes, file_link=file_link, **templatefunctions)
71
74
 
72
75
@templatefunc
73
76
def revisioninfo(url, branch, entry, file_changes=None, currently_showing=None, merged_in=None):
74
 
    from loggerhead import util
 
77
    from . import util
75
78
    return _pt('revisioninfo').expand(
76
79
        url=url, change=entry, branch=branch, util=util,
77
80
        file_changes=file_changes, currently_showing=currently_showing,
142
145
 
143
146
@templatefunc
144
147
def loggerhead_version():
145
 
    return loggerhead.__version__
146
 
    
 
148
    return __version__
 
149
 
147
150
@templatefunc
148
151
def loggerhead_revision():
149
 
    return loggerhead.__revision__
 
152
    return __revision__
150
153
 
151
154
_cached_generator_string = None
152
155
 
159
162
        # TODO: Errors -- e.g. from a missing/invalid __version__ attribute, or
160
163
        # ValueError accessing Distribution.version -- should be non-fatal.
161
164
 
162
 
        versions.append(('Loggerhead', loggerhead.__version__))
 
165
        versions.append(('Loggerhead', __version__))
163
166
 
164
167
        import sys
165
 
        python_version = bzrlib._format_version_tuple(sys.version_info)
 
168
        python_version = breezy._format_version_tuple(sys.version_info)
166
169
        versions.append(('Python', python_version))
167
170
 
168
 
        versions.append(('Bazaar', bzrlib.__version__))
 
171
        versions.append(('Breezy', breezy.__version__))
169
172
 
170
173
        Paste = pkg_resources.get_distribution('Paste')
171
174
        versions.append(('Paste', Paste.version))
188
191
            versions.append(('Pygments', pygments.__version__))
189
192
 
190
193
        try:
191
 
            from bzrlib.plugins import search
 
194
            from breezy.plugins import search
192
195
        except ImportError:
193
196
            pass
194
197
        else:
195
 
            bzr_search_version = bzrlib._format_version_tuple(
 
198
            bzr_search_version = breezy._format_version_tuple(
196
199
                search.version_info)
197
200
            versions.append(('bzr-search', bzr_search_version))
198
201