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

Proposed by treaves
Status: Merged
Approved by: Richard Wilbur
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 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.
Revision history for this message
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

Revision history for this message
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.

Revision history for this message
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
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py 2013-06-03 20:40:11 +0000
+++ tracbzr/backend.py 2014-02-13 23:50:05 +0000
@@ -667,7 +667,7 @@
667 branch, revid = self._parse_rev(rev)667 branch, revid = self._parse_rev(rev)
668 if revid in (NULL_REVISION, CURRENT_REVISION) or branch is None:668 if revid in (NULL_REVISION, CURRENT_REVISION) or branch is None:
669 return None669 return None
670 ancestry = iter(branch.repository.iter_reverse_revision_history(revid))670 ancestry = iter(branch.repository.get_graph().iter_lefthand_ancestry(revid))
671 ancestry.next()671 ancestry.next()
672 try:672 try:
673 return self.string_rev(branch, ancestry.next())673 return self.string_rev(branch, ancestry.next())
@@ -920,7 +920,7 @@
920 bpath = self.bzr_repo.branch_path(self.branch)920 bpath = self.bzr_repo.branch_path(self.branch)
921 if self.path == '' or bpath.startswith(self.path + '/'):921 if self.path == '' or bpath.startswith(self.path + '/'):
922 repo = self.branch.repository922 repo = self.branch.repository
923 ancestry = repo.iter_reverse_revision_history(self.revid)923 ancestry = repo.get_graph().iter_lefthand_ancestry(self.revid)
924 ancestry = iter(ancestry)924 ancestry = iter(ancestry)
925 for rev_id in ancestry:925 for rev_id in ancestry:
926 yield (self.path,926 yield (self.path,
@@ -1043,7 +1043,7 @@
10431043
1044 # Aways use a linear view of our ancestry.1044 # Aways use a linear view of our ancestry.
1045 repo = self.branch.repository1045 repo = self.branch.repository
1046 ancestry = repo.iter_reverse_revision_history(current_revid)1046 ancestry = repo.get_graph().iter_lefthand_ancestry(current_revid)
1047 ancestry = iter(ancestry)1047 ancestry = iter(ancestry)
1048 # ancestry now iterates from current_revid down to revno 11048 # ancestry now iterates from current_revid down to revno 1
10491049

Subscribers

People subscribed via source and target branches