← 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: Matt Nordhoff
  • Date: 2009-10-21 13:21:02 UTC
  • Revision ID: mnordhoff@mattnordhoff.com-20091021132102-t9zuspd8y52u8klr
Mention bug #348308 in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/revision_ui.py
95
95
 
96
96
        h.add_branch_nicks(change)
97
97
 
 
98
        if '.' in change.revno:
 
99
            # Walk "up" though the merge-sorted graph until we find a
 
100
            # revision with merge depth 0: this is the revision that merged
 
101
            # this one to mainline.
 
102
            ri = self._history._rev_info
 
103
            i = self._history._rev_indices[change.revid]
 
104
            while ri[i][0][2] > 0:
 
105
                i -= 1
 
106
            merged_in = ri[i][0][3]
 
107
        else:
 
108
            merged_in = None
 
109
 
98
110
        # Directory Breadcrumbs
99
111
        directory_breadcrumbs = (
100
112
            util.directory_breadcrumbs(
116
128
            'filter_file_id': filter_file_id,
117
129
            'util': util,
118
130
            'history': h,
 
131
            'merged_in': merged_in,
119
132
            'navigation': navigation,
120
133
            'query': query,
121
134
            'remember': remember,