Rev 5453: Make fixed-in really work now and some cleanup. in file:///home/vila/src/bzr/experimental/fixed-in/

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Sep 28 08:44:54 BST 2010


At file:///home/vila/src/bzr/experimental/fixed-in/

------------------------------------------------------------
revno: 5453
revision-id: v.ladeuil+lp at free.fr-20100928074454-uiglopj9k6g1p200
parent: v.ladeuil+lp at free.fr-20100928010057-smfg2xjeeay3jhca
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fixed-in
timestamp: Tue 2010-09-28 09:44:54 +0200
message:
  Make fixed-in really work now and some cleanup.
-------------- next part --------------
=== modified file 'tools/fixed-in.py'
--- a/tools/fixed-in.py	2010-09-28 01:00:57 +0000
+++ b/tools/fixed-in.py	2010-09-28 07:44:54 +0000
@@ -8,14 +8,6 @@
 import sys
 
 
-opt_parser = optparse.OptionParser(
-    usage="""Usage: %prog [options] <bug_number>
-""")
-opt_parser.add_option('-f', '--file', type='str', dest='news_file',
-                      help='NEWS file (defaults to ./NEWS)')
-opt_parser.set_defaults(news_file='./NEWS')
-
-
 class NewsParser(object):
 
     paren_exp_re = re.compile('\(([^)]+)\)')
@@ -50,7 +42,6 @@
         if self.may_be_release is not None and self.lrs == self.release_markup:
             # The release is followed by the right markup
             self.release = self.may_be_release[self.release_prefix_length:]
-            print 'Release: [%s]' % (self.release,)
             return True
         return False
 
@@ -82,7 +73,6 @@
                          authors = par[:start]
                     for bug_match in bugs:
                         bug_number = bug_match.group(0)
-                        print 'bug_number: [%r]' % (bug_number[1:],)
                         yield (bug_number, authors, self.release, self.entry)
         # We've consumed the entry
         self.entry = ''
@@ -103,6 +93,13 @@
                 yield b
 
 def main():
+    opt_parser = optparse.OptionParser(
+        usage="""Usage: %prog [options] <bug_number>
+    """)
+    opt_parser.add_option('-f', '--file', type='str', dest='news_file',
+                          help='NEWS file (defaults to ./NEWS)')
+    opt_parser.set_defaults(news_file='./NEWS')
+
     (opts, args) = opt_parser.parse_args(sys.argv[1:])
     if len(args) != 1:
         opt_parser.error('Expected a single bug number, got %r' % args)
@@ -119,10 +116,10 @@
             (date,) = ('2010-01-01',)
             # indent entry
             entry = '\n'.join(['    ' + l for l in entry.splitlines()])
-#            if number == bug[1:]: # Strip the leading '#'
-            print 'Bug %s was fixed in bzr-%s by %s:' % (
-                number, release, authors)
-            print entry
+            if number[1:] == bug: # Strip the leading '#'
+                print 'Bug %s was fixed in bzr-%s by %s:' % (
+                    number, release, authors)
+                print entry
             seen += 1
     finally:
         print '%s bugs seen' % (seen,)



More information about the bazaar-commits mailing list