Merge lp:~clint-fewbar/charm-tools/add-unpromulgate into lp:~charmers/charm-tools/trunk

[Clint Byrum]

Adds unpromulgate command to remove a branch rather than set it as the official one.

[Mark Mims (mark-mims)]

review: Approve

=== modified file 'scripts/promulgate'
--- scripts/promulgate	2012-01-19 20:28:23 +0000
+++ scripts/promulgate	2012-04-28 00:41:19 +0000
@@ -56,6 +56,9 @@
     parser.add_option(
         '-v', '--verbose', dest='verbose', action='count', default=0,
         help='Increase verbosity level.')
+    parser.add_option(
+        '-u', '--unpromulgate', dest='unpromulgate', action='store_true', default=False,
+        help='Un-promulgate this branch instead of promulgating it')
     options, args = parser.parse_args()
 
     if options.verbose >= 2:
@@ -98,15 +101,17 @@
             logging.error("can't find branch on Launchpad: %s", options.branch)
             return 1
 
-    logging.info(
-        "Setting status of %s to %s", charm_branch.bzr_identity,
-        OFFICAL_BRANCH_STATUS)
-    charm_branch.lifecycle_status = OFFICAL_BRANCH_STATUS
-    logging.info(
-        "Setting reviewer of %s to %s", charm_branch.bzr_identity,
-        REVIEW_TEAM_NAME)
-    charm_branch.reviewer = lp.people[REVIEW_TEAM_NAME]
-    charm_branch.lp_save()
+    if not options.unpromulgate:
+        logging.info(
+            "Setting status of %s to %s", charm_branch.bzr_identity,
+            OFFICAL_BRANCH_STATUS)
+        charm_branch.lifecycle_status = OFFICAL_BRANCH_STATUS
+    if not options.unpromulgate:
+        logging.info(
+            "Setting reviewer of %s to %s", charm_branch.bzr_identity,
+            REVIEW_TEAM_NAME)
+        charm_branch.reviewer = lp.people[REVIEW_TEAM_NAME]
+        charm_branch.lp_save()
 
     charm_distro = lp.distributions[DISTRIBUTION]
     if options.series is None:
@@ -125,9 +130,15 @@
                 raise
 
     lp_charm = charm_series.getSourcePackage(name=charm['name'])
-    logging.info(
-        'Setting %s as the official branch for %s',
-        charm_branch.bzr_identity, lp_charm.name)
+    if options.unpromulgate:
+        logging.info('Removing official branch for %s', lp_charm.name)
+        # None translates to 'null' in the args, which makes LP delete
+        # the source package.
+        charm_branch = None
+    else:
+        logging.info(
+            'Setting %s as the official branch for %s',
+            charm_branch.bzr_identity, lp_charm.name)
     lp_charm.setBranch(branch=charm_branch, pocket=OFFICIAL_BRANCH_POCKET)
 
     return 0

=== added file 'scripts/unpromulgate'
--- scripts/unpromulgate	1970-01-01 00:00:00 +0000
+++ scripts/unpromulgate	2012-04-28 00:41:19 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Alias for convenience/sanity
+exec `dirname $0`/promulgate --unpromulgate $@