← 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: 2009-03-31 22:11:59 UTC
  • mfrom: (316.1.5 js-cleanup)
  • Revision ID: michael.hudson@canonical.com-20090331221159-90iy9rqcwr0317lx
reorganize animation javascript to be saner and smoother

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
 
import time
 
20
try:
 
21
    import simplejson
 
22
except ImportError:
 
23
    import json as simplejson
 
24
import urllib
21
25
 
22
26
from paste.httpexceptions import HTTPServerError
23
 
from paste.request import path_info_pop
24
27
 
25
28
from loggerhead import util
26
 
from loggerhead.templatefunctions import templatefunctions
27
 
from loggerhead.zptsupport import load_template
 
29
from loggerhead.controllers import TemplatedBranchView
 
30
from loggerhead.controllers.filediff_ui import diff_chunks_for_file
28
31
 
29
32
 
30
33
DEFAULT_LINE_COUNT_LIMIT = 3000
31
34
 
32
 
 
33
 
class RevisionUI (object):
34
 
 
35
 
    def __init__(self, branch):
36
 
        # BranchView object
37
 
        self._branch = branch
38
 
        self.log = branch.log
39
 
 
40
 
    def default(self, request, response):
41
 
        z = time.time()
42
 
        h = self._branch.history
43
 
        kw = request.GET
44
 
        util.set_context(kw)
45
 
        
46
 
        h._branch.lock_read()
 
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
 
47
53
        try:
48
 
            args = []
49
 
            while 1:
50
 
                arg = path_info_pop(request.environ)
51
 
                if arg is None:
52
 
                    break
53
 
                args.append(arg)
54
 
 
55
 
            if len(args) > 0:
56
 
                revid = h.fix_revid(args[0])
57
 
            else:
58
 
                revid = None
59
 
 
60
 
            filter_file_id = kw.get('filter_file_id', None)
61
 
            start_revid = h.fix_revid(kw.get('start_revid', None))
62
 
            query = kw.get('q', None)
63
 
            remember = kw.get('remember', None)
64
 
            compare_revid = kw.get('compare_revid', None)
65
 
 
66
 
            try:
67
 
                revid, start_revid, revid_list = h.get_view(revid, start_revid, filter_file_id, query)
68
 
            except:
69
 
                self.log.exception('Exception fetching changes')
70
 
                raise HTTPServerError('Could not fetch changes')
71
 
 
72
 
            navigation = util.Container(
73
 
                revid_list=revid_list, revid=revid, start_revid=start_revid,
74
 
                filter_file_id=filter_file_id, pagesize=1,
75
 
                scan_url='/revision', branch=self._branch, feed=True)
76
 
            if query is not None:
77
 
                navigation.query = query
78
 
            util.fill_in_navigation(navigation)
79
 
 
80
 
            change = h.get_change_with_diff(revid, compare_revid)
81
 
            # add parent & merge-point branch-nick info, in case it's useful
82
 
            h.get_branch_nicks([ change ])
83
 
 
84
 
            line_count_limit = DEFAULT_LINE_COUNT_LIMIT
85
 
            line_count = 0
86
 
            for file in change.changes.modified:
87
 
                for chunk in file.chunks:
88
 
                    line_count += len(chunk.diff)
89
 
 
90
 
            # let's make side-by-side diff be the default
91
 
            side_by_side = not kw.get('unified', False)
92
 
            if side_by_side:
93
 
                h.add_side_by_side([ change ])
94
 
 
95
 
            vals = {
96
 
                'branch': self._branch,
97
 
                'revid': revid,
98
 
                'change': change,
99
 
                'start_revid': start_revid,
100
 
                'filter_file_id': filter_file_id,
101
 
                'util': util,
102
 
                'history': h,
103
 
                'navigation': navigation,
104
 
                'query': query,
105
 
                'remember': remember,
106
 
                'compare_revid': compare_revid,
107
 
                'side_by_side': side_by_side,
108
 
                'url': self._branch.context_url,
109
 
                'line_count': line_count,
110
 
                'line_count_limit': line_count_limit,
111
 
                'show_plain_diffs': line_count > line_count_limit,
112
 
            }
113
 
            vals.update(templatefunctions)
114
 
            self.log.info('/revision: %r seconds' % (time.time() - z,))
115
 
            response.headers['Content-Type'] = 'text/html'
116
 
            template = load_template('loggerhead.templates.revision')
117
 
            template.expand_into(response, **vals)
118
 
        finally:
119
 
            h._branch.unlock()
 
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
        # Directory Breadcrumbs
 
99
        directory_breadcrumbs = (
 
100
            util.directory_breadcrumbs(
 
101
                self._branch.friendly_name,
 
102
                self._branch.is_root,
 
103
                'changes'))
 
104
 
 
105
        return {
 
106
            'branch': self._branch,
 
107
            'revid': revid,
 
108
            'change': change,
 
109
            'file_changes': file_changes,
 
110
            'diff_chunks': diff_chunks,
 
111
            'link_data': simplejson.dumps(link_data),
 
112
            'specific_path': path,
 
113
            'json_specific_path': simplejson.dumps(path),
 
114
            'path_to_id': simplejson.dumps(path_to_id),
 
115
            'start_revid': start_revid,
 
116
            'filter_file_id': filter_file_id,
 
117
            'util': util,
 
118
            'history': h,
 
119
            'navigation': navigation,
 
120
            'query': query,
 
121
            'remember': remember,
 
122
            'compare_revid': compare_revid,
 
123
            'url': self._branch.context_url,
 
124
            'directory_breadcrumbs': directory_breadcrumbs,
 
125
        }