~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:
56
56
        if len(args) > 0:
57
57
            revid = h.fix_revid(args[0])
58
58
        else:
59
 
            revid = None
 
59
            revid = h.last_revid
60
60
        
61
 
        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)
62
69
        sort_type = kw.get('sort', None)
63
70
 
64
71
        try:
65
 
            revid_list, revid = h.get_file_view(revid, file_id)
66
72
            rev = h.get_revision(revid)
67
73
            inv = h.get_inventory(revid)
68
74
        except:
98
104
            'path': path,
99
105
            'updir': updir,
100
106
            'updir_file_id': updir_file_id,
101
 
            'filelist': h.get_filelist(inv, path, sort_type),
 
107
            'filelist': h.get_filelist(inv, file_id, sort_type),
102
108
            'history': h,
103
109
            'posixpath': posixpath,
104
110
            'navigation': navigation,