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

[treaves]

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

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

[Richard Wilbur (richard-wilbur)]

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)]

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)]

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.

=== 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 @@
         branch, revid = self._parse_rev(rev)
         if revid in (NULL_REVISION, CURRENT_REVISION) or branch is None:
             return None
-        ancestry = iter(branch.repository.iter_reverse_revision_history(revid))
+        ancestry = iter(branch.repository.get_graph().iter_lefthand_ancestry(revid))
         ancestry.next()
         try:
             return self.string_rev(branch, ancestry.next())
@@ -920,7 +920,7 @@
             bpath = self.bzr_repo.branch_path(self.branch)
             if self.path == '' or bpath.startswith(self.path + '/'):
                 repo = self.branch.repository
-                ancestry = repo.iter_reverse_revision_history(self.revid)
+                ancestry = repo.get_graph().iter_lefthand_ancestry(self.revid)
                 ancestry = iter(ancestry)
                 for rev_id in ancestry:
                     yield (self.path,
@@ -1043,7 +1043,7 @@
 
         # Aways use a linear view of our ancestry.
         repo = self.branch.repository
-        ancestry = repo.iter_reverse_revision_history(current_revid)
+        ancestry = repo.get_graph().iter_lefthand_ancestry(current_revid)
         ancestry = iter(ancestry)
         # ancestry now iterates from current_revid down to revno 1