Merge lp:~thumper/launchpad/update-existing-stacked-branches into lp:launchpad

[Tim Penhey]

[r=bac][bug=377519][no-qa] Update the scripts that the LOSAs use to update the stacked on location.

Update the scripts that the LOSAs use to update the stacked on location.

Add a --id flag to the update script to determine whether to stack on the +branch-id alias or the unique name.

[Brad Crittenden (bac)]

Hey look, another place the id is hand constructed. :)

review: Approve (code)

[Tim Penhey (thumper)]

Used the new branch_id_alias function. The only quirk was that it needs an object with an id attribute. A namedtuple seemed the simplest way to provide this.

=== modified file 'scripts/get-stacked-on-branches.py'
--- scripts/get-stacked-on-branches.py	2010-04-27 19:48:39 +0000
+++ scripts/get-stacked-on-branches.py	2011-04-18 23:07:41 +0000
@@ -11,11 +11,12 @@
 
 Prints the stacked branches in Launchpad to standard output in the following
 format:
-  <id> <branch_type> <unique_name> <stacked_on_unique_name>
+  <id> <branch_type> <unique_name> <stacked_on_id> <stacked_on_unique_name>
 
 <id> is the database ID of the Branch as a decimal integer.
 <branch_type> is the name of the BranchType, e.g. 'HOSTED'.
 <unique_name> is the unique_name property of the Branch.
+<stacked_on_id> is the database ID of the Branch.stacked_on branch
 <stacked_on_unique_name> is the unique_name property of the Branch.stacked_on
     branch.
 
@@ -49,9 +50,10 @@
     """
     execute_zcml_for_scripts()
     for db_branch in get_stacked_branches():
-        print '%s %s %s %s' % (
+        stacked_on = db_branch.stacked_on
+        print '%s %s %s %s %s' % (
             db_branch.id, db_branch.branch_type.name, db_branch.unique_name,
-            db_branch.stacked_on.unique_name)
+            stacked_on.id, stacked_on.unique_name)
 
 
 if __name__ == '__main__':
 
=== modified file 'scripts/update-stacked-on.py'
--- scripts/update-stacked-on.py	2010-05-19 18:07:56 +0000
+++ scripts/update-stacked-on.py	2011-04-18 23:07:41 +0000
@@ -8,7 +8,7 @@
 """Update stacked_on_location for all Bazaar branches.
 
 Expects standard input of:
-    '<id> <branch_type> <unique_name> <stacked_on_unique_name>\n'.
+    '<id> <branch_type> <unique_name> <stacked_on_id> <stacked_on_unique_name>\n'.
 
 Such input can be provided using "get-stacked-on-branches.py".
 
@@ -21,6 +21,7 @@
 __metaclass__ = type
 
 import _pythonpath
+from collections import namedtuple
 import sys
 
 from bzrlib.bzrdir import BzrDir
@@ -29,9 +30,13 @@
 
 from lp.codehosting.vfs import get_rw_server, get_ro_server
 from lp.codehosting.bzrutils import get_branch_stacked_on_url
+from lp.code.interfaces.codehosting import branch_id_alias
 from lp.services.scripts.base import LaunchpadScript
 
 
+FakeBranch = namedtuple('FakeBranch', 'id')
+
+
 def set_branch_stacked_on_url(bzrdir, stacked_on_url):
     """Set the stacked_on_location for the branch at 'bzrdir'.
 
@@ -57,6 +62,10 @@
             dest="dry_run",
             help=("Don't change anything on disk, just go through the "
                   "motions."))
+        self.parser.add_option(
+            '-i', '--id', default=False, action="store_true",
+            dest="stack_on_id",
+            help=("Stack on the +branch-id alias."))
 
     def main(self):
         if self.options.dry_run:
@@ -131,8 +140,12 @@
         """
         for branch_info in branches:
             (branch_id, branch_type, unique_name,
-             stacked_on_name) = branch_info
-            stacked_on_location = '/' + stacked_on_name
+             stacked_on_id, stacked_on_name) = branch_info
+            if self.options.stack_on_id:
+                branch = FakeBranch(stacked_on_id)
+                stacked_on_location = branch_id_alias(branch)
+            else:
+                stacked_on_location = '/' + stacked_on_name
             self.updateStackedOn(
                 branch_id, 'lp-internal:///' + unique_name,
                 stacked_on_location)