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

Proposed by Richard Wilbur on 2014-04-15
Status: Merged
Approved by: Richard Wilbur on 2014-04-15
Approved revision: 131
Merged at revision: 131
Proposed branch: lp:~richard-wilbur/trac-bzr/fix-2.6.0
Merge into: lp:trac-bzr
Diff against target: 33 lines (+4/-1)
2 files modified
NEWS (+1/-0)
tracbzr/backend.py (+3/-1)
To merge this branch: bzr merge lp:~richard-wilbur/trac-bzr/fix-2.6.0
Reviewer Review Type Date Requested Status
Richard Wilbur Approve on 2014-04-15
Review via email: mp+215819@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Richard Wilbur (richard-wilbur) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2014-04-05 04:52:28 +0000
3+++ NEWS 2014-04-15 07:58:45 +0000
4@@ -5,6 +5,7 @@
5 unreleased
6 ==========
7
8+- Further update for bzr 2.6 (`#1165948`_, thanks to James Teh)
9 - Update for bzr 2.6 (as per bug `#739481`_). (`#1165948`_, thanks to treaves)
10 - Renders bug URLs as links (`#512733`_, thanks to Oleg Frantsuzov)
11 - Improve handling of non-ascii file names (`#675014`_)
12
13=== modified file 'tracbzr/backend.py'
14--- tracbzr/backend.py 2014-02-13 23:45:40 +0000
15+++ tracbzr/backend.py 2014-04-15 07:58:45 +0000
16@@ -87,6 +87,7 @@
17 osutils,
18 revision,
19 transport,
20+ tsort,
21 urlutils,
22 )
23 import bzrlib.api
24@@ -1485,7 +1486,8 @@
25 """Lazily fill cache only when needed."""
26 if self.revcache is None:
27 revid = self.revisiontree.get_revision_id()
28- ancestry = self.branch.repository.get_ancestry(revid)
29+ ancestry = tsort.topo_sort(dict(
30+ self.branch.repository.get_graph().iter_ancestry([revid])))
31 ancestry.reverse()
32 ancestry_idx = dict((r, n) for n, r in enumerate(ancestry))
33 self.revcache = {}