← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-16 12:50:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5979.
  • Revision ID: jelmer@samba.org-20110616125032-zgqiqw430te32584
https://launchpad.net/bugs/739481
Deprecate Repository.iter_reverse_revision_history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
144
144
        self._reconcile_revision_history()
145
145
 
146
146
    def _reconcile_revision_history(self):
147
 
        repo = self.branch.repository
148
147
        last_revno, last_revision_id = self.branch.last_revision_info()
149
148
        real_history = []
 
149
        graph = self.branch.repository.get_graph()
150
150
        try:
151
 
            for revid in repo.iter_reverse_revision_history(
152
 
                    last_revision_id):
 
151
            for revid in graph.iter_lefthand_ancestry(
 
152
                    last_revision_id, (_mod_revision.NULL_REVISION,)):
153
153
                real_history.append(revid)
154
154
        except errors.RevisionNotPresent:
155
155
            pass # Hit a ghost left hand parent