← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

  • Committer: Michael Hudson
  • Date: 2008-06-18 03:33:29 UTC
  • mto: This revision was merged to the branch mainline in revision 164.
  • Revision ID: michael.hudson@canonical.com-20080618033329-9d2i32vs7hov4ma2
begin a compatibility app

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/revision_ui.py
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
#
19
19
 
20
 
try:
21
 
    import simplejson
22
 
except ImportError:
23
 
    import json as simplejson
24
 
import urllib
 
20
import time
25
21
 
26
22
from paste.httpexceptions import HTTPServerError
 
23
from paste.request import path_info_pop
27
24
 
28
25
from loggerhead import util
29
 
from loggerhead.controllers import TemplatedBranchView
30
 
from loggerhead.controllers.filediff_ui import diff_chunks_for_file
 
26
from loggerhead.templatefunctions import templatefunctions
 
27
from turbosimpletal import TurboZpt
 
28
 
 
29
t = TurboZpt()
 
30
tt = t.load_template('loggerhead.templates.revision')
31
31
 
32
32
 
33
33
DEFAULT_LINE_COUNT_LIMIT = 3000
34
34
 
35
 
def dq(p):
36
 
    return urllib.quote(urllib.quote(p, safe=''))
37
 
 
38
 
 
39
 
class RevisionUI(TemplatedBranchView):
40
 
 
41
 
    template_path = 'loggerhead.templates.revision'
42
 
 
43
 
    def get_values(self, path, kwargs, headers):
44
 
        h = self._history
45
 
        revid = self.get_revid()
46
 
 
47
 
        filter_file_id = kwargs.get('filter_file_id', None)
48
 
        start_revid = h.fix_revid(kwargs.get('start_revid', None))
49
 
        query = kwargs.get('q', None)
50
 
        remember = h.fix_revid(kwargs.get('remember', None))
51
 
        compare_revid = h.fix_revid(kwargs.get('compare_revid', None))
52
 
 
 
35
 
 
36
class RevisionUI (object):
 
37
 
 
38
    def __init__(self, branch):
 
39
        # BranchView object
 
40
        self._branch = branch
 
41
        self.log = branch.log
 
42
 
 
43
    def default(self, request, response):
 
44
        z = time.time()
 
45
        h = self._branch.history
 
46
        kw = request.GET
 
47
        util.set_context(kw)
 
48
        
 
49
        h._branch.lock_read()
53
50
        try:
54
 
            revid, start_revid, revid_list = h.get_view(revid,
55
 
                                                        start_revid,
56
 
                                                        filter_file_id,
57
 
                                                        query)
58
 
        except:
59
 
            self.log.exception('Exception fetching changes')
60
 
            raise HTTPServerError('Could not fetch changes')
61
 
 
62
 
        navigation = util.Container(
63
 
            revid_list=revid_list, revid=revid, start_revid=start_revid,
64
 
            filter_file_id=filter_file_id, pagesize=1,
65
 
            scan_url='/revision', branch=self._branch, feed=True, history=h)
66
 
        if query is not None:
67
 
            navigation.query = query
68
 
        util.fill_in_navigation(navigation)
69
 
 
70
 
        change = h.get_changes([revid])[0]
71
 
 
72
 
        if compare_revid is None:
73
 
            file_changes = h.get_file_changes(change)
74
 
        else:
75
 
            file_changes = h.file_changes_for_revision_ids(
76
 
                compare_revid, change.revid)
77
 
 
78
 
        if path in ('', '/'):
79
 
            path = None
80
 
 
81
 
        link_data = {}
82
 
        path_to_id = {}
83
 
        if path:
84
 
            item = [x for x in file_changes.text_changes if x.filename == path][0]
85
 
            diff_chunks = diff_chunks_for_file(
86
 
                self._history._branch.repository, item.file_id,
87
 
                item.old_revision, item.new_revision)
88
 
        else:
89
 
            diff_chunks = None
90
 
            for i, item in enumerate(file_changes.text_changes):
91
 
                item.index = i
92
 
                link_data['diff-' + str(i)] = '%s/%s/%s' % (
93
 
                    dq(item.new_revision), dq(item.old_revision), dq(item.file_id))
94
 
                path_to_id[item.filename] = 'diff-' + str(i)
95
 
 
96
 
        h.add_branch_nicks(change)
97
 
 
98
 
        if '.' in change.revno:
99
 
            # Walk "up" though the merge-sorted graph until we find a
100
 
            # revision with merge depth 0: this is the revision that merged
