X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_changelog.py;h=0c08a44215bb8b7a8e18cdbcc6996529d11bb603;hb=9a7ce31a554b7ac0079ab54b1a029eabd78b4b31;hp=acd23c2b93def9d145fd41c9c767f28471ec2f6b;hpb=d43aaba44b2967b9c1edc4f3e722e23bb4b7a4c3;p=dak.git

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index acd23c2b..0c08a442 100755
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -57,15 +57,19 @@ from daklib import utils
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: make-changelog -s <suite> -b <base_suite> [OPTION]...
-Generate changelog between two suites
+    print """Generate changelog between two suites
+
+       Usage:
+       make-changelog -s <suite> -b <base_suite> [OPTION]...
+       make-changelog -T
 
 Options:
 
   -h, --help                show this help and exit
   -s, --suite               suite providing packages to compare
   -b, --base-suite          suite to be taken as reference for comparison
-  -n, --binnmu              display binNMUs uploads instead of source ones"""
+  -n, --binnmu              display binNMUs uploads instead of source ones
+  -T, --testing             display changes entering testing"""
 
     sys.exit(exit_code)
 
@@ -141,14 +145,43 @@ def get_binary_uploads(suite, base_suite, session):
 
     return session.execute(query, {'suite': suite, 'base_suite': base_suite})
 
+def testing_summary(summary, session):
+    """
+    Returns changes introduced in packages entering testing.
+    """
+
+    query =  'SELECT source, changelog FROM changelogs WHERE'
+    fd = open(summary, 'r')
+    for package in fd.read().splitlines():
+        package = package.split()
+        if package[1] != package[2]:
+            if package[1] == '(not_in_testing)':
+                package[1] = 0
+            query += " source = '%s' AND version > '%s' AND version <= '%s'" \
+                     % (package[0], package[1], package[2])
+            query += " AND architecture LIKE '%source%' OR"
+    fd.close()
+    query += ' False ORDER BY source, version DESC;'
+
+    return session.execute(query)
+
+def display_changes(uploads, index):
+    prev_upload = None
+    for upload in uploads:
+        if prev_upload and prev_upload != upload[0]:
+            print
+        print upload[index]
+        prev_upload = upload[0]
+
 def main():
     Cnf = utils.get_conf()
     Arguments = [('h','help','Make-Changelog::Options::Help'),
                  ('s','suite','Make-Changelog::Options::Suite','HasArg'),
                  ('b','base-suite','Make-Changelog::Options::Base-Suite','HasArg'),
-                 ('n','binnmu','Make-Changelog::Options::binNMU')]
+                 ('n','binnmu','Make-Changelog::Options::binNMU'),
+                 ('T', 'testing','Make-Changelog::Options::Testing')]
 
-    for i in ['help', 'suite', 'base-suite', 'binnmu']:
+    for i in ['help', 'suite', 'base-suite', 'binnmu', 'testing']:
         if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
             Cnf['Make-Changelog::Options::%s' % (i)] = ''
 
@@ -157,26 +190,25 @@ def main():
     suite = Cnf['Make-Changelog::Options::Suite']
     base_suite = Cnf['Make-Changelog::Options::Base-Suite']
     binnmu = Cnf['Make-Changelog::Options::binNMU']
+    testing = Cnf['Make-Changelog::Options::Testing']
 
-    if Options['help'] or not (suite and base_suite):
+    if Options['help'] or not (suite and base_suite) and not testing:
         usage()
 
     for s in suite, base_suite:
-        if not get_suite(s):
+        if not testing and not get_suite(s):
             utils.fubar('Invalid suite "%s"' % s)
 
     session = DBConn().session()
 
-    if binnmu:
-        uploads = get_binary_uploads(suite, base_suite, session)
-        session.commit()
-        for upload in uploads:
-            print upload[3]
+    if testing:
+        display_changes(testing_summary(Cnf['Changelogs::Testing'], session), 1)
+    elif binnmu:
+        display_changes(get_binary_uploads(suite, base_suite, session), 3)
     else:
-        uploads = get_source_uploads(suite, base_suite, session)
-        session.commit()
-        for upload in uploads:
-            print upload[2]
+        display_changes(get_source_uploads(suite, base_suite, session), 2)
+
+    session.commit()
 
 if __name__ == '__main__':
     main()