~jameinel/loggerhead/integration

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

  • Committer: John Arbash Meinel
  • Date: 2010-05-04 21:55:04 UTC
  • mfrom: (411.6.11 history_db)
  • Revision ID: john@arbash-meinel.com-20100504215504-8s42wbxj7hvljkde
Merge the latest history-db fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
98
        merged_in = self._history.get_merged_in(change)
109
99
 
110
100
        # Directory Breadcrumbs
111
101
        directory_breadcrumbs = (