Merge lp:~barry/launchpadlib/475547-cmb into lp:launchpadlib

[Barry Warsaw]

[Barry Warsaw (barry)]

This fixes contrib/close-my-bugs.py as described in the bug report.

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2009-03-19 15:22:56 +0000
+++ .bzrignore	2009-11-05 20:05:19 +0000
@@ -9,3 +9,4 @@
 build
 *.egg
 dist
+eggs

=== modified file 'contrib/close-my-bugs.py'
--- contrib/close-my-bugs.py	2009-09-29 15:39:26 +0000
+++ contrib/close-my-bugs.py	2009-11-05 20:05:19 +0000
@@ -26,21 +26,32 @@
 
 import os
 import sys
+
+from optparse import OptionParser
+
 from launchpadlib.launchpad import Launchpad
-from optparse import OptionParser
+from launchpadlib.uris import service_roots
+
+COMMASPACE = ', '
 
 
 def main(args):
-    usage = """%s: project milestone\n%s""" % (sys.argv[0], __doc__)
+    usage = """%s: project milestone\n\n%s""" % (sys.argv[0], __doc__)
 
     parser = OptionParser(usage=usage)
     parser.add_option(
         '-s', '--system', type='string', default='edge', dest='lpsystem',
         help=("The Launchpad system to use.  Must be one of %s" %
-              sorted(Launchpad.service_roots.keys())))
+              COMMASPACE.join(sorted(service_roots))))
+    parser.add_option(
+        '-y', '--yes', action='store_true', default=False, dest='force',
+        help="Skip yes/no prompting and do it anyway")
     parser.add_option(
         '-f', '--force', action="store_true", default=False, dest='force',
-        help="Skip yes/no prompting and do it anyway")
+        help='Obsolete synonym for --yes')
+    parser.add_option(
+        '-n', '--dry-run', action='store_true',
+        help='Describe what the script would do without doing it.')
     options, args = parser.parse_args(args=args)
     if len(args) != 2:
         parser.print_usage()
@@ -61,17 +72,20 @@
     for task in my_committed_tasks:
         print "Bug #%s: %s" % (task.bug.id, task.bug.title)
 
-    if not options.force:
-        answer = raw_input("Mark these bugs as Fix Released?  [y/N]")
-        if answer in ("n", "N") or not answer:
-            print "Ok, leaving them alone."
-            return
-
-    for task in my_committed_tasks:
-        print "Releasing %s" % task.bug.id
-        task.transitionToStatus(status='Fix Released')
-
-    print "Done."
+    if options.dry_run:
+        print '\n*** Nothing changed.  Re-run without --dry-run/-n to commit.'
+    else:
+        if not options.force:
+            answer = raw_input("Mark these bugs as Fix Released?  [y/N]")
+            if answer in ("n", "N") or not answer:
+                print "Ok, leaving them alone."
+                return
+
+        for task in my_committed_tasks:
+            print "Releasing %s" % task.bug.id
+            task.transitionToStatus(status='Fix Released')
+        print "Done."
+
     return 0