← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

https://launchpad.net/bugs/819604
Merge the fix for bug #819604 into trunk, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
209
209
    def in_history(self, branch):
210
210
        if branch:
211
211
            if self.wants_revision_history:
212
 
                # TODO: avoid looking at all of history
213
 
                branch.lock_read()
214
 
                try:
215
 
                    graph = branch.repository.get_graph()
216
 
                    revs = list(graph.iter_lefthand_ancestry(
217
 
                        branch.last_revision(), [revision.NULL_REVISION]))
218
 
                finally:
219
 
                    branch.unlock()
220
 
                revs.reverse()
 
212
                revs = branch.revision_history()
221
213
            else:
222
214
                revs = None
223
215
        else: