← 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: Robey Pointer
  • Date: 2007-01-21 00:05:52 UTC
  • Revision ID: robey@lag.net-20070121000552-laswr1ffqh030uge
big checkpoint commit.  added some functions to util for tracking browsing
context (those key=value params to urls) since there are already a few and
now i'm adding some more: 'remember' and 'compare_revid'.

'remember' is a remembered revision_id that gets carried around if you click
on a "compare this revision to another revision" link on the revision page.
afterwards, whenever you're on a revision page, you can click "compare to
revision [x]" and it will switch 'remember' to 'compare_revid' and show the
revision page with a diff as compared to the remembered revision.  this is
to allow arbitrary diffs.  i'm not sure the ui is great, though.

bundle is also hooked up this way, so you can download an arbitrary bundle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/revision_ui.py
35
35
        # BranchView object
36
36
        self._branch = branch
37
37
        self.log = branch.log
38
 
 
 
38
        
39
39
    @util.strip_whitespace
40
40
    @turbogears.expose(html='loggerhead.templates.revision')
41
41
    def default(self, *args, **kw):
42
42
        z = time.time()
43
43
        h = self._branch.get_history()
 
44
        util.set_context(kw)
44
45
        
45
46
        if len(args) > 0:
46
47
            revid = h.fix_revid(args[0])
50
51
        file_id = kw.get('file_id', None)
51
52
        start_revid = h.fix_revid(kw.get('start_revid', None))
52
53
        query = kw.get('q', None)
 
54
        remember = kw.get('remember', None)
 
55
        compare_revid = kw.get('compare_revid', None)
53
56
        
54
57
        try:
55
58
            revid, start_revid, revid_list = h.get_view(revid, start_revid, file_id, query)
64
67
            navigation.query = query
65
68
        util.fill_in_navigation(h, navigation)
66
69
 
67
 
        change = h.get_changes([ revid ], get_diffs=True)[0]
 
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]
68
74
        # add parent & merge-point branch-nick info, in case it's useful
69
75
        h.get_branch_nicks([ change ])
70
76
 
83
89
            'history': h,
84
90
            'navigation': navigation,
85
91
            'query': query,
 
92
            'remember': remember,
 
93
            'compare_revid': compare_revid,
86
94
            'side_by_side': side_by_side,
87
95
        }
88
96
        h.flush_cache()