Merge lp:~rocky-burt/trac-bzr/bug-263300 into lp:trac-bzr

[Rocky Burt]

[Rocky Burt (rocky-burt)]

The _get_weave call has been replaced, and the tests that failed on that now run on bzr 1.12

[Jelmer Vernooij (jelmer)]

Rocky Burt wrote:
> Rocky Burt has proposed merging lp:~rocky-burt/trac-bzr/bug-263300 into lp:trac-bzr.
>
> Requested reviews:
> Trac-bzr-team (trac-bzr-team)
>
> The _get_weave call has been replaced, and the tests that failed on that now run on bzr 1.12
>
vote reject

This adds a call to Repository.get_revision_inventory, which is very
slow compared to e.g. _get_weave or get_parent_map(), especially on
repositories with large inventories.

repo.texts really should be used here to obtain the ancestry, as can be
done with get_parent_map() and bzrlib.graph.Graph.

Cheers,

jelmer

[Rocky Burt (rocky-burt)]

Sounds good, I'll take another stab at this later on.

- Rocky

On Tue, Mar 17, 2009 at 11:06 AM, Jelmer Vernooij <email address hidden> wrote:

> Rocky Burt wrote:
> > Rocky Burt has proposed merging lp:~rocky-burt/trac-bzr/bug-263300 into
> lp:trac-bzr.
> >
> > Requested reviews:
> > Trac-bzr-team (trac-bzr-team)
> >
> > The _get_weave call has been replaced, and the tests that failed on that
> now run on bzr 1.12
> >
> vote reject
>
> This adds a call to Repository.get_revision_inventory, which is very
> slow compared to e.g. _get_weave or get_parent_map(), especially on
> repositories with large inventories.
>
> repo.texts really should be used here to obtain the ancestry, as can be
> done with get_parent_map() and bzrlib.graph.Graph.
>
> Cheers,
>
> jelmer
> --
> https://code.launchpad.net/~rocky-burt/trac-bzr/bug-263300/+merge/4305<https://code.launchpad.net/%7Erocky-burt/trac-bzr/bug-263300/+merge/4305>
> You are subscribed to branch lp:trac-bzr.
>

Unmerged revisions

55. By Rocky Burt on 2009-03-09

Replaced _get_weave call with logic that queries the revision inventory.

=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2009-01-19 16:42:31 +0000
+++ tracbzr/backend.py	2009-03-09 15:23:58 +0000
@@ -712,17 +712,20 @@
         It may also include a few revisions in which the revision_id did not
         change, if the modification was subsequently undone.
         """
-        weave = self.tree._get_weave(self.entry.file_id)
-        file_ancestry = weave.get_ancestry(self.entry.revision)
         # Can't use None here, because it's a legitimate revision id.
         last_yielded = 'bogus:'
+        file_id = self.entry.file_id
+        repo = self.repo
         for num, revision_id, depth, revno, eom in \
             self.bzr_repo.sorted_revision_history(self.branch):
             if depth == 0:
                 last_mainline = revision_id
             if last_mainline == last_yielded:
                 continue
-            if revision_id in file_ancestry:
+            if revision_id in ('null:', None):
+                continue
+            this_inv = repo.get_revision_inventory(revision_id)
+            if file_id in this_inv:
                 yield last_mainline
                 last_yielded = last_mainline
         yield None