Merge lp:~jelmer/launchpad/upgrade-sourcecode into lp:launchpad

[Jelmer Vernooij]

Automatically upgrade Bazaar branches when encountering IncompatibleRepositories errors.

This makes update-sourcecode automatically upgrade branches when the remote branch that they're tracking gets upgraded.

This change should allow me to land the updated pygpgme, the branch of which has recently been upgraded to 2a.

[Michael Hudson-Doyle (mwhudson)]

It's not *that* hard to dig the real format out of a remote branch iirc, but it's probably not worth it. Please land.

review: Approve

=== modified file 'lib/devscripts/sourcecode.py'
--- lib/devscripts/sourcecode.py	2010-02-04 23:23:32 +0000
+++ lib/devscripts/sourcecode.py	2010-04-08 15:54:28 +0000
@@ -16,12 +16,12 @@
 import sys
 
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import BzrError, NotBranchError
+from bzrlib.errors import BzrError, NotBranchError, IncompatibleRepositories
 from bzrlib.plugin import load_plugins
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.trace import enable_default_logging, report_exception
 from bzrlib import ui
+from bzrlib.upgrade import upgrade
 from bzrlib.workingtree import WorkingTree
 
 from devscripts import get_launchpad_root
@@ -146,6 +146,7 @@
     else:
         return 'tip'
 
+
 def get_branches(sourcecode_directory, new_branches,
                  possible_transports=None, tip=False):
     """Get the new branches into sourcecode."""
@@ -202,12 +203,25 @@
         possible_transports.append(
             remote_branch.bzrdir.root_transport)
         revision_id = get_revision_id(revision, remote_branch, tip)
-        if revision_id == local_tree.last_revision():
+        try:
+            result = local_tree.pull(
+                remote_branch, stop_revision=revision_id, overwrite=True,
+                possible_transports=possible_transports)
+        except IncompatibleRepositories:
+            # XXX JRV 20100407: Ideally remote_branch.bzrdir._format 
+            # should be passed into upgrade() to ensure the format is the same
+            # locally and remotely. Unfortunately smart server branches 
+            # have their _format set to RemoteFormat rather than an actual 
+            # format instance.
+            upgrade(destination)
+            # Upgraded, repoen working tree
+            local_tree = WorkingTree.open(destination)
+            result = local_tree.pull(
+                remote_branch, stop_revision=revision_id, overwrite=True,
+                possible_transports=possible_transports)
+        if result.old_revid == result.new_revid:
             print '  (No change)'
         else:
-            result = local_tree.pull(
-                remote_branch, stop_revision=revision_id, overwrite=True,
-                possible_transports=possible_transports)
             if result.old_revno < result.new_revno:
                 change = 'Updated'
             else: