← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/inventory_ui.py

  • Committer: Michael Hudson
  • Date: 2007-07-04 11:44:22 UTC
  • mfrom: (128.1.39 testing)
  • Revision ID: michael.hudson@canonical.com-20070704114422-77n0yamvzpd3ddhi
merge in a lot of changes from my development branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/inventory_ui.py
25
25
import time
26
26
 
27
27
import turbogears
28
 
from cherrypy import HTTPRedirect, session
 
28
from cherrypy import InternalError, session
29
29
 
30
30
from loggerhead import util
31
31
 
46
46
        self._branch = branch
47
47
        self.log = branch.log
48
48
 
 
49
    @util.strip_whitespace
49
50
    @turbogears.expose(html='loggerhead.templates.inventory')
50
51
    def default(self, *args, **kw):
51
52
        z = time.time()
52
53
        h = self._branch.get_history()
 
54
        util.set_context(kw)
53
55
        
54
56
        if len(args) > 0:
55
57
            revid = h.fix_revid(args[0])
56
58
        else:
57
 
            revid = None
 
59
            revid = h.last_revid
58
60
        
59
 
        file_id = kw.get('file_id', None)
 
61
        try:
 
62
            rev = h.get_revision(revid)
 
63
            inv = h.get_inventory(revid)
 
64
        except:
 
65
            self.log.exception('Exception fetching changes')
 
66
            raise InternalError('Could not fetch changes')
 
67
 
 
68
        file_id = kw.get('file_id', inv.root.file_id)
60
69
        sort_type = kw.get('sort', None)
61
70
 
62
71
        try:
63
 
            revid_list, revid = h.get_file_view(revid, file_id)
64
72
            rev = h.get_revision(revid)
65
73
            inv = h.get_inventory(revid)
66
 
        except Exception, x:
67
 
            self.log.error('Exception fetching changes: %s' % (x,))
68
 
            util.log_exception(self.log)
69
 
            raise HTTPRedirect(self._branch.url('/changes'))
 
74
        except:
 
75
            self.log.exception('Exception fetching changes')
 
76
            raise InternalError('Could not fetch changes')
70
77
 
71
78
        # no navbar for revisions
72
79
        navigation = util.Container()
97
104
            'path': path,
98
105
            'updir': updir,
99
106
            'updir_file_id': updir_file_id,
100
 
            'filelist': h.get_filelist(inv, path, sort_type),
 
107
            'filelist': h.get_filelist(inv, file_id, sort_type),
101
108
            'history': h,
102
109
            'posixpath': posixpath,
103
110
            'navigation': navigation,