101
 
            # this one to mainline.
102
 
            ri = self._history._rev_info
103
 
            i = self._history._rev_indices[change.revid]
104
 
            while ri[i][0][2] > 0:
105
 
                i -= 1
106
 
            merged_in = ri[i][0][3]
107
 
        else:
108
 
            merged_in = None
109
 
 
110
 
        # Directory Breadcrumbs
111
 
        directory_breadcrumbs = (
112
 
            util.directory_breadcrumbs(
113
 
                self._branch.friendly_name,
114
 
                self._branch.is_root,
115
 
                'changes'))
116
 
 
117
 
        return {
118
 
            'branch': self._branch,
119
 
            'revid': revid,
120
 
            'change': change,
121
 
            'file_changes': file_changes,
122
 
            'diff_chunks': diff_chunks,
123
 
            'link_data': simplejson.dumps(link_data),
124
 
            'specific_path': path,
125
 
            'json_specific_path': simplejson.dumps(path),
126
 
            'path_to_id': simplejson.dumps(path_to_id),
127
 
            'start_revid': start_revid,
128
 
            'filter_file_id': filter_file_id,
129
 
            'util': util,
130
 
            'history': h,
131
 
            'merged_in': merged_in,
132
 
            'navigation': navigation,
133
 
            'query': query,
134
 
            'remember': remember,
135
 
            'compare_revid': compare_revid,
136
 
            'url': self._branch.context_url,
137
 
            'directory_breadcrumbs': directory_breadcrumbs,
138
 
        }
 
51
            args = []
 
52
            while 1:
 
53
                arg = path_info_pop(request.environ)
 
54
                if arg is None:
 
55
                    break
 
56
                args.append(arg)
 
57
 
 
58
            if len(args) > 0:
 
59
                revid = h.fix_revid(args[0])
 
60
            else:
 
61
                revid = None
 
62
 
 
63
            filter_file_id = kw.get('filter_file_id', None)
 
64
            start_revid = h.fix_revid(kw.get('start_revid', None))
 
65
            query = kw.get('q', None)
 
66
            remember = kw.get('remember', None)
 
67
            compare_revid = kw.get('compare_revid', None)
 
68
 
 
69
            try:
 
70
                revid, start_revid, revid_list = h.get_view(revid, start_revid, filter_file_id, query)
 
71
            except:
 
72
                self.log.exception('Exception fetching changes')
 
73
                raise HTTPServerError('Could not fetch changes')
 
74
 
 
75
            navigation = util.Container(
 
76
                revid_list=revid_list, revid=revid, start_revid=start_revid,
 
77
                filter_file_id=filter_file_id, pagesize=1,
 
78
                scan_url='/revision', branch=self._branch, feed=True)
 
79
            if query is not None:
 
80
                navigation.query = query
 
81
            util.fill_in_navigation(navigation)
 
82
 
 
83
            change = h.get_change_with_diff(revid, compare_revid)
 
84
            # add parent & merge-point branch-nick info, in case it's useful
 
85
            h.get_branch_nicks([ change ])
 
86
 
 
87
            line_count_limit = DEFAULT_LINE_COUNT_LIMIT
 
88
            line_count = 0
 
89
            for file in change.changes.modified:
 
90
                for chunk in file.chunks:
 
91
                    line_count += len(chunk.diff)
 
92
 
 
93
            # let's make side-by-side diff be the default
 
94
            side_by_side = not kw.get('unified', False)
 
95
            if side_by_side:
 
96
                h.add_side_by_side([ change ])
 
97
 
 
98
            vals = {
 
99
                'branch': self._branch,
 
100
                'revid': revid,
 
101
                'change': change,
 
102
                'start_revid': start_revid,
 
103
                'filter_file_id': filter_file_id,
 
104
                'util': util,
 
105
                'history': h,
 
106
                'navigation': navigation,
 
107
                'query': query,
 
108
                'remember': remember,
 
109
                'compare_revid': compare_revid,
 
110
                'side_by_side': side_by_side,
 
111
                'url': self._branch.context_url,
 
112
                'line_count': line_count,
 
113
                'line_count_limit': line_count_limit,
 
114
                'show_plain_diffs': line_count > line_count_limit,
 
115
            }
 
116
            vals.update(templatefunctions)
 
117
            self.log.info('/revision: %r seconds' % (time.time() - z,))
 
118
            response.headers['Content-Type'] = 'text/html'
 
119
            tt.expand_(response, **vals)
 
120
        finally:
 
121
            h._branch.unlock()