Merge lp:~richard-wilbur/trac-bzr/fix-2.6.0 into lp:trac-bzr

[Richard Wilbur]

Use fix for deprecated method repo.get_ancestry from James Teh. lp:1165948

[Richard Wilbur (richard-wilbur)]

Cherry-picked fix for repo.get_ancestry from James Teh's branch since everything else on that branch has been merged into trunk.
+1

review: Approve

=== modified file 'NEWS'
--- NEWS	2014-04-05 04:52:28 +0000
+++ NEWS	2014-04-15 07:58:45 +0000
@@ -5,6 +5,7 @@
 unreleased
 ==========
 
+- Further update for bzr 2.6 (`#1165948`_, thanks to James Teh)
 - Update for bzr 2.6 (as per bug `#739481`_). (`#1165948`_, thanks to treaves)
 - Renders bug URLs as links (`#512733`_, thanks to Oleg Frantsuzov)
 - Improve handling of non-ascii file names (`#675014`_)

=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2014-02-13 23:45:40 +0000
+++ tracbzr/backend.py	2014-04-15 07:58:45 +0000
@@ -87,6 +87,7 @@
     osutils,
     revision,
     transport,
+    tsort,
     urlutils,
 )
 import bzrlib.api
@@ -1485,7 +1486,8 @@
         """Lazily fill cache only when needed."""
         if self.revcache is None:
             revid = self.revisiontree.get_revision_id()
-            ancestry = self.branch.repository.get_ancestry(revid)
+            ancestry = tsort.topo_sort(dict(
+                self.branch.repository.get_graph().iter_ancestry([revid])))
             ancestry.reverse()
             ancestry_idx = dict((r, n) for n, r in enumerate(ancestry))
             self.revcache = {}