Merge lp:~abentley/launchpad/fix-qa-ready into lp:launchpad

[Aaron Bentley]

= Summary =
Stop displaying false data when fetching is required.

== Proposed fix ==
When two branches have copies of the same repository,
bzrlib.repository.Repository.get_graph will avoid data from one of the copies.
But it's possible for the two copies to hold different data if one was
read-locked and then the other was fetched into.

If the older copy is selected, then the results will be wrong. If the newer
copy is selected, the results will be right. This branch ensures newer copy
will be used in this situation, by swapping their relationship in the
get_graph.

== Pre-implementation notes ==
None

== Implementation details ==
None

== Tests ==
None

== Demo and Q/A ==
Create a shared repository with a target branch to run qa-ready against, and a local
mirror of stable/db-devel. The target must have been merged into stable/db-devel and be deployed, but the local mirror must not contain that merge revision. Configure ~/.bazaar/locations.conf to use this mirror. Run qa-ready. It should report that the branch has been deployed.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  utilities/qa-ready

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'utilities/qa-ready'
--- utilities/qa-ready	2010-03-03 15:15:44 +0000
+++ utilities/qa-ready	2010-03-15 19:05:42 +0000
@@ -74,7 +74,7 @@
                         deployed_rev_id)
                 finally:
                     remote.unlock()
-        graph = local_branch.repository.get_graph(deployed_branch.repository)
+        graph = deployed_branch.repository.get_graph(local_branch.repository)
         return graph.is_ancestor(local_branch.last_revision(), deployed_rev_id)
     finally:
         deployed_branch.unlock()