← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/loggerhead/oneiric

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, Max Bowsher
  • Date: 2010-12-18 14:43:23 UTC
  • mfrom: (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101218144323-crnmzzz80vi8enlk
Tags: 1.18-1
http://bugs.debian.org/605653
[ Max Bowsher ]
* New upstream release.
 + Depends on bzr >= 1.17. Closes: #605653
* Remove remnants of patching to use the system YUI, which actually broke
  the use of YUI entirely. Loggerhead requires YUI 3, which is
  not packaged yet. Until it is, include YUI.

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