Fix upgrade_branch.

diff --git a/upgrade.py b/upgrade.py
index be2211346ad500eeb64a7d55b7afa7c8ff9188ca..4c17d8ec85bc2466d052d653594d97219e3df1ab 100644 (file)
--- a/upgrade.py
+++ b/upgrade.py
@@ -104,8 +104,8 @@ def upgrade_workingtree(wt, foreign_repository, new_mapping, mapping_registry,
     return renames
 
 
-def upgrade_branch(branch, foreign_repository, new_mapping=None, 
-                   allow_changes=False, verbose=False):
+def upgrade_branch(branch, foreign_repository, new_mapping, 
+                   mapping_registry, allow_changes=False, verbose=False):
     """Upgrade a branch to the current mapping version.
     
     :param branch: Branch to upgrade.
@@ -116,6 +116,7 @@ def upgrade_branch(branch, foreign_repository, new_mapping=None,
     revid = branch.last_revision()
     renames = upgrade_repository(branch.repository, foreign_repository, 
               revision_id=revid, new_mapping=new_mapping,
+              mapping_registry=mapping_registry,
               allow_changes=allow_changes, verbose=verbose)
     if len(renames) > 0:
         branch.generate_revision_history(renames[revid])