Merge lp:~treaves/trac-bzr/trac-bzr into lp:trac-bzr

Proposed by treaves on 2014-02-13
Status: Merged
Approved by: Richard Wilbur on 2014-02-14
Approved revision: 130
Merged at revision: 130
Proposed branch: lp:~treaves/trac-bzr/trac-bzr
Merge into: lp:trac-bzr
Diff against target: 29 lines (+3/-3)
1 file modified
tracbzr/backend.py (+3/-3)
To merge this branch: bzr merge lp:~treaves/trac-bzr/trac-bzr
Reviewer Review Type Date Requested Status
Richard Wilbur 2014-02-13 Pending
Review via email: mp+206306@code.launchpad.net

Commit message

Fixes lp:1165948: Update for bzr 2.6 (as per bug lp:739481).

Description of the change

This commit fixes bug lp:1165948 as per bug lp:739481.

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

Good work! Is this sufficient to make trac-bzr work with bzr 2.6.0? If so, we should schedule a new release of trac-bzr with the billing of "compatible with bzr 2.6.0".
+1

treaves (treaves) wrote :

It has for everything I've tried. The big thing is getting the chagesets & source browser working. I did glance over the defect list, and nothing else jumped out.

On Feb 14, 2014, at 1:17 PM, Richard Wilbur <email address hidden> wrote:

> Good work! Is this sufficient to make trac-bzr work with bzr 2.6.0? If so, we should schedule a new release of trac-bzr with the billing of "compatible with bzr 2.6.0".
> +1
> --
> https://code.launchpad.net/~treaves/trac-bzr/trac-bzr/+merge/206306
> You are the owner of lp:~treaves/trac-bzr/trac-bzr.

treaves (treaves) wrote :

I do not have write-permissions to the repository, so either you'll need to add me, or perform the merge.

On Feb 14, 2014, at 1:27 PM, Richard Wilbur <email address hidden> wrote:

> The proposal to merge lp:~treaves/trac-bzr/trac-bzr into lp:trac-bzr has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
> https://code.launchpad.net/~treaves/trac-bzr/trac-bzr/+merge/206306
> --
> https://code.launchpad.net/~treaves/trac-bzr/trac-bzr/+merge/206306
> You are the owner of lp:~treaves/trac-bzr/trac-bzr.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tracbzr/backend.py'
2--- tracbzr/backend.py 2013-06-03 20:40:11 +0000
3+++ tracbzr/backend.py 2014-02-13 23:50:05 +0000
4@@ -667,7 +667,7 @@
5 branch, revid = self._parse_rev(rev)
6 if revid in (NULL_REVISION, CURRENT_REVISION) or branch is None:
7 return None
8- ancestry = iter(branch.repository.iter_reverse_revision_history(revid))
9+ ancestry = iter(branch.repository.get_graph().iter_lefthand_ancestry(revid))
10 ancestry.next()
11 try:
12 return self.string_rev(branch, ancestry.next())
13@@ -920,7 +920,7 @@
14 bpath = self.bzr_repo.branch_path(self.branch)
15 if self.path == '' or bpath.startswith(self.path + '/'):
16 repo = self.branch.repository
17- ancestry = repo.iter_reverse_revision_history(self.revid)
18+ ancestry = repo.get_graph().iter_lefthand_ancestry(self.revid)
19 ancestry = iter(ancestry)
20 for rev_id in ancestry:
21 yield (self.path,
22@@ -1043,7 +1043,7 @@
23
24 # Aways use a linear view of our ancestry.
25 repo = self.branch.repository
26- ancestry = repo.iter_reverse_revision_history(current_revid)
27+ ancestry = repo.get_graph().iter_lefthand_ancestry(current_revid)
28 ancestry = iter(ancestry)
29 # ancestry now iterates from current_revid down to revno 1
30

Subscribers

People subscribed via source and target branches