X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fmake_changelog.py;h=0c08a44215bb8b7a8e18cdbcc6996529d11bb603;hb=373708ec90ca29b27f2123ac79700955e6e6c220;hp=852fabd4a005459636cc915f2e19812dcdc5d778;hpb=076d0a9a0f88c8e86fc206b491f73ea6e8c71fa0;p=dak.git diff --git a/dak/make_changelog.py b/dak/make_changelog.py old mode 100644 new mode 100755 index 852fabd4..0c08a442 --- a/dak/make_changelog.py +++ b/dak/make_changelog.py @@ -57,14 +57,19 @@ from daklib import utils ################################################################################ def usage (exit_code=0): - print """Usage: make-changelog -s -b [OPTION]... -Generate changelog between two suites + print """Generate changelog between two suites + + Usage: + make-changelog -s -b [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""" + -b, --base-suite suite to be taken as reference for comparison + -n, --binnmu display binNMUs uploads instead of source ones + -T, --testing display changes entering testing""" sys.exit(exit_code) @@ -78,13 +83,13 @@ def get_source_uploads(suite, base_suite, session): FROM source_suite WHERE suite_name = :base_suite GROUP BY source - UNION SELECT source, CAST(0 AS debversion) AS version + UNION (SELECT source, CAST(0 AS debversion) AS version FROM source_suite WHERE suite_name = :suite EXCEPT SELECT source, CAST(0 AS debversion) AS version FROM source_suite WHERE suite_name = :base_suite - ORDER BY source), + ORDER BY source)), cur_suite AS ( SELECT source, max(version) AS version FROM source_suite @@ -92,7 +97,7 @@ def get_source_uploads(suite, base_suite, session): GROUP BY source) SELECT DISTINCT c.source, c.version, c.changelog FROM changelogs c - JOIN base b on b.source = c.source + JOIN base b ON b.source = c.source JOIN cur_suite cs ON cs.source = c.source WHERE c.version > b.version AND c.version <= cs.version @@ -101,13 +106,82 @@ def get_source_uploads(suite, base_suite, session): return session.execute(query, {'suite': suite, 'base_suite': base_suite}) +def get_binary_uploads(suite, base_suite, session): + """ + Returns changelogs for binary uploads where version is newer than base. + """ + + query = """WITH base as ( + SELECT s.source, max(b.version) AS version, a.arch_string + FROM source s + JOIN binaries b ON b.source = s.id + JOIN bin_associations ba ON ba.bin = b.id + JOIN architecture a ON a.id = b.architecture + WHERE ba.suite = ( + SELECT id + FROM suite + WHERE suite_name = :base_suite) + GROUP BY s.source, a.arch_string), + cur_suite as ( + SELECT s.source, max(b.version) AS version, a.arch_string + FROM source s + JOIN binaries b ON b.source = s.id + JOIN bin_associations ba ON ba.bin = b.id + JOIN architecture a ON a.id = b.architecture + WHERE ba.suite = ( + SELECT id + FROM suite + WHERE suite_name = :suite) + GROUP BY s.source, a.arch_string) + SELECT DISTINCT c.source, c.version, c.architecture, c.changelog + FROM changelogs c + JOIN base b on b.source = c.source + JOIN cur_suite cs ON cs.source = c.source + WHERE c.version > b.version + AND c.version <= cs.version + AND c.architecture = b.arch_string + AND c.architecture = cs.arch_string + ORDER BY c.source, c.version DESC, c.architecture""" + + 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')] + ('s','suite','Make-Changelog::Options::Suite','HasArg'), + ('b','base-suite','Make-Changelog::Options::Base-Suite','HasArg'), + ('n','binnmu','Make-Changelog::Options::binNMU'), + ('T', 'testing','Make-Changelog::Options::Testing')] - for i in ['help', 'suite', 'base-suite']: + 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)] = '' @@ -115,20 +189,26 @@ def main(): Options = Cnf.SubTree('Make-Changelog::Options') 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() - uploads = get_source_uploads(suite, base_suite, session) - session.commit() - for u in uploads: - print u[2] + if testing: + display_changes(testing_summary(Cnf['Changelogs::Testing'], session), 1) + elif binnmu: + display_changes(get_binary_uploads(suite, base_suite, session), 3) + else: + display_changes(get_source_uploads(suite, base_suite, session), 2) + + session.commit() if __name__ == '__main__': main()