← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
235
235
                excludes = set()
236
236
            else:
237
237
                # revno is 1 based, so -2 to get back 1 less.
238
 
                excludes = set(branch.get_ancestry(revision_history[revno - 2]))
 
238
                storage = branch.storage
 
239
                excludes = storage.get_ancestry(revision_history[revno - 2])
 
240
                excludes = set(excludes)
239
241
            pending = list(rev.parent_ids)
240
242
            while pending:
241
243
                rev_id = pending.pop()