← 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: Martin Albisetti
  • Date: 2008-08-05 05:12:49 UTC
  • mfrom: (193 trunk)
  • mto: This revision was merged to the branch mainline in revision 194.
  • Revision ID: argentina@gmail.com-20080805051249-u3417a8anzigqfr0
Merge from trunk

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 datetime
21
 
import logging
22
 
import os
23
 
import textwrap
24
 
import time
25
 
 
26
 
import turbogears
27
 
from cherrypy import InternalError, session
 
20
from paste.httpexceptions import HTTPServerError
28
21
 
29
22
from loggerhead import util
30
 
 
31
 
 
32
 
class RevisionUI (object):
33
 
 
34
 
    def __init__(self, branch):
35
 
        # BranchView object
36
 
        self._branch = branch
37
 
        self.log = branch.log
38
 
    
39
 
#    @util.lsprof
40
 
    @util.strip_whitespace
41
 
    @turbogears.expose(html='loggerhead.templates.revision')
42
 
    def default(self, *args, **kw):
43
 
        z = time.time()
44
 
        h = self._branch.get_history()
45
 
        util.set_context(kw)
46
 
        
 
23
from loggerhead.controllers import TemplatedBranchView
 
24
 
 
25
 
 
26
DEFAULT_LINE_COUNT_LIMIT = 3000
 
27
 
 
28
 
 
29
class RevisionUI(TemplatedBranchView):
 
30
 
 
31
    template_path = 'loggerhead.templates.revision'
 
32
 
 
33
    def get_values(self, h, args, kw, headers):
 
34
 
47
35
        if len(args) > 0:
48
36
            revid = h.fix_revid(args[0])
49
37
        else:
50
38
            revid = None
51
 
        
52
 
        file_id = kw.get('file_id', None)
 
39
 
 
40
        filter_file_id = kw.get('filter_file_id', None)
53
41
        start_revid = h.fix_revid(kw.get('start_revid', None))
54
42
        query = kw.get('q', None)
55
 
        remember = kw.get('remember', None)
56
 
        compare_revid = kw.get('compare_revid', None)
57
 
        
 
43
        remember = h.fix_revid(kw.get('remember', None))
 
44
        compare_revid = h.fix_revid(kw.get('compare_revid', None))
 
45
 
58
46
        try:
59
 
            revid, start_revid, revid_list = h.get_view(revid, start_revid, file_id, query)
 
47
            revid, start_revid, revid_list = h.get_view(revid, start_revid, filter_file_id, query)
60
48
        except:
61
49
            self.log.exception('Exception fetching changes')
62
 
            raise InternalError('Could not fetch changes')
63
 
        
64
 
        navigation = util.Container(revid_list=revid_list, revid=revid, start_revid=start_revid, file_id=file_id,
65
 
                                    pagesize=1, scan_url='/revision', branch=self._branch, feed=True)
 
50
            raise HTTPServerError('Could not fetch changes')
 
51
 
 
52
        navigation = util.Container(
 
53
            revid_list=revid_list, revid=revid, start_revid=start_revid,
 
54
            filter_file_id=filter_file_id, pagesize=1,
 
55
            scan_url='/revision', branch=self._branch, feed=True, history=h)
66
56
        if query is not None:
67
57
            navigation.query = query
68
 
        util.fill_in_navigation(h, navigation)
 
58
        util.fill_in_navigation(navigation)
69
59
 
70
 
        if compare_revid is not None:
71
 
            change = h.get_diff(compare_revid, revid)
72
 
        else:
73
 
            change = h.get_changes([ revid ], get_diffs=True)[0]
 
60
        change = h.get_change_with_diff(revid, compare_revid)
74
61
        # add parent & merge-point branch-nick info, in case it's useful
75
62
        h.get_branch_nicks([ change ])
76
63
 
 
64
        line_count_limit = DEFAULT_LINE_COUNT_LIMIT
 
65
        line_count = 0
 
66
        for file in change.changes.modified:
 
67
            for chunk in file.chunks:
 
68
                line_count += len(chunk.diff)
 
69
 
77
70
        # let's make side-by-side diff be the default
78
71
        side_by_side = not kw.get('unified', False)
79
72
        if side_by_side:
80
73
            h.add_side_by_side([ change ])
81
 
        
82
 
        vals = {
 
74
 
 
75
        return {
83
76
            'branch': self._branch,
84
77
            'revid': revid,
85
78
            'change': change,
86
79
            'start_revid': start_revid,
87
 
            'file_id': file_id,
 
80
            'filter_file_id': filter_file_id,
88
81
            'util': util,
89
82
            'history': h,
90
83
            'navigation': navigation,
92
85
            'remember': remember,
93
86
            'compare_revid': compare_revid,
94
87
            'side_by_side': side_by_side,
 
88
            'url': self._branch.context_url,
 
89
            'line_count': line_count,
 
90
            'line_count_limit': line_count_limit,
 
91
            'show_plain_diffs': line_count > line_count_limit,
95
92
        }
96
 
        h.flush_cache()
97
 
        self.log.info('/revision: %r seconds' % (time.time() - z,))
98
 
        return vals