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

[Aaron Bentley]

[Aaron Bentley (abentley)]

= Summary =
Handle stale local mirrors more gracefully

== Proposed fix ==
If the revno does not correspond to a revision-id in the local mirror, try
the remote branch. If the determined revision-id does not exist in the local
mirror's repository, fetch it.

== Pre-implementation notes ==
None

== Implementation details ==
Fetching does not update the branch pointer or the tags. It has no effect on
the branch, only on what revisions are accessible in the branch's repository.

== Tests ==
None

== Demo and Q/A ==
With a stale local mirror, run qa-ready. It will tell you that the mirror is
stale, but will not raise NoSuchRevision.

= 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

[Edwin Grubbs (edwin-grubbs)]

Looks good.

review: Approve

=== modified file 'utilities/qa-ready'
--- utilities/qa-ready	2010-02-25 19:07:52 +0000
+++ utilities/qa-ready	2010-03-06 05:27:33 +0000
@@ -8,6 +8,7 @@
 
 from bzrlib.branch import Branch
 from bzrlib.config import LocationConfig
+from bzrlib.errors import NoSuchRevision
 from bzrlib.transport import get_transport
 
 
@@ -52,9 +53,27 @@
         deployed_branch = Branch.open(deployed_location)
     else:
         deployed_branch = Branch.open(local_mirror)
-    deployed_branch.lock_read()
+    deployed_branch.lock_write()
     try:
-        deployed_rev_id = deployed_branch.get_rev_id(deployed_revno)
+        try:
+            deployed_rev_id = deployed_branch.get_rev_id(deployed_revno)
+        except NoSuchRevision:
+            if local_mirror is None:
+                raise
+            else:
+                remote = Branch.open(deployed_location)
+                remote.lock_read()
+                try:
+                    deployed_rev_id = remote.get_rev_id(deployed_revno)
+                    print "Mirror %s is out of date." % deployed_branch.base
+                    if not deployed_branch.repository.has_revision(
+                        deployed_rev_id):
+                        deployed_branch.repository.fetch(
+                            remote.repository, deployed_rev_id)
+                    assert deployed_branch.repository.has_revision(
+                        deployed_rev_id)
+                finally:
+                    remote.unlock()
         graph = local_branch.repository.get_graph(deployed_branch.repository)
         return graph.is_ancestor(local_branch.last_revision(), deployed_rev_id)
     finally: